From 27d6c4907ba0f619d59941fff3a5af08faea89d3 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 4 Jun 2018 11:24:04 +0200 Subject: [PATCH] fix #50945 --- .../services/preferences/browser/preferencesService.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts index 8968ae24e94..c9d36e8cbf7 100644 --- a/src/vs/workbench/services/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts @@ -35,8 +35,8 @@ import { parse } from 'vs/base/common/json'; import { ICodeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { assign } from 'vs/base/common/objects'; -import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; -import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroup, IEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; const emptyEditableSettingsContent = '{\n}'; @@ -224,9 +224,12 @@ export class PreferencesService extends Disposable implements IPreferencesServic // Create as needed and open in editor return this.createIfNotExists(editableKeybindings, emptyContents).then(() => { + const activeEditorGroup = this.editorGroupService.activeGroup; + const sideEditorGroup = this.editorGroupService.addGroup(activeEditorGroup.id, GroupDirection.RIGHT); + return TPromise.join([ this.editorService.openEditor({ resource: this.defaultKeybindingsResource, options: { pinned: true, preserveFocus: true }, label: nls.localize('defaultKeybindings', "Default Keybindings"), description: '' }), - this.editorService.openEditor({ resource: editableKeybindings, options: { pinned: true } }, SIDE_GROUP) + this.editorService.openEditor({ resource: editableKeybindings, options: { pinned: true } }, sideEditorGroup.id) ]).then(editors => void 0); }); }