From f98cff8f069cb4d437ef21b19040e0ea3d740f2a Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 27 Mar 2019 13:56:18 +0100 Subject: [PATCH] fixes #70681 --- src/vs/workbench/browser/actions/listCommands.ts | 10 ++++++++-- .../contrib/files/browser/views/explorerView.ts | 11 ----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/vs/workbench/browser/actions/listCommands.ts b/src/vs/workbench/browser/actions/listCommands.ts index 7afe64bfa83..12999aefec1 100644 --- a/src/vs/workbench/browser/actions/listCommands.ts +++ b/src/vs/workbench/browser/actions/listCommands.ts @@ -582,8 +582,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ else if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) { const list = focused; const fakeKeyboardEvent = getSelectionKeyboardEvent('keydown', false); - list.setSelection(list.getFocus(), fakeKeyboardEvent); - list.open(list.getFocus(), fakeKeyboardEvent); + const focus = list.getFocus(); + + if (focus.length > 0) { + list.toggleCollapsed(focus[0]); + } + + list.setSelection(focus, fakeKeyboardEvent); + list.open(focus, fakeKeyboardEvent); } // Tree diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts index b40c90cf73c..0df62ce847a 100644 --- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts +++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts @@ -337,17 +337,6 @@ export class ExplorerView extends ViewletPanel { })); this.disposables.push(this.tree.onContextMenu(e => this.onContextMenu(e))); - this.disposables.push(this.tree.onKeyDown(e => { - const event = new StandardKeyboardEvent(e); - const toggleCollapsed = isMacintosh ? (event.keyCode === KeyCode.DownArrow && event.metaKey) : event.keyCode === KeyCode.Enter; - if (toggleCollapsed && !this.explorerService.isEditable(undefined)) { - const focus = this.tree.getFocus(); - if (focus.length === 1 && focus[0].isDirectory) { - this.tree.toggleCollapsed(focus[0]); - } - } - })); - // save view state on shutdown this.storageService.onWillSaveState(() => { -- GitLab