@codingame/monaco-vscode-theme-service-override 1.83.1 → 1.83.3-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "1.83.1",
+  "version": "1.83.3-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.3-next.0",
     "monaco-editor": "0.44.0"
   }
 }

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

@@ -136,17 +136,14 @@ class FileIconThemeLoader {
             const errors = [];
             const contentValue = json.parse(content, errors);
             if (errors.length > 0) {
-                return Promise.reject(( new Error(( nls.localize(
-                    'error.cannotparseicontheme',
-                    "Problems parsing file icons file: {0}",
-                    ( errors.map(e => getParseErrorMessage(e.error))).join(', ')
-                )))));
+                return Promise.reject(( new Error(
+                    nls.localizeWithPath('vs/workbench/services/themes/browser/fileIconThemeData', 'error.cannotparseicontheme', "Problems parsing file icons file: {0}", ( errors.map(e => getParseErrorMessage(e.error))).join(', '))
+                )));
             }
             else if (json.getNodeType(contentValue) !== 'object') {
-                return Promise.reject(( new Error(( nls.localize(
-                    'error.invalidformat',
-                    "Invalid format for file icons theme file: Object expected."
-                )))));
+                return Promise.reject(( new Error(
+                    nls.localizeWithPath('vs/workbench/services/themes/browser/fileIconThemeData', 'error.invalidformat', "Invalid format for file icons theme file: Object expected.")
+                )));
             }
             return Promise.resolve(contentValue);
         });

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

@@ -37,12 +37,7 @@ class ProductIconThemeData {
         this.iconThemeDocument = await _loadProductIconThemeDocument(fileService, location, warnings);
         this.isLoaded = true;
         if (warnings.length) {
-            logService.error(( nls.localize(
-                'error.parseicondefs',
-                "Problems processing product icons definitions in {0}:\n{1}",
-                ( location.toString()),
-                warnings.join('\n')
-            )));
+            logService.error(nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.parseicondefs', "Problems processing product icons definitions in {0}:\n{1}", ( location.toString()), warnings.join('\n')));
         }
         return this.styleSheetContent;
     }
@@ -69,7 +64,11 @@ class ProductIconThemeData {
     static get defaultTheme() {
         let themeData = ProductIconThemeData._defaultProductIconTheme;
         if (!themeData) {
-            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( nls.localize('defaultTheme', 'Default')), ThemeSettingDefaults.PRODUCT_ICON_THEME));
+            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(
+                DEFAULT_PRODUCT_ICON_THEME_ID,
+                nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'defaultTheme', 'Default'),
+                ThemeSettingDefaults.PRODUCT_ICON_THEME
+            ));
             themeData.isLoaded = true;
             themeData.extensionData = undefined;
             themeData.watch = false;
@@ -155,23 +154,19 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
         const parseErrors = [];
         const contentValue = json.parse(content, parseErrors);
         if (parseErrors.length > 0) {
-            return Promise.reject(( new Error(( nls.localize(
-                'error.cannotparseicontheme',
-                "Problems parsing product icons file: {0}",
-                ( parseErrors.map(e => getParseErrorMessage(e.error))).join(', ')
-            )))));
+            return Promise.reject(( new Error(
+                nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.cannotparseicontheme', "Problems parsing product icons file: {0}", ( parseErrors.map(e => getParseErrorMessage(e.error))).join(', '))
+            )));
         }
         else if (json.getNodeType(contentValue) !== 'object') {
-            return Promise.reject(( new Error(( nls.localize(
-                'error.invalidformat',
-                "Invalid format for product icons theme file: Object expected."
-            )))));
+            return Promise.reject(( new Error(
+                nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.invalidformat', "Invalid format for product icons theme file: Object expected.")
+            )));
         }
         else if (!contentValue.iconDefinitions || !Array.isArray(contentValue.fonts) || !contentValue.fonts.length) {
-            return Promise.reject(( new Error(( nls.localize(
-                'error.missingProperties',
-                "Invalid format for product icons theme file: Must contain iconDefinitions and fonts."
-            )))));
+            return Promise.reject(( new Error(
+                nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.missingProperties', "Invalid format for product icons theme file: Must contain iconDefinitions and fonts.")
+            )));
         }
         const iconThemeDocumentLocationDirname = resources.dirname(location);
         const sanitizedFonts = ( new Map());
