fix issues with tab move focus mode (microsoft#175135)

Author: meganrogge

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

@@ -14,23 +14,20 @@ class TabFocusImpl {
 	private _tabFocusTerminal: boolean = false;
 	private _tabFocusEditor: boolean = false;
 
-	private readonly _onDidChangeTabFocus = new Emitter<boolean>();
-	public readonly onDidChangeTabFocus: Event<boolean> = this._onDidChangeTabFocus.event;
+	private readonly _onDidChangeTabFocus = new Emitter<void>();
+	public readonly onDidChangeTabFocus: Event<void> = this._onDidChangeTabFocus.event;
 
 	public getTabFocusMode(context: TabFocusContext): boolean {
 		return context === TabFocusContext.Terminal ? this._tabFocusTerminal : this._tabFocusEditor;
 	}
 
 	public setTabFocusMode(tabFocusMode: boolean, context: TabFocusContext): void {
-		if ((context === TabFocusContext.Terminal && this._tabFocusTerminal === tabFocusMode) || (context === TabFocusContext.Editor && this._tabFocusEditor === tabFocusMode)) {
-			return;
-		}
 		if (context === TabFocusContext.Terminal) {
 			this._tabFocusTerminal = tabFocusMode;
 		} else {
 			this._tabFocusEditor = tabFocusMode;
 		}
-		this._onDidChangeTabFocus.fire(this._tabFocusTerminal);
+		this._onDidChangeTabFocus.fire();
 	}
 }
 

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

@@ -294,7 +294,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 	private readonly languageElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 	private readonly metadataElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 	private readonly currentProblemStatus: ShowCurrentMarkerInStatusbarContribution = this._register(this.instantiationService.createInstance(ShowCurrentMarkerInStatusbarContribution));
-
+	private _previousViewContext: 'terminal' | 'editor' | undefined;
 	private readonly state = new State();
 	private readonly activeEditorListeners = this._register(new DisposableStore());
 	private readonly delayedRender = this._register(new MutableDisposable());
@@ -321,6 +321,19 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		this._register(this.textFileService.untitled.onDidChangeEncoding(model => this.onResourceEncodingChange(model.resource)));
 		this._register(this.textFileService.files.onDidChangeEncoding(model => this.onResourceEncodingChange((model.resource))));
 		this._register(Event.runAndSubscribe(TabFocus.onDidChangeTabFocus, () => this.onTabFocusModeChange()));
+		const viewKey = new Set<string>();
+		viewKey.add('focusedView');
+		this._register(this.contextKeyService.onDidChangeContext((c) => {
+			if (c.affectsSome(viewKey)) {
+				const terminalFocus = this.contextKeyService.getContextKeyValue('focusedView') === 'terminal';
+				const context = terminalFocus ? 'terminal' : 'editor';
+				if (this._previousViewContext === context) {
+					return;
+				}
+				this._previousViewContext = context;
+				this.onTabFocusModeChange();
+			}
+		}));
 	}
 
 	private registerCommands(): void {

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

@@ -7,7 +7,6 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 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';
 import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
@@ -27,8 +26,7 @@ export class TerminalMainContribution extends Disposable implements IWorkbenchCo
 		@ITerminalService terminalService: ITerminalService,
 		@ITerminalEditorService terminalEditorService: ITerminalEditorService,
 		@ITerminalGroupService terminalGroupService: ITerminalGroupService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService
+		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super();
 
@@ -75,18 +73,7 @@ export class TerminalMainContribution extends Disposable implements IWorkbenchCo
 			}
 		});
 
-		const viewKey = new Set<string>();
-		viewKey.add('focusedView');
 		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') {
-					TabFocus.setTabFocusMode(configurationService.getValue(TerminalSettingId.TabFocusMode), TabFocusContext.Terminal);
-				} else {
-					TabFocus.setTabFocusMode(configurationService.getValue('editor.tabFocusMode'), TabFocusContext.Editor);
-				}
-			}
-		}));
 	}
 }