@codingame/monaco-vscode-theme-service-override 5.3.0 → 6.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "5.3.0",
+  "version": "6.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0",
-    "@codingame/monaco-vscode-files-service-override": "5.3.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.1",
+    "@codingame/monaco-vscode-files-service-override": "6.0.1"
   }
 }

package/vscode/src/vs/workbench/contrib/themes/browser/themes.contribution.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyChord, KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { equalsIgnoreCase } from 'vscode/vscode/vs/base/common/strings';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -28,9 +28,11 @@ import { isCancellationError, onUnexpectedError } from 'vscode/vscode/vs/base/co
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { DEFAULT_PRODUCT_ICON_THEME_ID, ProductIconThemeData } from '../../../services/themes/browser/productIconThemeData.js';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
@@ -38,14 +40,17 @@ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { IExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { FileIconThemeData } from '../../../services/themes/browser/fileIconThemeData.js';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -259,7 +264,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         }
         try {
             await this.progressService.withProgress({
-                location: 15 ,
+                location: ProgressLocation.Notification,
                 title: ( localizeWithPath(_moduleId, 5, "Installing Extension {0}...", galleryExtension.displayName))
             }, async () => {
                 await this.extensionManagementService.installFromGallery(galleryExtension, {
@@ -412,8 +417,8 @@ registerAction2(class extends Action2 {
             category: Categories.Preferences,
             f1: true,
             keybinding: {
-                weight: 200 ,
-                primary: KeyChord(2048  | 41 , 2048  | 50 )
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyT)
             }
         });
     }
@@ -571,7 +576,7 @@ function configurationEntry(label, configureItem) {
     };
 }
 function openExtensionViewlet(paneCompositeService, query) {
-    return paneCompositeService.openPaneComposite(VIEWLET_ID, 0 , true).then(viewlet => {
+    return paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true).then(viewlet => {
         if (viewlet) {
             (viewlet?.getViewPaneContainer()).search(query);
             viewlet.focus();
@@ -795,15 +800,15 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
         this._commandService = _commandService;
         this._telemetryService = _telemetryService;
         this._hostService = _hostService;
-        if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, -1 )) {
+        if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, StorageScope.APPLICATION)) {
             return;
         }
         setTimeout(async () => {
-            if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, -1 )) {
+            if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, StorageScope.APPLICATION)) {
                 return;
             }
             if (await this._hostService.hadLastFocus()) {
-                this._storageService.store(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, true, -1 , 0 );
+                this._storageService.store(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.USER);
                 if (this._workbenchThemeService.hasUpdatedDefaultThemes()) {
                     this._showYouGotMigratedNotification();
                 }
@@ -898,6 +903,6 @@ DefaultThemeUpdatedNotificationContribution = DefaultThemeUpdatedNotificationCon
     ( (__param(5, IHostService)))
 ], DefaultThemeUpdatedNotificationContribution)));
 const workbenchRegistry = ( (Registry.as(Extensions$1.Workbench)));
-workbenchRegistry.registerWorkbenchContribution(DefaultThemeUpdatedNotificationContribution, 4 );
+workbenchRegistry.registerWorkbenchContribution(DefaultThemeUpdatedNotificationContribution, LifecyclePhase.Eventually);
 
 export { manageExtensionIcon };

package/vscode/src/vs/workbench/services/themes/browser/fileIconThemeData.js

@@ -5,6 +5,7 @@ import { parse, getNodeType } from 'vscode/vscode/vs/base/common/json';
 import { ExtensionData } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { getParseErrorMessage } from 'vscode/vscode/vs/base/common/jsonErrorMessages';
 import { asCSSUrl } from 'vscode/vscode/vs/base/browser/dom';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 
 const _moduleId = "vs/workbench/services/themes/browser/fileIconThemeData";
@@ -65,7 +66,7 @@ class FileIconThemeData {
         return themeData;
     }
     static fromStorageData(storageService) {
-        const input = storageService.get(FileIconThemeData.STORAGE_KEY, 0 );
+        const input = storageService.get(FileIconThemeData.STORAGE_KEY, StorageScope.PROFILE);
         if (!input) {
             return undefined;
         }
@@ -111,7 +112,7 @@ class FileIconThemeData {
             extensionData: ExtensionData.toJSONObject(this.extensionData),
             watch: this.watch
         });
