From 4641a6f39a79bf9ce405885d599f78db65e6d456 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 13 May 2016 10:51:55 +0200 Subject: [PATCH] open editors: pin editor on enter and double click --- .../parts/files/browser/views/openEditorsViewer.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/files/browser/views/openEditorsViewer.ts b/src/vs/workbench/parts/files/browser/views/openEditorsViewer.ts index 51822e0eeb0..0e76195f322 100644 --- a/src/vs/workbench/parts/files/browser/views/openEditorsViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/openEditorsViewer.ts @@ -221,7 +221,6 @@ export class Controller extends treedefaults.DefaultController { // Select, Focus and open files else { - const preserveFocus = !isDoubleClick; tree.setFocus(element, payload); if (isDoubleClick) { @@ -229,7 +228,7 @@ export class Controller extends treedefaults.DefaultController { } tree.setSelection([element], payload); - this.openEditor(element, preserveFocus); + this.openEditor(element, isDoubleClick); } return true; @@ -246,7 +245,7 @@ export class Controller extends treedefaults.DefaultController { return true; } - this.openEditor(element, false); + this.openEditor(element, true); return super.onEnter(tree, event); } @@ -280,11 +279,14 @@ export class Controller extends treedefaults.DefaultController { return true; } - private openEditor(element: OpenEditor, preserveFocus: boolean): void { + private openEditor(element: OpenEditor, pinEditor: boolean): void { if (element) { this.telemetryService.publicLog('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'openEditors' }); const position = this.model.positionOfGroup(element.editorGroup); - this.editorService.openEditor(element.editorInput, EditorOptions.create({ preserveFocus }), position) + if (pinEditor) { + this.editorService.pinEditor(position, element.editorInput); + } + this.editorService.openEditor(element.editorInput, EditorOptions.create({ preserveFocus: !pinEditor }), position) .done(() => this.editorService.activateGroup(position), errors.onUnexpectedError); } } -- GitLab