fixes microsoft#103366

joaomoreno · joaomoreno · commit a0407fbd739d · 2020-08-03T15:13:26.000+02:00
diff --git a/src/vs/workbench/browser/actions/listCommands.ts b/src/vs/workbench/browser/actions/listCommands.ts
@@ -655,18 +655,17 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const focused = accessor.get(IListService).lastFocusedList;
 
 		// Tree only
-		if (focused && !(focused instanceof List || focused instanceof PagedList)) {
-			if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) {
-				const tree = focused;
-				const focus = tree.getFocus();
-
-				if (focus.length === 0) {
-					return;
-				}
+		if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) {
+			const tree = focused;
+			const focus = tree.getFocus();
 
+			if (focus.length > 0 && tree.isCollapsible(focus[0])) {
 				tree.toggleCollapsed(focus[0]);
+				return;
 			}
 		}
+
+		focusElement(accessor, true);
 	}
 });
 
