diff --git a/src/vs/workbench/browser/parts/editor/editor.ts b/src/vs/workbench/browser/parts/editor/editor.ts index 09b13c06a1beec64c5201c745f35a574a7f57ca7..c37f2d0a275c3cdb52a42591af9fdb0edef34736 100644 --- a/src/vs/workbench/browser/parts/editor/editor.ts +++ b/src/vs/workbench/browser/parts/editor/editor.ts @@ -30,7 +30,7 @@ export const DEFAULT_EDITOR_PART_OPTIONS: IEditorPartOptions = { highlightModifiedTabs: false, tabCloseButton: 'right', tabSizing: 'fit', - closeTabsInMRUOrder: true, + focusRecentEditorAfterClose: true, showIcons: true, enablePreview: true, openPositioning: 'right', diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts index 3fcab41641867ad0c4c564a8ee1394c03a66dc16..3798dbde4fd71a6068e542f01194eeeb26d361c2 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts @@ -58,9 +58,9 @@ configurationRegistry.registerConfiguration({ ], 'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'tabSizing' }, "Controls the sizing of editor tabs.") }, - 'workbench.editor.closeTabsInMRUOrder': { + 'workbench.editor.focusRecentEditorAfterClose': { 'type': 'boolean', - 'description': nls.localize('closeTabsInMRUOrder', "Controls whether tabs are closed in most recently used order or from left to right."), + 'description': nls.localize('focusRecentEditorAfterClose', "Controls whether tabs are closed in most recently used order or from left to right."), 'default': true }, 'workbench.editor.showIcons': { diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts index ae666377dd33f3d72b7bcba77414e2d2f0d76746..7b264e5598aa58802a537097d01dfdfc218534a3 100644 --- a/src/vs/workbench/common/editor.ts +++ b/src/vs/workbench/common/editor.ts @@ -941,7 +941,7 @@ export interface IWorkbenchEditorPartConfiguration { highlightModifiedTabs?: boolean; tabCloseButton?: 'left' | 'right' | 'off'; tabSizing?: 'fit' | 'shrink'; - closeTabsInMRUOrder?: boolean; + focusRecentEditorAfterClose?: boolean; showIcons?: boolean; enablePreview?: boolean; enablePreviewFromQuickOpen?: boolean; diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts index f8d1e48fe615f393a54e8ed96f376fc08cd895a2..af7ff8be8bb82291550fcd01ad461ee9a70c1ebb 100644 --- a/src/vs/workbench/common/editor/editorGroup.ts +++ b/src/vs/workbench/common/editor/editorGroup.ts @@ -98,7 +98,7 @@ export class EditorGroup extends Disposable { private active: EditorInput | null; // editor in active state private editorOpenPositioning: 'left' | 'right' | 'first' | 'last'; - private closeTabsInMRUOrder: boolean; + private focusRecentEditorAfterClose: boolean; constructor( labelOrSerializedGroup: ISerializedEditorGroup, @@ -123,7 +123,7 @@ export class EditorGroup extends Disposable { private onConfigurationUpdated(event?: IConfigurationChangeEvent): void { this.editorOpenPositioning = this.configurationService.getValue('workbench.editor.openPositioning'); - this.closeTabsInMRUOrder = this.configurationService.getValue('workbench.editor.closeTabsInMRUOrder'); + this.focusRecentEditorAfterClose = this.configurationService.getValue('workbench.editor.focusRecentEditorAfterClose'); } get id(): GroupIdentifier { @@ -335,7 +335,7 @@ export class EditorGroup extends Disposable { // More than one editor if (this.mru.length > 1) { let newActive: EditorInput; - if (this.closeTabsInMRUOrder) { + if (this.focusRecentEditorAfterClose) { newActive = this.mru[1]; // active editor is always first in MRU, so pick second editor after as new active } else { if (index === this.editors.length - 1) { diff --git a/src/vs/workbench/test/common/editor/editorGroups.test.ts b/src/vs/workbench/test/common/editor/editorGroups.test.ts index c69335c58be541b3fc7b415e4913fd21c54b0be7..b29dbd3f74d338b0fb223f30003edbdfc25b0322 100644 --- a/src/vs/workbench/test/common/editor/editorGroups.test.ts +++ b/src/vs/workbench/test/common/editor/editorGroups.test.ts @@ -29,7 +29,7 @@ function inst(): IInstantiationService { inst.stub(ITelemetryService, NullTelemetryService); const config = new TestConfigurationService(); - config.setUserConfiguration('workbench', { editor: { openPositioning: 'right', closeTabsInMRUOrder: true } }); + config.setUserConfiguration('workbench', { editor: { openPositioning: 'right', focusRecentEditorAfterClose: true } }); inst.stub(IConfigurationService, config); return inst; @@ -653,7 +653,7 @@ suite('Workbench editor groups', () => { inst.stub(ITelemetryService, NullTelemetryService); const config = new TestConfigurationService(); - config.setUserConfiguration('workbench', { editor: { closeTabsInMRUOrder: false } }); + config.setUserConfiguration('workbench', { editor: { focusRecentEditorAfterClose: false } }); inst.stub(IConfigurationService, config); const group = inst.createInstance(EditorGroup);