@@ -183,22 +178,14 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                     fontWeight = font.weight;
                 }
                 else {
-                    warnings.push(( nls.localize(
-                        'error.fontWeight',
-                        'Invalid font weight in font \'{0}\'. Ignoring setting.',
-                        font.id
-                    )));
+                    warnings.push(nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.fontWeight', 'Invalid font weight in font \'{0}\'. Ignoring setting.', font.id));
                 }
                 let fontStyle = undefined;
                 if (isString(font.style) && font.style.match(fontStyleRegex)) {
                     fontStyle = font.style;
                 }
                 else {
-                    warnings.push(( nls.localize(
-                        'error.fontStyle',
-                        'Invalid font style in font \'{0}\'. Ignoring setting.',
-                        font.id
-                    )));
+                    warnings.push(nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.fontStyle', 'Invalid font style in font \'{0}\'. Ignoring setting.', font.id));
                 }
                 const sanitizedSrc = [];
                 if (Array.isArray(font.src)) {
@@ -208,11 +195,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                             sanitizedSrc.push({ location: iconFontLocation, format: s.format });
                         }
                         else {
-                            warnings.push(( nls.localize(
-                                'error.fontSrc',
-                                'Invalid font source in font \'{0}\'. Ignoring source.',
-                                font.id
-                            )));
+                            warnings.push(nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.fontSrc', 'Invalid font source in font \'{0}\'. Ignoring source.', font.id));
                         }
                     }
                 }
@@ -220,19 +203,11 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                     sanitizedFonts.set(fontId, { weight: fontWeight, style: fontStyle, src: sanitizedSrc });
                 }
                 else {
-                    warnings.push(( nls.localize(
-                        'error.noFontSrc',
-                        'No valid font source in font \'{0}\'. Ignoring font definition.',
-                        font.id
-                    )));
+                    warnings.push(nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.noFontSrc', 'No valid font source in font \'{0}\'. Ignoring font definition.', font.id));
                 }
             }
             else {
-                warnings.push(( nls.localize(
-                    'error.fontId',
-                    'Missing or invalid font id \'{0}\'. Skipping font definition.',
-                    font.id
-                )));
+                warnings.push(nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.fontId', 'Missing or invalid font id \'{0}\'. Skipping font definition.', font.id));
             }
         }
         const iconDefinitions = ( new Map());
@@ -247,19 +222,11 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                     iconDefinitions.set(iconId, { fontCharacter: definition.fontCharacter, font });
                 }
                 else {
-                    warnings.push(( nls.localize(
-                        'error.icon.font',
-                        'Skipping icon definition \'{0}\'. Unknown font.',
-                        iconId
-                    )));
+                    warnings.push(nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.icon.font', 'Skipping icon definition \'{0}\'. Unknown font.', iconId));
                 }
             }
             else {
-                warnings.push(( nls.localize(
-                    'error.icon.fontCharacter',
-                    'Skipping icon definition \'{0}\'. Unknown fontCharacter.',
-                    iconId
-                )));
+                warnings.push(nls.localizeWithPath('vs/workbench/services/themes/browser/productIconThemeData', 'error.icon.fontCharacter', 'Skipping icon definition \'{0}\'. Unknown fontCharacter.', iconId));
             }
         }
         return { iconDefinitions };

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

@@ -44,7 +44,7 @@ const fileIconsEnabledClass = 'file-icons-enabled';
 const colorThemeRulesClassName = 'contributedColorTheme';
 const fileIconThemeRulesClassName = 'contributedFileIconTheme';
 const productIconThemeRulesClassName = 'contributedProductIconTheme';
-const themingRegistry = ( (Registry.as(Extensions.ThemingContribution)));
+const themingRegistry = ( Registry.as(Extensions.ThemingContribution));
 function validateThemeId(theme) {
     switch (theme) {
         case VS_LIGHT_THEME: return `vs ${defaultThemeExtensionId}-themes-light_vs-json`;
@@ -68,43 +68,43 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.hostColorService = hostColorService;
         this.userDataInitializationService = userDataInitializationService;
         this.hasDefaultUpdated = false;
-        this.themeExtensionsActivated = ( (new Map()));
+        this.themeExtensionsActivated = ( new Map());
         this.container = layoutService.container;
-        this.settings = ( (new ThemeConfiguration(configurationService)));
-        this.colorThemeRegistry = ( (new ThemeRegistry(colorThemesExtPoint, ColorThemeData.fromExtensionTheme)));
-        this.colorThemeWatcher = ( (new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentColorTheme.bind(this))));
-        this.onColorThemeChange = ( (new Emitter({ leakWarningThreshold: 400 })));
+        this.settings = ( new ThemeConfiguration(configurationService));
+        this.colorThemeRegistry = ( new ThemeRegistry(colorThemesExtPoint, ColorThemeData.fromExtensionTheme));
+        this.colorThemeWatcher = ( new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentColorTheme.bind(this)));
+        this.onColorThemeChange = ( new Emitter({ leakWarningThreshold: 400 }));
         this.currentColorTheme = ColorThemeData.createUnloadedTheme('');
