@@ -68,14 +68,17 @@ const removeLegacyColorCustomizations = async (): Promise<SettingsDictionary> =>
6868 return settings ;
6969} ;
7070
71- const getOpenTabs = ( ) : string [ ] =>
72- vscode . window . tabGroups . all
73- . map ( tabGroup => tabGroup . tabs )
74- . map ( tabs => tabs . map ( tab => tab . label ) )
75- . flat ( ) ;
71+ const getOpenTabs = ( ) : string [ ] => {
72+ const labelList = vscode . window . tabGroups . all . map ( tabGroup => tabGroup . tabs ) . map ( tabs => tabs . map ( tab => tab . label ) ) ;
7673
77- const checkOpenTabs = ( openTabs : string [ ] ) : boolean =>
78- openTabs . some ( openTab => [ 'Settings' , 'settings.json' ] . includes ( openTab ) ) ;
74+ return labelList . flat ( ) ;
75+ } ;
76+
77+ const checkOpenTabs = ( openTabs : string [ ] , fromSettingsChange = false ) : boolean => {
78+ const labelsList = fromSettingsChange ? [ 'settings.json' ] : [ 'Settings' , 'settings.json' ] ;
79+
80+ return openTabs . some ( openTab => labelsList . includes ( openTab ) ) ;
81+ } ;
7982
8083const displayTabsMessage = ( ) : void => {
8184 vscode . window . showErrorMessage (
@@ -86,10 +89,10 @@ const displayTabsMessage = (): void => {
8689 ) ;
8790} ;
8891
89- const disableTokenCustomization = async ( ) : Promise < void > => {
92+ const disableTokenCustomization = async ( fromSettingsChange = false ) : Promise < void > => {
9093 const openTabs = getOpenTabs ( ) ;
9194
92- if ( checkOpenTabs ( openTabs ) ) {
95+ if ( checkOpenTabs ( openTabs , fromSettingsChange ) ) {
9396 displayTabsMessage ( ) ;
9497
9598 return ;
@@ -125,10 +128,10 @@ const getActiveRulesFromSettings = (configs: vscode.WorkspaceConfiguration): Tex
125128 return rules ;
126129} ;
127130
128- const updateTokenCustomization = async ( ) : Promise < void > => {
131+ const updateTokenCustomization = async ( fromSettingsChange = false ) : Promise < void > => {
129132 const openTabs = getOpenTabs ( ) ;
130133
131- if ( checkOpenTabs ( openTabs ) ) {
134+ if ( checkOpenTabs ( openTabs , fromSettingsChange ) ) {
132135 displayTabsMessage ( ) ;
133136
134137 return ;
0 commit comments