1.Moved the settings into options.

2.Moved tab refresh to updateOptions.
3.Simplified the code using a ternary operator.
4.Renamed the setting from 'workbench.tabIndex.enabled' to 'workbench.editor.showTabIndex'.
5.Removed some irrelevant code.

Author: swordjjjkkk

src/vs/workbench/browser/parts/editor/editor.ts

@@ -33,6 +33,7 @@ export const DEFAULT_EDITOR_PART_OPTIONS: IEditorPartOptions = {
 	tabActionLocation: 'right',
 	tabActionCloseVisibility: true,
 	tabActionUnpinVisibility: true,
+	showTabIndex: false,
 	alwaysShowEditorActions: false,
 	tabSizing: 'fit',
 	tabSizingFixedMinWidth: 50,
@@ -123,6 +124,7 @@ function validateEditorPartOptions(options: IEditorPartOptions): IEditorPartOpti
 		'highlightModifiedTabs': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['highlightModifiedTabs']),
 		'tabActionCloseVisibility': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabActionCloseVisibility']),
 		'tabActionUnpinVisibility': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabActionUnpinVisibility']),
+		'showTabIndex': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['showTabIndex']),
 		'alwaysShowEditorActions': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['alwaysShowEditorActions']),
 		'pinnedTabsOnSeparateRow': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['pinnedTabsOnSeparateRow']),
 		'focusRecentEditorAfterClose': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['focusRecentEditorAfterClose']),

src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts

@@ -58,7 +58,6 @@ import { IReadonlyEditorGroupModel } from 'vs/workbench/common/editor/editorGrou
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { BugIndicatingError } from 'vs/base/common/errors';
 import { applyDragImage } from 'vs/base/browser/dnd';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 interface IEditorInputLabel {
 	readonly editor: EditorInput;
@@ -152,7 +151,6 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 		@IPathService private readonly pathService: IPathService,
 		@ITreeViewsDnDService private readonly treeViewsDragAndDropService: ITreeViewsDnDService,
 		@IEditorResolverService editorResolverService: IEditorResolverService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IHostService hostService: IHostService,
 	) {
 		super(parent, editorPartsView, groupsView, groupView, tabsModel, contextMenuService, instantiationService, contextKeyService, keybindingService, notificationService, quickInputService, themeService, editorResolverService, hostService);
@@ -164,11 +162,6 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 
 		// React to decorations changing for our resource labels
 		this._register(this.tabResourceLabels.onDidChangeDecorations(() => this.doHandleDecorationsChange()));
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('workbench.tabIndex.enabled')) {
-				this.doUpdateEditorLabels();
-			}
-		}));
 	}
 
 	protected override create(parent: HTMLElement): void {
@@ -766,6 +759,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 			oldOptions.hasIcons !== newOptions.hasIcons ||
 			oldOptions.highlightModifiedTabs !== newOptions.highlightModifiedTabs ||
 			oldOptions.wrapTabs !== newOptions.wrapTabs ||
+			oldOptions.showTabIndex !== newOptions.showTabIndex ||
 			!equals(oldOptions.decorations, newOptions.decorations)
 		) {
 			this.redraw();
@@ -1608,13 +1602,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 			fileDecorationBadges = false; // not enough space when sticky tabs are compact
 		} else {
 
-			const enabled = this.configurationService.getValue<boolean>('workbench.tabIndex.enabled');
-
-			if (enabled) {
-				name = (tabIndex + 1).toString() + '. ' + tabLabel.name;
-			} else {
-				name = tabLabel.name;
-			}
+			name = options.showTabIndex ? `${tabIndex + 1}. ${tabLabel.name}` : tabLabel.name
 			description = tabLabel.description || '';
 		}
 

src/vs/workbench/browser/workbench.contribution.ts

@@ -198,6 +198,11 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				default: true,
 				description: localize('workbench.editor.tabActionUnpinVisibility', "Controls the visibility of the tab unpin action button.")
 			},
+			'workbench.editor.showTabIndex': {
+				'type': 'boolean',
+				'default': false,
+				'description': localize('workbench.editor.showTabIndex', "When enabled, will show the tab index.")
+			},
 			'workbench.editor.tabSizing': {
 				'type': 'string',
 				'enum': ['fit', 'shrink', 'fixed'],
@@ -624,11 +629,6 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'default': true,
 				'description': localize('tips.enabled', "When enabled, will show the watermark tips when no editor is open.")
 			},
-			'workbench.tabIndex.enabled': {
-				'type': 'boolean',
-				'default': false,
-				'description': localize('tabIndex.enabled', "When enabled, will show the tab index.")
-			},
 		}
 	});
 

src/vs/workbench/common/editor.ts

@@ -1216,6 +1216,7 @@ interface IEditorPartConfiguration {
 	tabActionLocation?: 'left' | 'right';
 	tabActionCloseVisibility?: boolean;
 	tabActionUnpinVisibility?: boolean;
+	showTabIndex?: boolean;
 	alwaysShowEditorActions?: boolean;
 	tabSizing?: 'fit' | 'shrink' | 'fixed';
 	tabSizingFixedMinWidth?: number;

src/vs/workbench/contrib/preferences/browser/settingsLayout.ts

@@ -101,7 +101,7 @@ export const tocData: ITOCEntry<string> = {
 				{
 					id: 'workbench/appearance',
 					label: localize('appearance', "Appearance"),
-					settings: ['workbench.activityBar.*', 'workbench.*color*', 'workbench.fontAliasing', 'workbench.iconTheme', 'workbench.sidebar.location', 'workbench.*.visible', 'workbench.tips.enabled', 'workbench.tabIndex.enabled', 'workbench.tree.*', 'workbench.view.*']
+					settings: ['workbench.activityBar.*', 'workbench.*color*', 'workbench.fontAliasing', 'workbench.iconTheme', 'workbench.sidebar.location', 'workbench.*.visible', 'workbench.tips.enabled', 'workbench.tree.*', 'workbench.view.*']
 				},
 				{
 					id: 'workbench/breadcrumbs',