-        this.colorThemeSequencer = ( (new Sequencer()));
-        this.fileIconThemeWatcher = ( (new ThemeFileWatcher(
+        this.colorThemeSequencer = ( new Sequencer());
+        this.fileIconThemeWatcher = ( new ThemeFileWatcher(
             fileService,
             environmentService,
             this.reloadCurrentFileIconTheme.bind(this)
-        )));
-        this.fileIconThemeRegistry = ( (new ThemeRegistry(
+        ));
+        this.fileIconThemeRegistry = ( new ThemeRegistry(
             fileIconThemesExtPoint,
             FileIconThemeData.fromExtensionTheme,
             true,
             FileIconThemeData.noIconTheme
-        )));
-        this.fileIconThemeLoader = ( (new FileIconThemeLoader(extensionResourceLoaderService, languageService)));
-        this.onFileIconThemeChange = ( (new Emitter({ leakWarningThreshold: 400 })));
+        ));
+        this.fileIconThemeLoader = ( new FileIconThemeLoader(extensionResourceLoaderService, languageService));
+        this.onFileIconThemeChange = ( new Emitter({ leakWarningThreshold: 400 }));
         this.currentFileIconTheme = FileIconThemeData.createUnloadedTheme('');
-        this.fileIconThemeSequencer = ( (new Sequencer()));
-        this.productIconThemeWatcher = ( (new ThemeFileWatcher(
+        this.fileIconThemeSequencer = ( new Sequencer());
+        this.productIconThemeWatcher = ( new ThemeFileWatcher(
             fileService,
             environmentService,
             this.reloadCurrentProductIconTheme.bind(this)
-        )));
-        this.productIconThemeRegistry = ( (new ThemeRegistry(
+        ));
+        this.productIconThemeRegistry = ( new ThemeRegistry(
             productIconThemesExtPoint,
             ProductIconThemeData.fromExtensionTheme,
             true,
             ProductIconThemeData.defaultTheme
-        )));
-        this.onProductIconThemeChange = ( (new Emitter()));
+        ));
+        this.onProductIconThemeChange = ( new Emitter());
         this.currentProductIconTheme = ProductIconThemeData.createUnloadedTheme('');
-        this.productIconThemeSequencer = ( (new Sequencer()));
+        this.productIconThemeSequencer = ( new Sequencer());
         let themeData = ColorThemeData.fromStorageData(this.storageService);
         const colorThemeSetting = this.settings.colorTheme;
         if (themeData && colorThemeSetting !== themeData.settingsId && this.settings.isDefaultColorTheme()) {
@@ -147,7 +147,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         function updateAll() {
             codiconStyleSheet.textContent = iconsStyleSheet.getCSS();
         }
-        const delayer = ( (new RunOnceScheduler(updateAll, 0)));
+        const delayer = ( new RunOnceScheduler(updateAll, 0));
         iconsStyleSheet.onDidChange(() => delayer.schedule());
         delayer.schedule();
     }
@@ -264,11 +264,11 @@ let WorkbenchThemeService = class WorkbenchThemeService {
                     await this.setColorTheme(prevColorId, 'auto');
                     prevColorId = undefined;
                 }
-                else if (( (event.added.some(t => t.settingsId === this.currentColorTheme.settingsId)))) {
+                else if (( event.added.some(t => t.settingsId === this.currentColorTheme.settingsId))) {
                     await this.reloadCurrentColorTheme();
                 }
             }