-        storageService.store(FileIconThemeData.STORAGE_KEY, data, 0 , 1 );
+        storageService.store(FileIconThemeData.STORAGE_KEY, data, StorageScope.PROFILE, StorageTarget.MACHINE);
     }
 }
 class FileIconThemeLoader {

package/vscode/src/vs/workbench/services/themes/browser/productIconThemeData.js

@@ -4,6 +4,7 @@ import { dirname, joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { parse, getNodeType } from 'vscode/vscode/vs/base/common/json';
 import { ThemeSettingDefaults, ExtensionData } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { getParseErrorMessage } from 'vscode/vscode/vs/base/common/jsonErrorMessages';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { fontIdRegex, fontWeightRegex, fontStyleRegex, fontFormatRegex } from '../common/productIconThemeSchema.js';
 import { isObject, isString } from 'vscode/vscode/vs/base/common/types';
 import { IconFontDefinition, getIconRegistry } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
@@ -79,7 +80,7 @@ class ProductIconThemeData {
         return themeData;
     }
     static fromStorageData(storageService) {
-        const input = storageService.get(ProductIconThemeData.STORAGE_KEY, 0 );
+        const input = storageService.get(ProductIconThemeData.STORAGE_KEY, StorageScope.PROFILE);
         if (!input) {
             return undefined;
         }
@@ -149,7 +150,7 @@ class ProductIconThemeData {
             iconDefinitions,
             iconFontDefinitions
         });
-        storageService.store(ProductIconThemeData.STORAGE_KEY, data, 0 , 1 );
+        storageService.store(ProductIconThemeData.STORAGE_KEY, data, StorageScope.PROFILE, StorageTarget.MACHINE);
     }
 }
 function _loadProductIconThemeDocument(fileService, location, warnings) {

package/vscode/src/vs/workbench/services/themes/browser/workbenchThemeService.js

@@ -8,6 +8,7 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ColorThemeData } from '../common/colorThemeData.js';
 import { Extensions } from 'vscode/vscode/vs/platform/theme/common/themeService';
