@@ -53,6 +53,7 @@ import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/
53
53
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput' ;
54
54
import { AutomaticLanguageDetectionLikelyWrongClassification , AutomaticLanguageDetectionLikelyWrongId , IAutomaticLanguageDetectionLikelyWrongData , ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService' ;
55
55
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey' ;
56
+ import { TerminalSettingId } from 'vs/platform/terminal/common/terminal' ;
56
57
57
58
class SideBySideEditorEncodingSupport implements IEncodingSupport {
58
59
constructor ( private primary : IEncodingSupport , private secondary : IEncodingSupport ) { }
@@ -308,7 +309,8 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
308
309
@ITextFileService private readonly textFileService : ITextFileService ,
309
310
@IStatusbarService private readonly statusbarService : IStatusbarService ,
310
311
@IInstantiationService private readonly instantiationService : IInstantiationService ,
311
- @IContextKeyService private readonly contextKeyService : IContextKeyService
312
+ @IContextKeyService private readonly contextKeyService : IContextKeyService ,
313
+ @IConfigurationService private readonly configurationService : IConfigurationService
312
314
) {
313
315
super ( ) ;
314
316
@@ -334,6 +336,15 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
334
336
this . onTabFocusModeChange ( ) ;
335
337
}
336
338
} ) ) ;
339
+ this . _register ( this . configurationService . onDidChangeConfiguration ( e => {
340
+ if ( e . affectsConfiguration ( 'editor.tabFocusMode' ) ) {
341
+ TabFocus . setTabFocusMode ( this . configurationService . getValue ( 'editor.tabFocusMode' ) , TabFocusContext . Editor ) ;
342
+ this . onTabFocusModeChange ( ) ;
343
+ } else if ( e . affectsConfiguration ( TerminalSettingId . TabFocusMode ) ) {
344
+ TabFocus . setTabFocusMode ( this . configurationService . getValue ( TerminalSettingId . TabFocusMode ) , TabFocusContext . Terminal ) ;
345
+ this . onTabFocusModeChange ( ) ;
346
+ }
347
+ } ) ) ;
337
348
}
338
349
339
350
private registerCommands ( ) : void {
@@ -833,7 +844,6 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
833
844
834
845
private onTabFocusModeChange ( ) : void {
835
846
const info : StateDelta = { type : 'tabFocusMode' , tabFocusMode : TabFocus . getTabFocusMode ( this . contextKeyService . getContextKeyValue ( 'focusedView' ) === 'terminal' ? TabFocusContext . Terminal : TabFocusContext . Editor ) } ;
836
-
837
847
this . updateState ( info ) ;
838
848
}
839
849
0 commit comments