-            else if (( (event.removed.some(t => t.settingsId === this.currentColorTheme.settingsId)))) {
+            else if (( event.removed.some(t => t.settingsId === this.currentColorTheme.settingsId))) {
                 prevColorId = this.currentColorTheme.id;
                 const defaultTheme = this.colorThemeRegistry.findThemeBySettingsId(ThemeSettingDefaults.COLOR_THEME_DARK);
                 await this.setColorTheme(defaultTheme, 'auto');
@@ -282,11 +282,11 @@ let WorkbenchThemeService = class WorkbenchThemeService {
                     await this.setFileIconTheme(prevFileIconId, 'auto');
                     prevFileIconId = undefined;
                 }
-                else if (( (event.added.some(t => t.settingsId === this.currentFileIconTheme.settingsId)))) {
+                else if (( event.added.some(t => t.settingsId === this.currentFileIconTheme.settingsId))) {
                     await this.reloadCurrentFileIconTheme();
                 }
             }
-            else if (( (event.removed.some(t => t.settingsId === this.currentFileIconTheme.settingsId)))) {
+            else if (( event.removed.some(t => t.settingsId === this.currentFileIconTheme.settingsId))) {
                 prevFileIconId = this.currentFileIconTheme.id;
                 await this.setFileIconTheme(DEFAULT_FILE_ICON_THEME_ID, 'auto');
             }
@@ -299,11 +299,11 @@ let WorkbenchThemeService = class WorkbenchThemeService {
                     await this.setProductIconTheme(prevProductIconId, 'auto');
                     prevProductIconId = undefined;
                 }
-                else if (( (event.added.some(t => t.settingsId === this.currentProductIconTheme.settingsId)))) {
+                else if (( event.added.some(t => t.settingsId === this.currentProductIconTheme.settingsId))) {
                     await this.reloadCurrentProductIconTheme();
                 }
             }
-            else if (( (event.removed.some(t => t.settingsId === this.currentProductIconTheme.settingsId)))) {
+            else if (( event.removed.some(t => t.settingsId === this.currentProductIconTheme.settingsId))) {
                 prevProductIconId = this.currentProductIconTheme.id;
                 await this.setProductIconTheme(DEFAULT_PRODUCT_ICON_THEME_ID, 'auto');
             }
@@ -427,7 +427,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
             return this.applyTheme(themeData, settingsTarget);
         }
         catch (error) {
-            throw new Error(nls.localize('error.cannotloadtheme', "Unable to load {0}: {1}", themeData.location?.toString(), error.message));
+            throw new Error(nls.localizeWithPath('vs/workbench/services/themes/browser/workbenchThemeService', 'error.cannotloadtheme', "Unable to load {0}: {1}", themeData.location?.toString(), error.message));
         }
     }
     reloadCurrentColorTheme() {
@@ -462,10 +462,10 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         });
     }
     updateDynamicCSSRules(themeData) {
-        const cssRules = ( (new Set()));
+        const cssRules = ( new Set());
         const ruleCollector = {
             addRule: (rule) => {
-                if (!( (cssRules.has(rule)))) {
+                if (!( cssRules.has(rule))) {
                     cssRules.add(rule);
                 }
             }
@@ -476,7 +476,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         for (const item of getColorRegistry().getColors()) {
             const color = themeData.getColor(item.id, true);
             if (color) {
-                colorVariables.push(`${asCssVariableName(item.id)}: ${( ( color.toString()))};`);
+                colorVariables.push(`${asCssVariableName(item.id)}: ${( color.toString())};`);
             }
         }
         ruleCollector.addRule(`.monaco-workbench { ${colorVariables.join('\n')} }`);
@@ -697,20 +697,20 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         }
     }
 };
