Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

respond to config changes of tab focus mode #175261

Merged
merged 2 commits into from Feb 23, 2023
Merged

respond to config changes of tab focus mode #175261

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78b2ff
fix #174924
meganrogge Feb 23, 2023
4862058
Merge branch 'main' into merogge/configuration
meganrogge Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/vs/workbench/browser/parts/editor/editorStatus.ts
View file
Open in desktop
Expand Up @@ -53,6 +53,7 @@ import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/
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';
import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';

class SideBySideEditorEncodingSupport implements IEncodingSupport {
constructor(private primary: IEncodingSupport, private secondary: IEncodingSupport) { }
Expand Down Expand Up @@ -308,7 +309,8 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
@ITextFileService private readonly textFileService: ITextFileService,
@IStatusbarService private readonly statusbarService: IStatusbarService,
@IInstantiationService private readonly instantiationService: IInstantiationService,
@IContextKeyService private readonly contextKeyService: IContextKeyService
@IContextKeyService private readonly contextKeyService: IContextKeyService,
@IConfigurationService private readonly configurationService: IConfigurationService
) {
super();

Expand All @@ -334,6 +336,15 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
this.onTabFocusModeChange();
}
}));
this._register(this.configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration('editor.tabFocusMode')) {
TabFocus.setTabFocusMode(this.configurationService.getValue('editor.tabFocusMode'), TabFocusContext.Editor);
this.onTabFocusModeChange();
} else if (e.affectsConfiguration(TerminalSettingId.TabFocusMode)) {
TabFocus.setTabFocusMode(this.configurationService.getValue(TerminalSettingId.TabFocusMode), TabFocusContext.Terminal);
this.onTabFocusModeChange();
}
}));
}

private registerCommands(): void {
Expand Down Expand Up @@ -833,7 +844,6 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {

private onTabFocusModeChange(): void {
const info: StateDelta = { type: 'tabFocusMode', tabFocusMode: TabFocus.getTabFocusMode(this.contextKeyService.getContextKeyValue('focusedView') === 'terminal' ? TabFocusContext.Terminal : TabFocusContext.Editor) };

this.updateState(info);
}

Expand Down