fix tab moves focus (#174704)

Author: meganrogge

src/vs/editor/browser/config/editorConfiguration.ts

@@ -12,7 +12,7 @@ import * as platform from 'vs/base/common/platform';
 import { ElementSizeObserver } from 'vs/editor/browser/config/elementSizeObserver';
 import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
 import { migrateOptions } from 'vs/editor/browser/config/migrateOptions';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
+import { TabFocus, TabFocusContext } from 'vs/editor/browser/config/tabFocus';
 import { ComputeOptionsMemory, ConfigurationChangedEvent, EditorOption, editorOptionsRegistry, FindComputedEditorOptionValueById, IComputedEditorOptions, IEditorOptions, IEnvironmentalOptions } from 'vs/editor/common/config/editorOptions';
 import { EditorZoom } from 'vs/editor/common/config/editorZoom';
 import { BareFontInfo, FontInfo, IValidatedEditorOptions } from 'vs/editor/common/config/fontInfo';
@@ -86,7 +86,6 @@ export class EditorConfiguration extends Disposable implements IEditorConfigurat
 		this._register(FontMeasurements.onDidChange(() => this._recomputeOptions()));
 		this._register(browser.PixelRatio.onDidChange(() => this._recomputeOptions()));
 		this._register(this._accessibilityService.onDidChangeScreenReaderOptimized(() => this._recomputeOptions()));
-		TabFocus.setTabFocusMode(this.options.get(EditorOption.tabFocusMode));
 	}
 
 	private _recomputeOptions(): void {
@@ -117,7 +116,7 @@ export class EditorConfiguration extends Disposable implements IEditorConfigurat
 			lineNumbersDigitCount: this._lineNumbersDigitCount,
 			emptySelectionClipboard: partialEnv.emptySelectionClipboard,
 			pixelRatio: partialEnv.pixelRatio,
-			tabFocusMode: TabFocus.getTabFocusMode(),
+			tabFocusMode: TabFocus.getTabFocusMode(TabFocusContext.Editor),
 			accessibilitySupport: partialEnv.accessibilitySupport
 		};
 		return EditorOptionsUtil.computeOptions(this._validatedOptions, env);

src/vs/editor/browser/config/tabFocus.ts

@@ -5,23 +5,32 @@
 
 import { Emitter, Event } from 'vs/base/common/event';
 