-WorkbenchThemeService = ( (__decorate([
-    ( (__param(0, IExtensionService))),
-    ( (__param(1, IStorageService))),
-    ( (__param(2, IConfigurationService))),
-    ( (__param(3, ITelemetryService))),
-    ( (__param(4, IBrowserWorkbenchEnvironmentService))),
-    ( (__param(5, IFileService))),
-    ( (__param(6, IExtensionResourceLoaderService))),
-    ( (__param(7, IWorkbenchLayoutService))),
-    ( (__param(8, ILogService))),
-    ( (__param(9, IHostColorSchemeService))),
-    ( (__param(10, IUserDataInitializationService))),
-    ( (__param(11, ILanguageService)))
-], WorkbenchThemeService)));
+WorkbenchThemeService = ( __decorate([
+    ( __param(0, IExtensionService)),
+    ( __param(1, IStorageService)),
+    ( __param(2, IConfigurationService)),
+    ( __param(3, ITelemetryService)),
+    ( __param(4, IBrowserWorkbenchEnvironmentService)),
+    ( __param(5, IFileService)),
+    ( __param(6, IExtensionResourceLoaderService)),
+    ( __param(7, IWorkbenchLayoutService)),
+    ( __param(8, ILogService)),
+    ( __param(9, IHostColorSchemeService)),
+    ( __param(10, IUserDataInitializationService)),
+    ( __param(11, ILanguageService))
+], WorkbenchThemeService));
 class ThemeFileWatcher {
     constructor(fileService, environmentService, onUpdate) {
         this.fileService = fileService;

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

@@ -583,17 +583,14 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
         const errors = [];
         const contentValue = json.parse(content, errors);
         if (errors.length > 0) {
-            return Promise.reject(( new Error(( nls.localize(
-                'error.cannotparsejson',
-                "Problems parsing JSON theme file: {0}",
-                ( errors.map(e => getParseErrorMessage(e.error))).join(', ')
-            )))));
+            return Promise.reject(( new Error(
+                nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeData', 'error.cannotparsejson', "Problems parsing JSON theme file: {0}", ( errors.map(e => getParseErrorMessage(e.error))).join(', '))
+            )));
         }
         else if (json.getNodeType(contentValue) !== 'object') {
-            return Promise.reject(( new Error(( nls.localize(
-                'error.invalidformat',
-                "Invalid format for JSON theme file: Object expected."
-            )))));
+            return Promise.reject(( new Error(
+                nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeData', 'error.invalidformat', "Invalid format for JSON theme file: Object expected.")
+            )));
         }
         if (contentValue.include) {
             await _loadColorTheme(extensionResourceLoaderService, resources.joinPath(resources.dirname(themeLocation), contentValue.include), result);
@@ -606,11 +603,9 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
         const colors = contentValue.colors;
         if (colors) {
             if (typeof colors !== 'object') {
-                return Promise.reject(( new Error(( nls.localize(
-                    { key: 'error.invalidformat.colors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] },
-                    "Problem parsing color theme file: {0}. Property 'colors' is not of type 'object'.",
-                    ( themeLocation.toString())
-                )))));
+                return Promise.reject(( new Error(
+                    nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeData', { key: 'error.invalidformat.colors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'colors' is not of type 'object'.", ( themeLocation.toString()))
+                )));
             }
             for (const colorId in colors) {
                 const colorHex = colors[colorId];
@@ -628,11 +623,9 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
                 await _loadSyntaxTokens(extensionResourceLoaderService, resources.joinPath(resources.dirname(themeLocation), tokenColors), result);
             }
             else {
-                return Promise.reject(( new Error(( nls.localize(
-                    { key: 'error.invalidformat.tokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] },
-                    "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a TextMate theme file",
-                    ( themeLocation.toString())
-                )))));
+                return Promise.reject(( new Error(
+                    nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeData', { key: 'error.invalidformat.tokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a TextMate theme file", ( themeLocation.toString()))
+                )));
             }
         }
         const semanticTokenColors = contentValue.semanticTokenColors;
@@ -645,11 +638,9 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
                     }
                 }
                 catch (e) {
-                    return Promise.reject(( new Error(( nls.localize(
-                        { key: 'error.invalidformat.semanticTokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] },
-                        "Problem parsing color theme file: {0}. Property 'semanticTokenColors' contains a invalid selector",
-                        ( themeLocation.toString())
-                    )))));
+                    return Promise.reject(( new Error(
+                        nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeData', { key: 'error.invalidformat.semanticTokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'semanticTokenColors' contains a invalid selector", ( themeLocation.toString()))
+                    )));
                 }
             }
         }
@@ -664,24 +655,22 @@ function _loadSyntaxTokens(extensionResourceLoaderService, themeLocation, result
             const contentValue = parse(content);
             const settings = contentValue.settings;
             if (!Array.isArray(settings)) {
-                return Promise.reject(( new Error(( nls.localize(
-                    'error.plist.invalidformat',
-                    "Problem parsing tmTheme file: {0}. 'settings' is not array."
-                )))));
+                return Promise.reject(( new Error(
+                    nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeData', 'error.plist.invalidformat', "Problem parsing tmTheme file: {0}. 'settings' is not array.")
+                )));
             }
             convertSettings(settings, result);
             return Promise.resolve(null);
         }
         catch (e) {
-            return Promise.reject(( new Error(( nls.localize('error.cannotparse', "Problems parsing tmTheme file: {0}", e.message)))));
+            return Promise.reject(( new Error(
+                nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeData', 'error.cannotparse', "Problems parsing tmTheme file: {0}", e.message)
+            )));
         }
     }, error => {
-        return Promise.reject(( new Error(( nls.localize(
-            'error.cannotload',
-            "Problems loading tmTheme file {0}: {1}",
-            ( themeLocation.toString()),
-            error.message
-        )))));
+        return Promise.reject(( new Error(
+            nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeData', 'error.cannotload', "Problems loading tmTheme file {0}: {1}", ( themeLocation.toString()), error.message)
+        )));
     });
 }
 const defaultThemeColors = {

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

@@ -125,34 +125,25 @@ const textmateColorSchema = {
         },
         settings: {
             type: 'object',
-            description: ( nls.localize('schema.token.settings', 'Colors and styles for the token.')),
+            description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.token.settings', 'Colors and styles for the token.'),
             properties: {
                 foreground: {
                     type: 'string',
-                    description: ( nls.localize('schema.token.foreground', 'Foreground color for the token.')),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.token.foreground', 'Foreground color for the token.'),
                     format: 'color-hex',
                     default: '#ff0000'
                 },
                 background: {
                     type: 'string',
-                    deprecationMessage: ( nls.localize(
-                        'schema.token.background.warning',
-                        'Token background colors are currently not supported.'
-                    ))
+                    deprecationMessage: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.token.background.warning', 'Token background colors are currently not supported.')
                 },
                 fontStyle: {
                     type: 'string',
-                    description: ( nls.localize(
-                        'schema.token.fontStyle',
-                        'Font style of the rule: \'italic\', \'bold\', \'underline\', \'strikethrough\' or a combination. The empty string unsets inherited settings.'
-                    )),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.token.fontStyle', 'Font style of the rule: \'italic\', \'bold\', \'underline\', \'strikethrough\' or a combination. The empty string unsets inherited settings.'),
                     pattern: '^(\\s*\\b(italic|bold|underline|strikethrough))*\\s*$',
-                    patternErrorMessage: ( nls.localize(
-                        'schema.fontStyle.error',
-                        'Font style must be \'italic\', \'bold\', \'underline\', \'strikethrough\' or a combination or the empty string.'
-                    )),
+                    patternErrorMessage: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.fontStyle.error', 'Font style must be \'italic\', \'bold\', \'underline\', \'strikethrough\' or a combination or the empty string.'),
                     defaultSnippets: [
-                        { label: ( nls.localize('schema.token.fontStyle.none', 'None (clear inherited style)')), bodyText: '""' },
+                        { label: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.token.fontStyle.none', 'None (clear inherited style)'), bodyText: '""' },
                         { body: 'italic' },
                         { body: 'bold' },
                         { body: 'underline' },
@@ -181,13 +172,10 @@ const textmateColorSchema = {
         properties: {
             name: {
                 type: 'string',
-                description: ( nls.localize('schema.properties.name', 'Description of the rule.'))
+                description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.properties.name', 'Description of the rule.')
             },
             scope: {
-                description: ( nls.localize(
-                    'schema.properties.scope',
-                    'Scope selector against which this rule matches.'
-                )),
+                description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.properties.scope', 'Scope selector against which this rule matches.'),
                 anyOf: [
                     {
                         enum: textMateScopes
@@ -226,34 +214,28 @@ const colorThemeSchema = {
     allowTrailingCommas: true,
     properties: {
         colors: {
-            description: ( nls.localize('schema.workbenchColors', 'Colors in the workbench')),
+            description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.workbenchColors', 'Colors in the workbench'),
             $ref: workbenchColorsSchemaId,
             additionalProperties: false
         },
         tokenColors: {
             anyOf: [{
                     type: 'string',
-                    description: ( nls.localize(
-                        'schema.tokenColors.path',
-                        'Path to a tmTheme file (relative to the current file).'
-                    ))
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.tokenColors.path', 'Path to a tmTheme file (relative to the current file).')
                 },
                 {
-                    description: ( nls.localize('schema.colors', 'Colors for syntax highlighting')),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.colors', 'Colors for syntax highlighting'),
                     $ref: textmateColorsSchemaId
                 }
             ]
         },
         semanticHighlighting: {
             type: 'boolean',
-            description: ( nls.localize(
-                'schema.supportsSemanticHighlighting',
-                'Whether semantic highlighting should be enabled for this theme.'
-            ))
+            description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.supportsSemanticHighlighting', 'Whether semantic highlighting should be enabled for this theme.')
         },
         semanticTokenColors: {
             type: 'object',
-            description: ( nls.localize('schema.semanticTokenColors', 'Colors for semantic tokens')),
+            description: nls.localizeWithPath('vs/workbench/services/themes/common/colorThemeSchema', 'schema.semanticTokenColors', 'Colors for semantic tokens'),
             $ref: tokenStylingSchemaId
         }
     }