@@ -17,9 +18,11 @@ import { Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { FileIconThemeData, FileIconThemeLoader } from './fileIconThemeData.js';
 import { createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { FileChangeType } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { joinPath, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { registerColorThemeSchemas } from '../common/colorThemeSchema.js';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { getRemoteAuthority } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service';
@@ -180,7 +183,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         const initializeFileIconTheme = async () => {
             const devThemes = this.fileIconThemeRegistry.findThemeByExtensionLocation(extDevLoc);
             if (devThemes.length) {
-                return this.setFileIconTheme(devThemes[0].id, 8 );
+                return this.setFileIconTheme(devThemes[0].id, ConfigurationTarget.MEMORY);
             }
             let theme = this.fileIconThemeRegistry.findThemeBySettingsId(this.settings.fileIconTheme);
             if (!theme) {
@@ -192,7 +195,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         const initializeProductIconTheme = async () => {
             const devThemes = this.productIconThemeRegistry.findThemeByExtensionLocation(extDevLoc);
             if (devThemes.length) {
-                return this.setProductIconTheme(devThemes[0].id, 8 );
+                return this.setProductIconTheme(devThemes[0].id, ConfigurationTarget.MEMORY);
             }
             let theme = this.productIconThemeRegistry.findThemeBySettingsId(this.settings.productIconTheme);
             if (!theme) {
@@ -303,7 +306,11 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         });
     }
     installPreferredSchemeListener() {
-        this._register(this.hostColorService.onDidChangeColorScheme(() => this.restoreColorTheme()));
+        this._register(this.hostColorService.onDidChangeColorScheme(() => {
+            if (this.settings.isDetectingColorScheme()) {
+                this.restoreColorTheme();
+            }
+        }));
     }
     hasUpdatedDefaultThemes() {
         return this.hasDefaultUpdated;
@@ -667,7 +674,7 @@ class ThemeFileWatcher {
                 this.watchedLocation = theme.location;
                 this.watcherDisposable = this.fileService.watch(theme.location);
                 this.fileService.onDidFilesChange(e => {
-                    if (this.watchedLocation && e.contains(this.watchedLocation, 0 )) {
+                    if (this.watchedLocation && e.contains(this.watchedLocation, FileChangeType.UPDATED)) {
                         this.onUpdate();
                     }
                 });

package/vscode/src/vs/workbench/services/themes/common/colorThemeData.js

@@ -23,6 +23,8 @@ import { getParseErrorMessage } from 'vscode/vscode/vs/base/common/jsonErrorMess
 import { parse as parse$1 } from './plistParser.js';
 import { getTokenClassificationRegistry, TokenStyle, parseClassifierString, SemanticTokenRule } from 'vscode/vscode/vs/platform/theme/common/tokenClassificationRegistry';
 import { createMatchers } from './textMateScopeMatcher.js';
+import { CharCode } from 'vscode/vscode/vs/base/common/charCode';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ColorScheme } from 'vscode/vscode/vs/platform/theme/common/theme';
 
 const _moduleId = "vs/workbench/services/themes/common/colorThemeData";
@@ -471,7 +473,7 @@ class ColorThemeData {
             colorMap: colorMapData,
             watch: this.watch
         });
-        storageService.store(ColorThemeData.STORAGE_KEY, value, 0 , 0 );
+        storageService.store(ColorThemeData.STORAGE_KEY, value, StorageScope.PROFILE, StorageTarget.USER);
     }
     get baseTheme() {
         return this.classNames[0];
@@ -510,7 +512,7 @@ class ColorThemeData {
         return themeData;
     }
     static fromStorageData(storageService) {
-        const input = storageService.get(ColorThemeData.STORAGE_KEY, 0 );
+        const input = storageService.get(ColorThemeData.STORAGE_KEY, StorageScope.PROFILE);
         if (!input) {
             return undefined;
         }
@@ -848,10 +850,10 @@ function normalizeColor(color) {
         color = Color.Format.CSS.formatHexA(color, true);
     }
     const len = color.length;
-    if (color.charCodeAt(0) !== 35  || (len !== 4 && len !== 5 && len !== 7 && len !== 9)) {
+    if (color.charCodeAt(0) !== CharCode.Hash || (len !== 4 && len !== 5 && len !== 7 && len !== 9)) {
         return undefined;
     }
-    const result = [35 ];
+    const result = [CharCode.Hash];
     for (let i = 1; i < len; i++) {
         const upper = hexUpper(color.charCodeAt(i));
         if (!upper) {
@@ -862,17 +864,17 @@ function normalizeColor(color) {
             result.push(upper);
         }
     }
-    if (result.length === 9 && result[7] === 70  && result[8] === 70 ) {
+    if (result.length === 9 && result[7] === CharCode.F && result[8] === CharCode.F) {
         result.length = 7;
     }
     return String.fromCharCode(...result);
 }
 function hexUpper(charCode) {
-    if (charCode >= 48  && charCode <= 57  || charCode >= 65  && charCode <= 70 ) {
+    if (charCode >= CharCode.Digit0 && charCode <= CharCode.Digit9 || charCode >= CharCode.A && charCode <= CharCode.F) {
         return charCode;
     }
-    else if (charCode >= 97  && charCode <= 102 ) {
-        return charCode - 97  + 65 ;
+    else if (charCode >= CharCode.a && charCode <= CharCode.f) {
+        return charCode - CharCode.a + CharCode.A;
     }
     return 0;
 }

package/vscode/src/vs/workbench/services/themes/common/plistParser.js

@@ -1,10 +1,28 @@
+var ChCode;
+( (function(ChCode) {
+    ChCode[ChCode["BOM"] = 65279] = "BOM";
+    ChCode[ChCode["SPACE"] = 32] = "SPACE";
+    ChCode[ChCode["TAB"] = 9] = "TAB";
+    ChCode[ChCode["CARRIAGE_RETURN"] = 13] = "CARRIAGE_RETURN";
+    ChCode[ChCode["LINE_FEED"] = 10] = "LINE_FEED";
+    ChCode[ChCode["SLASH"] = 47] = "SLASH";
+    ChCode[ChCode["LESS_THAN"] = 60] = "LESS_THAN";
+    ChCode[ChCode["QUESTION_MARK"] = 63] = "QUESTION_MARK";
+    ChCode[ChCode["EXCLAMATION_MARK"] = 33] = "EXCLAMATION_MARK";
+})(ChCode || (ChCode = {})));
+var State;
+( (function(State) {
+    State[State["ROOT_STATE"] = 0] = "ROOT_STATE";
+    State[State["DICT_STATE"] = 1] = "DICT_STATE";
+    State[State["ARR_STATE"] = 2] = "ARR_STATE";
+})(State || (State = {})));
 function parse(content) {
     return _parse(content);
 }
 function _parse(content, filename, locationKeyName) {
     const len = content.length;
     let pos = 0;
-    if (len > 0 && content.charCodeAt(0) === 65279 ) {
+    if (len > 0 && content.charCodeAt(0) === ChCode.BOM) {
         pos = 1;
     }
     function advancePosBy(by) {
@@ -20,7 +38,7 @@ function _parse(content, filename, locationKeyName) {
     function skipWhitespace() {
         while (pos < len) {
             const chCode = content.charCodeAt(pos);
-            if (chCode !== 32  && chCode !== 9  && chCode !== 13  && chCode !== 10 ) {
+            if (chCode !== ChCode.SPACE && chCode !== ChCode.TAB && chCode !== ChCode.CARRIAGE_RETURN && chCode !== ChCode.LINE_FEED) {
                 break;
             }
             advancePosBy(1);
@@ -55,7 +73,7 @@ function _parse(content, filename, locationKeyName) {
             return r;
         }
     }
-    let state = 0 ;
+    let state = State.ROOT_STATE;
     let cur = null;
     const stateStack = [];
     const objStack = [];
@@ -86,7 +104,7 @@ function _parse(content, filename, locationKeyName) {
             const newDict = {};
             cur[curKey] = newDict;
             curKey = null;
-            pushState(1 , newDict);
+            pushState(State.DICT_STATE, newDict);
         },
         enterArray: function () {
             if (curKey === null) {
@@ -95,38 +113,38 @@ function _parse(content, filename, locationKeyName) {
             const newArr = [];
             cur[curKey] = newArr;
             curKey = null;
-            pushState(2 , newArr);
+            pushState(State.ARR_STATE, newArr);
         }
     };
     const arrState = {
         enterDict: function () {
             const newDict = {};
             cur.push(newDict);
-            pushState(1 , newDict);
+            pushState(State.DICT_STATE, newDict);
         },
         enterArray: function () {
             const newArr = [];
             cur.push(newArr);
-            pushState(2 , newArr);
+            pushState(State.ARR_STATE, newArr);
         }
     };
     function enterDict() {
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             dictState.enterDict();
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             arrState.enterDict();
         }
         else {
             cur = {};
-            pushState(1 , cur);
+            pushState(State.DICT_STATE, cur);
         }
     }
     function leaveDict() {
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             popState();
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             return fail('unexpected </dict>');
         }
         else {
@@ -134,22 +152,22 @@ function _parse(content, filename, locationKeyName) {
         }
     }
     function enterArray() {
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             dictState.enterArray();
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             arrState.enterArray();
         }
         else {
             cur = [];
-            pushState(2 , cur);
+            pushState(State.ARR_STATE, cur);
         }
     }
     function leaveArray() {
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             return fail('unexpected </array>');
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             popState();
         }
         else {
@@ -157,13 +175,13 @@ function _parse(content, filename, locationKeyName) {
         }
     }
     function acceptKey(val) {
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             if (curKey !== null) {
                 return fail('too many <key>');
             }
             curKey = val;
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             return fail('unexpected <key>');
         }
         else {
@@ -171,14 +189,14 @@ function _parse(content, filename, locationKeyName) {
         }
     }
     function acceptString(val) {
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             if (curKey === null) {
                 return fail('missing <key>');
             }
             cur[curKey] = val;
             curKey = null;
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             cur.push(val);
         }
         else {
@@ -189,14 +207,14 @@ function _parse(content, filename, locationKeyName) {
         if (isNaN(val)) {
             return fail('cannot parse float');
         }
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             if (curKey === null) {
                 return fail('missing <key>');
             }
             cur[curKey] = val;
             curKey = null;
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             cur.push(val);
         }
         else {
@@ -207,14 +225,14 @@ function _parse(content, filename, locationKeyName) {
         if (isNaN(val)) {
             return fail('cannot parse integer');
         }
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             if (curKey === null) {
                 return fail('missing <key>');
             }
             cur[curKey] = val;
             curKey = null;
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             cur.push(val);
         }
         else {
@@ -222,14 +240,14 @@ function _parse(content, filename, locationKeyName) {
         }
     }
     function acceptDate(val) {
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             if (curKey === null) {
                 return fail('missing <key>');
             }
             cur[curKey] = val;
             curKey = null;
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             cur.push(val);
         }
         else {
@@ -237,14 +255,14 @@ function _parse(content, filename, locationKeyName) {
         }
     }
     function acceptData(val) {
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             if (curKey === null) {
                 return fail('missing <key>');
             }
             cur[curKey] = val;
             curKey = null;
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             cur.push(val);
         }
         else {
@@ -252,14 +270,14 @@ function _parse(content, filename, locationKeyName) {
         }
     }
     function acceptBool(val) {
-        if (state === 1 ) {
+        if (state === State.DICT_STATE) {
             if (curKey === null) {
                 return fail('missing <key>');
             }
             cur[curKey] = val;
             curKey = null;
         }
-        else if (state === 2 ) {
+        else if (state === State.ARR_STATE) {
             cur.push(val);
         }
         else {
@@ -285,7 +303,7 @@ function _parse(content, filename, locationKeyName) {
     function parseOpenTag() {
         let r = captureUntil('>');
         let isClosed = false;
-        if (r.charCodeAt(r.length - 1) === 47 ) {
+        if (r.charCodeAt(r.length - 1) === ChCode.SLASH) {
             isClosed = true;
             r = r.substring(0, r.length - 1);
         }
@@ -309,19 +327,19 @@ function _parse(content, filename, locationKeyName) {
         }
         const chCode = content.charCodeAt(pos);
         advancePosBy(1);
-        if (chCode !== 60 ) {
+        if (chCode !== ChCode.LESS_THAN) {
             return fail('expected <');
         }
         if (pos >= len) {
             return fail('unexpected end of input');
         }
         const peekChCode = content.charCodeAt(pos);
-        if (peekChCode === 63 ) {
+        if (peekChCode === ChCode.QUESTION_MARK) {
             advancePosBy(1);
             advanceUntil('?>');
             continue;
         }
-        if (peekChCode === 33 ) {
+        if (peekChCode === ChCode.EXCLAMATION_MARK) {
             advancePosBy(1);
             if (advanceIfStartsWith('--')) {
                 advanceUntil('-->');
@@ -330,7 +348,7 @@ function _parse(content, filename, locationKeyName) {
             advanceUntil('>');
             continue;
         }
-        if (peekChCode === 47 ) {
+        if (peekChCode === ChCode.SLASH) {
             advancePosBy(1);
             skipWhitespace();
             if (advanceIfStartsWith('plist')) {

package/vscode/src/vs/workbench/services/themes/common/themeConfiguration.js

@@ -1,7 +1,7 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { isUndefined } from 'vscode/vscode/vs/base/common/types';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { textmateColorGroupSchemaId, textmateColorsSchemaId } from './colorThemeSchema.js';
 import { workbenchColorsSchemaId } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
@@ -16,6 +16,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { tokenStylingSchemaId } from 'vscode/vscode/vs/platform/theme/common/tokenClassificationRegistry';
 import { ThemeSettings, ThemeSettingDefaults } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { ColorScheme } from 'vscode/vscode/vs/platform/theme/common/theme';
 
@@ -156,7 +157,7 @@ const detectHCSchemeSettingSchema = {
         formatSettingAsLink(ThemeSettings.PREFERRED_HC_DARK_THEME),
         formatSettingAsLink(ThemeSettings.PREFERRED_HC_LIGHT_THEME)
     )),
-    scope: 1 ,
+    scope: ConfigurationScope.APPLICATION,
     tags: [COLOR_THEME_CONFIGURATION_SETTINGS_TAG],
 };
 const themeSettingsConfiguration = {
@@ -366,6 +367,9 @@ class ThemeConfiguration {
         }
         return undefined;
     }
+    isDetectingColorScheme() {
+        return this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME);
+    }
     getColorThemeSettingId() {
         const preferredScheme = this.getPreferredColorScheme();
         return preferredScheme ? colorSchemeToPreferred[preferredScheme] : ThemeSettings.COLOR_THEME;
@@ -389,15 +393,15 @@ class ThemeConfiguration {
     findAutoConfigurationTarget(key) {
         const settings = this.configurationService.inspect(key);
         if (!isUndefined(settings.workspaceFolderValue)) {
-            return 6 ;
+            return ConfigurationTarget.WORKSPACE_FOLDER;
         }
         else if (!isUndefined(settings.workspaceValue)) {
-            return 5 ;
+            return ConfigurationTarget.WORKSPACE;
         }
         else if (!isUndefined(settings.userRemote)) {
-            return 4 ;
+            return ConfigurationTarget.USER_REMOTE;
         }
-        return 2 ;
+        return ConfigurationTarget.USER;
     }
     async writeConfiguration(key, value, settingsTarget) {
         if (settingsTarget === undefined || settingsTarget === 'preview') {
@@ -407,7 +411,7 @@ class ThemeConfiguration {
         if (settingsTarget === 'auto') {
             return this.configurationService.updateValue(key, value);
         }
-        if (settingsTarget === 2 ) {
+        if (settingsTarget === ConfigurationTarget.USER) {
             if (value === settings.userValue) {
                 return Promise.resolve(undefined);
             }
@@ -418,7 +422,7 @@ class ThemeConfiguration {
                 value = undefined;
             }
         }
-        else if (settingsTarget === 5  || settingsTarget === 6  || settingsTarget === 4 ) {
+        else if (settingsTarget === ConfigurationTarget.WORKSPACE || settingsTarget === ConfigurationTarget.WORKSPACE_FOLDER || settingsTarget === ConfigurationTarget.USER_REMOTE) {
             if (value === settings.value) {
                 return Promise.resolve(undefined);
             }