+export const enum TabFocusContext {
+	Terminal = 'terminalFocus',
+	Editor = 'editorFocus'
+}
+
 class TabFocusImpl {
-	private _tabFocus: boolean = false;
+	private _tabFocusTerminal: boolean = false;
+	private _tabFocusEditor: boolean = false;
 
 	private readonly _onDidChangeTabFocus = new Emitter<boolean>();
 	public readonly onDidChangeTabFocus: Event<boolean> = this._onDidChangeTabFocus.event;
 
-	public getTabFocusMode(): boolean {
-		return this._tabFocus;
+	public getTabFocusMode(context: TabFocusContext): boolean {
+		return context === TabFocusContext.Terminal ? this._tabFocusTerminal : this._tabFocusEditor;
 	}
 
-	public setTabFocusMode(tabFocusMode: boolean): void {
-		if (this._tabFocus === tabFocusMode) {
+	public setTabFocusMode(tabFocusMode: boolean, context: TabFocusContext): void {
+		if ((context === TabFocusContext.Terminal && this._tabFocusTerminal === tabFocusMode) || (context === TabFocusContext.Editor && this._tabFocusEditor === tabFocusMode)) {
 			return;
 		}
-
-		this._tabFocus = tabFocusMode;
-		this._onDidChangeTabFocus.fire(this._tabFocus);
+		if (context === TabFocusContext.Terminal) {
+			this._tabFocusTerminal = tabFocusMode;
+		} else {
+			this._tabFocusEditor = tabFocusMode;
+		}
+		this._onDidChangeTabFocus.fire(this._tabFocusTerminal);
 	}
 }
 

src/vs/editor/browser/widget/codeEditorWidget.ts

@@ -60,6 +60,7 @@ import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguratio
 import { IDimension } from 'vs/editor/common/core/dimension';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { CodeEditorContributions } from 'vs/editor/browser/widget/codeEditorContributions';
+import { TabFocus, TabFocusContext } from 'vs/editor/browser/config/tabFocus';
 
 let EDITOR_ID = 0;
 
@@ -1963,6 +1964,7 @@ class EditorContextKeysManager extends Disposable {
 		this._register(this._editor.onDidBlurEditorText(() => this._updateFromFocus()));
 		this._register(this._editor.onDidChangeModel(() => this._updateFromModel()));
 		this._register(this._editor.onDidChangeConfiguration(() => this._updateFromModel()));
+		this._register(TabFocus.onDidChangeTabFocus(() => this._editorTabMovesFocus.set(TabFocus.getTabFocusMode(TabFocusContext.Editor))));
 
 		this._updateFromConfig();
 		this._updateFromSelection();

src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts

@@ -5,10 +5,11 @@
 
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
+import { TabFocus, TabFocusContext } from 'vs/editor/browser/config/tabFocus';
 import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import * as nls from 'vs/nls';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 export class ToggleTabFocusModeAction extends Action2 {
@@ -30,9 +31,10 @@ export class ToggleTabFocusModeAction extends Action2 {
 	}
 
 	public run(accessor: ServicesAccessor): void {
-		const oldValue = TabFocus.getTabFocusMode();
+		const context = accessor.get(IContextKeyService).getContextKeyValue('focusedView') === 'terminal' ? TabFocusContext.Terminal : TabFocusContext.Editor;
+		const oldValue = TabFocus.getTabFocusMode(context);
 		const newValue = !oldValue;
-		TabFocus.setTabFocusMode(newValue);
+		TabFocus.setTabFocusMode(newValue, context);
 		if (newValue) {
 			alert(nls.localize('toggle.tabMovesFocus.on', "Pressing Tab will now move focus to the next focusable element"));
 		} else {

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

@@ -28,7 +28,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ILanguageService, ILanguageSelection } from 'vs/editor/common/languages/language';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
+import { TabFocus, TabFocusContext } from 'vs/editor/browser/config/tabFocus';
 import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { EncodingMode, IEncodingSupport, ILanguageSupport, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
@@ -52,6 +52,7 @@ import { themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
 import { AutomaticLanguageDetectionLikelyWrongClassification, AutomaticLanguageDetectionLikelyWrongId, IAutomaticLanguageDetectionLikelyWrongData, ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 class SideBySideEditorEncodingSupport implements IEncodingSupport {
 	constructor(private primary: IEncodingSupport, private secondary: IEncodingSupport) { }
@@ -306,7 +307,8 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		@ILanguageService private readonly languageService: ILanguageService,
 		@ITextFileService private readonly textFileService: ITextFileService,
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService
 	) {
 		super();
 
@@ -817,7 +819,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 	}
 
 	private onTabFocusModeChange(): void {
-		const info: StateDelta = { type: 'tabFocusMode', tabFocusMode: TabFocus.getTabFocusMode() };
+		const info: StateDelta = { type: 'tabFocusMode', tabFocusMode: TabFocus.getTabFocusMode(this.contextKeyService.getContextKeyValue('focusedView') === 'terminal' ? TabFocusContext.Terminal : TabFocusContext.Editor) };
 
 		this.updateState(info);
 	}

src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts

@@ -32,6 +32,7 @@ import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileConstants';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { TabFocus, TabFocusContext } from 'vs/editor/browser/config/tabFocus';
 
 const CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE = new RawContextKey<boolean>('accessibilityHelpWidgetVisible', false);
 
@@ -229,7 +230,7 @@ class AccessibilityHelpWidget extends Widget implements IOverlayWidget {
 		const NLS_TAB_FOCUS_MODE_OFF = nls.localize('tabFocusModeOffMsg', "Pressing Tab in the current editor will insert the tab character. Toggle this behavior by pressing {0}.");
 		const NLS_TAB_FOCUS_MODE_OFF_NO_KB = nls.localize('tabFocusModeOffMsgNoKb', "Pressing Tab in the current editor will insert the tab character. The command {0} is currently not triggerable by a keybinding.");
 
-		if (options.get(EditorOption.tabFocusMode)) {
+		if (TabFocus.getTabFocusMode(TabFocusContext.Editor)) {
 			text += '\n\n - ' + this._descriptionForCommand(ToggleTabFocusModeAction.ID, NLS_TAB_FOCUS_MODE_ON, NLS_TAB_FOCUS_MODE_ON_NO_KB);
 		} else {
 			text += '\n\n - ' + this._descriptionForCommand(ToggleTabFocusModeAction.ID, NLS_TAB_FOCUS_MODE_OFF, NLS_TAB_FOCUS_MODE_OFF_NO_KB);

src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

@@ -25,7 +25,7 @@ import { isMacintosh, isWindows, OperatingSystem, OS } from 'vs/base/common/plat
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
+import { TabFocus, TabFocusContext } from 'vs/editor/browser/config/tabFocus';
 import { FindReplaceState } from 'vs/editor/contrib/find/browser/findState';
 import * as nls from 'vs/nls';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
@@ -1024,7 +1024,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			}
 
 			// If tab focus mode is on, tab is not passed to the terminal
-			if (TabFocus.getTabFocusMode() && event.keyCode === 9) {
+			if (TabFocus.getTabFocusMode(TabFocusContext.Terminal) && event.keyCode === 9) {
 				return false;
 			}
 

src/vs/workbench/contrib/terminal/browser/terminalMainContribution.ts

@@ -5,7 +5,7 @@
 
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
-import { TabFocus } from 'vs/editor/browser/config/tabFocus';
+import { TabFocus, TabFocusContext } from 'vs/editor/browser/config/tabFocus';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ILabelService } from 'vs/platform/label/common/label';
@@ -21,8 +21,6 @@ import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/s
  * be more relevant).
  */
 export class TerminalMainContribution extends Disposable implements IWorkbenchContribution {
-	private _editorTabFocus: boolean | undefined;
-	private _terminalTabFocus: boolean | undefined;
 	constructor(
 		@IEditorResolverService editorResolverService: IEditorResolverService,
 		@ILabelService labelService: ILabelService,
@@ -79,30 +77,16 @@ export class TerminalMainContribution extends Disposable implements IWorkbenchCo
 
 		const viewKey = new Set<string>();
 		viewKey.add('focusedView');
-		TabFocus.onDidChangeTabFocus(tabFocus => {
-			if (contextKeyService.getContextKeyValue('focusedView') === 'terminal') {
-				this._terminalTabFocus = tabFocus;
-			} else {
-				this._editorTabFocus = tabFocus;
-			}
-		});
+		TabFocus.setTabFocusMode(configurationService.getValue('editor.tabFocusMode'), TabFocusContext.Editor);
+		TabFocus.setTabFocusMode(configurationService.getValue(TerminalSettingId.TabFocusMode), TabFocusContext.Terminal);
 		this._register(contextKeyService.onDidChangeContext((c) => {
 			if (c.affectsSome(viewKey)) {
 				if (contextKeyService.getContextKeyValue('focusedView') === 'terminal') {
-					this._editorTabFocus = TabFocus.getTabFocusMode();
-					TabFocus.setTabFocusMode(this._terminalTabFocus ?? configurationService.getValue(TerminalSettingId.TabFocusMode));
+					TabFocus.setTabFocusMode(configurationService.getValue(TerminalSettingId.TabFocusMode), TabFocusContext.Terminal);
 				} else {
-					this._terminalTabFocus = TabFocus.getTabFocusMode();
-					TabFocus.setTabFocusMode(this._editorTabFocus ?? configurationService.getValue('editor.tabFocusMode'));
+					TabFocus.setTabFocusMode(configurationService.getValue('editor.tabFocusMode'), TabFocusContext.Editor);
 				}
 			}
 		}));
-		this._register(configurationService.onDidChangeConfiguration(async e => {
-			if (e.affectsConfiguration('editor.tabFocusMode')) {
-				this._editorTabFocus = undefined;
-			} else if (e.affectsConfiguration(TerminalSettingId.TabFocusMode)) {
-				this._terminalTabFocus = undefined;
-			}
-		}));
 	}
 }