From 60526cb4bebf2c93db30a225a5605cb3715f283e Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Fri, 1 Feb 2019 09:29:27 +0100
Subject: [PATCH] rename closeTabsInMRUOrder to focusRecentEditorAfterClose
 (for #43459)

---
 src/vs/workbench/browser/parts/editor/editor.ts          | 2 +-
 src/vs/workbench/browser/workbench.contribution.ts       | 4 ++--
 src/vs/workbench/common/editor.ts                        | 2 +-
 src/vs/workbench/common/editor/editorGroup.ts            | 6 +++---
 src/vs/workbench/test/common/editor/editorGroups.test.ts | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editor.ts b/src/vs/workbench/browser/parts/editor/editor.ts
index 09b13c06a1b..c37f2d0a275 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 3fcab416418..3798dbde4fd 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 ae666377dd3..7b264e5598a 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 f8d1e48fe61..af7ff8be8bb 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 c69335c58be..b29dbd3f74d 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);
-- 
GitLab