@codingame/monaco-vscode-api 1.83.1 → 1.83.3-next.0

package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
 import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
@@ -29,7 +29,7 @@ import { IExtensionService } from '../../extensions/common/extensions.js';
 var TextFileEditorModel_1;
 let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel {
     static { TextFileEditorModel_1 = this; }
-    static { this.TEXTFILE_SAVE_ENCODING_SOURCE = SaveSourceRegistry.registerSource('textFileEncoding.source', ( (localize('textFileCreate.source', "File Encoding Changed")))); }
+    static { this.TEXTFILE_SAVE_ENCODING_SOURCE = SaveSourceRegistry.registerSource('textFileEncoding.source', localizeWithPath('vs/workbench/services/textfile/common/textFileEditorModel', 'textFileCreate.source', "File Encoding Changed")); }
     static { this.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD = 500; }
     constructor(resource, preferredEncoding,
     preferredLanguageId, languageService, modelService, fileService, textFileService, workingCopyBackupService, logService, workingCopyService, filesConfigurationService, labelService, languageDetectionService, accessibilityService, pathService, extensionService) {
@@ -46,23 +46,23 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         this.labelService = labelService;
         this.pathService = pathService;
         this.extensionService = extensionService;
-        this._onDidChangeContent = this._register(( (new Emitter())));
+        this._onDidChangeContent = this._register(( new Emitter()));
         this.onDidChangeContent = this._onDidChangeContent.event;
-        this._onDidResolve = this._register(( (new Emitter())));
+        this._onDidResolve = this._register(( new Emitter()));
         this.onDidResolve = this._onDidResolve.event;
-        this._onDidChangeDirty = this._register(( (new Emitter())));
+        this._onDidChangeDirty = this._register(( new Emitter()));
         this.onDidChangeDirty = this._onDidChangeDirty.event;
-        this._onDidSaveError = this._register(( (new Emitter())));
+        this._onDidSaveError = this._register(( new Emitter()));
         this.onDidSaveError = this._onDidSaveError.event;
-        this._onDidSave = this._register(( (new Emitter())));
+        this._onDidSave = this._register(( new Emitter()));
         this.onDidSave = this._onDidSave.event;
-        this._onDidRevert = this._register(( (new Emitter())));
+        this._onDidRevert = this._register(( new Emitter()));
         this.onDidRevert = this._onDidRevert.event;
-        this._onDidChangeEncoding = this._register(( (new Emitter())));
+        this._onDidChangeEncoding = this._register(( new Emitter()));
         this.onDidChangeEncoding = this._onDidChangeEncoding.event;
-        this._onDidChangeOrphaned = this._register(( (new Emitter())));
+        this._onDidChangeOrphaned = this._register(( new Emitter()));
         this.onDidChangeOrphaned = this._onDidChangeOrphaned.event;
-        this._onDidChangeReadonly = this._register(( (new Emitter())));
+        this._onDidChangeReadonly = this._register(( new Emitter()));
         this.onDidChangeReadonly = this._onDidChangeReadonly.event;
         this.typeId = NO_TYPE_ID;
         this.capabilities = 0 ;
@@ -72,7 +72,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         this.ignoreDirtyOnModelContentChange = false;
         this.ignoreSaveFromSaveParticipants = false;
         this.lastModelContentChangeFromUndoRedo = undefined;
-        this.saveSequentializer = ( (new TaskSequentializer()));
+        this.saveSequentializer = ( new TaskSequentializer());
         this.dirty = false;
         this.inConflictMode = false;
         this.inOrphanMode = false;
@@ -494,7 +494,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         if (this.isResolved()) {
             this.textEditorModel.pushStackElement();
         }
-        const saveCancellation = ( (new CancellationTokenSource()));
+        const saveCancellation = ( new CancellationTokenSource());
         return this.saveSequentializer.run(versionId, (async () => {
             if (this.isResolved() && !options.skipSaveParticipants) {
                 try {
@@ -515,7 +515,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
                     }
                 }
                 catch (error) {
-                    this.logService.error(`[text file model] runSaveParticipants(${versionId}) - resulted in an error: ${( ( error.toString()))}`, ( (this.resource.toString())));
+                    this.logService.error(`[text file model] runSaveParticipants(${versionId}) - resulted in an error: ${( error.toString())}`, ( this.resource.toString()));
                 }
             }
             if (saveCancellation.token.isCancellationRequested) {
@@ -565,7 +565,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         this._onDidSave.fire({ reason: options.reason, stat, source: options.source });
     }
     handleSaveError(error, versionId, options) {
-        (options.ignoreErrorHandler ? this.logService.trace : this.logService.error).apply(this.logService, [`[text file model] handleSaveError(${versionId}) - exit - resulted in a save error: ${( ( error.toString()))}`, ( (this.resource.toString()))]);
+        (options.ignoreErrorHandler ? this.logService.trace : this.logService.error).apply(this.logService, [`[text file model] handleSaveError(${versionId}) - exit - resulted in a save error: ${( error.toString())}`, ( this.resource.toString())]);
         if (options.ignoreErrorHandler) {
             throw error;
         }
@@ -637,7 +637,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             this.trace('onMaybeShouldChangeEncoding() - ignoring because model is dirty');
             return;
         }
-        this.logService.info(`Adjusting encoding based on configured language override to '${encoding}' for ${( ( this.resource.toString(true)))}.`);
+        this.logService.info(`Adjusting encoding based on configured language override to '${encoding}' for ${( this.resource.toString(true))}.`);
         return this.setEncodingInternal(encoding, 1 );
     }
     setEncoding(encoding, mode) {
@@ -686,7 +686,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         return this.preferredEncoding || this.contentEncoding;
     }
     trace(msg) {
-        this.logService.trace(`[text file model] ${msg}`, ( (this.resource.toString())));
+        this.logService.trace(`[text file model] ${msg}`, ( this.resource.toString()));
     }
     isResolved() {
         return !!this.textEditorModel;
@@ -702,19 +702,19 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         super.dispose();
     }
 };
-TextFileEditorModel = TextFileEditorModel_1 = ( (__decorate([
-    ( (__param(3, ILanguageService))),
-    ( (__param(4, IModelService))),
-    ( (__param(5, IFileService))),
-    ( (__param(6, ITextFileService))),
-    ( (__param(7, IWorkingCopyBackupService))),
-    ( (__param(8, ILogService))),
-    ( (__param(9, IWorkingCopyService))),
-    ( (__param(10, IFilesConfigurationService))),
-    ( (__param(11, ILabelService))),
-    ( (__param(12, ILanguageDetectionService))),
-    ( (__param(13, IAccessibilityService))),
-    ( (__param(14, IPathService))),
-    ( (__param(15, IExtensionService)))
-], TextFileEditorModel)));
+TextFileEditorModel = TextFileEditorModel_1 = ( __decorate([
+    ( __param(3, ILanguageService)),
+    ( __param(4, IModelService)),
+    ( __param(5, IFileService)),
+    ( __param(6, ITextFileService)),
+    ( __param(7, IWorkingCopyBackupService)),
+    ( __param(8, ILogService)),
+    ( __param(9, IWorkingCopyService)),
+    ( __param(10, IFilesConfigurationService)),
+    ( __param(11, ILabelService)),
+    ( __param(12, ILanguageDetectionService)),
+    ( __param(13, IAccessibilityService)),
+    ( __param(14, IPathService)),
+    ( __param(15, IExtensionService))
+], TextFileEditorModel));
 export { TextFileEditorModel };

package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModelManager.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { toErrorMessage } from 'monaco-editor/esm/vs/base/common/errorMessage.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
@@ -57,12 +57,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
             const notificationService = this.notificationService;
             return {
                 onSaveError(error, model) {
-                    notificationService.error(( localize(
-                        { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] },
-                        "Failed to save '{0}': {1}",
-                        model.name,
-                        toErrorMessage(error, false)
-                    )));
+                    notificationService.error(localizeWithPath('vs/workbench/services/textfile/common/textFileEditorModelManager', { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] }, "Failed to save '{0}': {1}", model.name, toErrorMessage(error, false)));
                 }
             };
         })();

package/vscode/src/vs/workbench/services/textfile/common/textFileSaveParticipant.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { raceCancellation } from 'monaco-editor/esm/vs/base/common/async.js';
 import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
@@ -20,7 +20,7 @@ let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
     participate(model, context, token) {
         const cts = ( new CancellationTokenSource(token));
         return this.progressService.withProgress({
-            title: ( localize('saveParticipants', "Saving '{0}'", model.name)),
+            title: localizeWithPath('vs/workbench/services/textfile/common/textFileSaveParticipant', 'saveParticipants', "Saving '{0}'", model.name),
             location: 15 ,
             cancellable: true,
             delay: model.isDirty() ? 3000 : 5000

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

@@ -9,32 +9,26 @@ const colorIdPattern = '^\\w+[.\\w+]*$';
 const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'colors',
     jsonSchema: {
-        description: ( nls.localize('contributes.color', 'Contributes extension defined themable colors')),
+        description: nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'contributes.color', 'Contributes extension defined themable colors'),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
                     type: 'string',
-                    description: ( nls.localize('contributes.color.id', 'The identifier of the themable color')),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'contributes.color.id', 'The identifier of the themable color'),
                     pattern: colorIdPattern,
-                    patternErrorMessage: ( nls.localize(
-                        'contributes.color.id.format',
-                        'Identifiers must only contain letters, digits and dots and can not start with a dot'
-                    )),
+                    patternErrorMessage: nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'contributes.color.id.format', 'Identifiers must only contain letters, digits and dots and can not start with a dot'),
                 },
                 description: {
                     type: 'string',
-                    description: ( nls.localize('contributes.color.description', 'The description of the themable color')),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'contributes.color.description', 'The description of the themable color'),
                 },
                 defaults: {
                     type: 'object',
                     properties: {
                         light: {
-                            description: ( nls.localize(
-                                'contributes.defaults.light',
-                                'The default color for light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default.'
-                            )),
+                            description: nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'contributes.defaults.light', 'The default color for light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default.'),
                             type: 'string',
                             anyOf: [
                                 colorReferenceSchema,
@@ -42,10 +36,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
                             ]
                         },
                         dark: {
-                            description: ( nls.localize(
-                                'contributes.defaults.dark',
-                                'The default color for dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default.'
-                            )),
+                            description: nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'contributes.defaults.dark', 'The default color for dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default.'),
                             type: 'string',
                             anyOf: [
                                 colorReferenceSchema,
@@ -53,10 +44,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
                             ]
                         },
                         highContrast: {
-                            description: ( nls.localize(
-                                'contributes.defaults.highContrast',
-                                'The default color for high contrast dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `dark` color is used as default for high contrast dark themes.'
-                            )),
+                            description: nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'contributes.defaults.highContrast', 'The default color for high contrast dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `dark` color is used as default for high contrast dark themes.'),
                             type: 'string',
                             anyOf: [
                                 colorReferenceSchema,
@@ -64,10 +52,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
                             ]
                         },
                         highContrastLight: {
-                            description: ( nls.localize(
-                                'contributes.defaults.highContrastLight',
-                                'The default color for high contrast light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `light` color is used as default for high contrast light themes.'
-                            )),
+                            description: nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'contributes.defaults.highContrastLight', 'The default color for high contrast light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `light` color is used as default for high contrast light themes.'),
                             type: 'string',
                             anyOf: [
                                 colorReferenceSchema,
@@ -88,7 +73,7 @@ class ColorExtensionPoint {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( nls.localize('invalid.colorConfiguration', "'configuration.colors' must be a array")));
+                    collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'invalid.colorConfiguration', "'configuration.colors' must be a array"));
                     return;
                 }
                 const parseColorValue = (s, name) => {
@@ -100,55 +85,33 @@ class ColorExtensionPoint {
                             return s;
                         }
                     }
-                    collector.error(( nls.localize(
-                        'invalid.default.colorType',
-                        "{0} must be either a color value in hex (#RRGGBB[AA] or #RGB[A]) or the identifier of a themable color which provides the default.",
-                        name
-                    )));
+                    collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'invalid.default.colorType', "{0} must be either a color value in hex (#RRGGBB[AA] or #RGB[A]) or the identifier of a themable color which provides the default.", name));
                     return Color.red;
                 };
                 for (const colorContribution of extensionValue) {
                     if (typeof colorContribution.id !== 'string' || colorContribution.id.length === 0) {
-                        collector.error(( nls.localize(
-                            'invalid.id',
-                            "'configuration.colors.id' must be defined and can not be empty"
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'invalid.id', "'configuration.colors.id' must be defined and can not be empty"));
                         return;
                     }
                     if (!colorContribution.id.match(colorIdPattern)) {
-                        collector.error(( nls.localize(
-                            'invalid.id.format',
-                            "'configuration.colors.id' must only contain letters, digits and dots and can not start with a dot"
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'invalid.id.format', "'configuration.colors.id' must only contain letters, digits and dots and can not start with a dot"));
                         return;
                     }
                     if (typeof colorContribution.description !== 'string' || colorContribution.id.length === 0) {
-                        collector.error(( nls.localize(
-                            'invalid.description',
-                            "'configuration.colors.description' must be defined and can not be empty"
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'invalid.description', "'configuration.colors.description' must be defined and can not be empty"));
                         return;
                     }
                     const defaults = colorContribution.defaults;
                     if (!defaults || typeof defaults !== 'object' || typeof defaults.light !== 'string' || typeof defaults.dark !== 'string') {
-                        collector.error(( nls.localize(
-                            'invalid.defaults',
-                            "'configuration.colors.defaults' must be defined and must contain 'light' and 'dark'"
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'invalid.defaults', "'configuration.colors.defaults' must be defined and must contain 'light' and 'dark'"));
                         return;
                     }
                     if (defaults.highContrast && typeof defaults.highContrast !== 'string') {
-                        collector.error(( nls.localize(
-                            'invalid.defaults.highContrast',
-                            "If defined, 'configuration.colors.defaults.highContrast' must be a string."
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'invalid.defaults.highContrast', "If defined, 'configuration.colors.defaults.highContrast' must be a string."));
                         return;
                     }
                     if (defaults.highContrastLight && typeof defaults.highContrastLight !== 'string') {
-                        collector.error(( nls.localize(
-                            'invalid.defaults.highContrastLight',
-                            "If defined, 'configuration.colors.defaults.highContrastLight' must be a string."
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'invalid.defaults.highContrastLight', "If defined, 'configuration.colors.defaults.highContrastLight' must be a string."));
                         return;
                     }
                     colorRegistry.registerColor(colorContribution.id, {

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

@@ -1,4 +1,53 @@
+import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
 import { Extensions } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 const iconRegistry = ( Registry.as(Extensions.IconContribution));
-iconRegistry.getIconReferenceSchema();
+const iconReferenceSchema = iconRegistry.getIconReferenceSchema();
+const iconIdPattern = `^${ThemeIcon.iconNameSegment}(-${ThemeIcon.iconNameSegment})+$`;
+( ExtensionsRegistry.registerExtensionPoint({
+    extensionPoint: 'icons',
+    jsonSchema: {
+        description: nls.localizeWithPath('vs/workbench/services/themes/common/iconExtensionPoint', 'contributes.icons', 'Contributes extension defined themable icons'),
+        type: 'object',
+        propertyNames: {
+            pattern: iconIdPattern,
+            description: nls.localizeWithPath('vs/workbench/services/themes/common/iconExtensionPoint', 'contributes.icon.id', 'The identifier of the themable icon'),
+            patternErrorMessage: nls.localizeWithPath('vs/workbench/services/themes/common/iconExtensionPoint', 'contributes.icon.id.format', 'Identifiers can only contain letters, digits and minuses and need to consist of at least two segments in the form `component-iconname`.'),
+        },
+        additionalProperties: {
+            type: 'object',
+            properties: {
+                description: {
+                    type: 'string',
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/iconExtensionPoint', 'contributes.icon.description', 'The description of the themable icon'),
+                },
+                default: {
+                    anyOf: [
+                        iconReferenceSchema,
+                        {
+                            type: 'object',
+                            properties: {
+                                fontPath: {
+                                    description: nls.localizeWithPath('vs/workbench/services/themes/common/iconExtensionPoint', 'contributes.icon.default.fontPath', 'The path of the icon font that defines the icon.'),
+                                    type: 'string'
+                                },
+                                fontCharacter: {
+                                    description: nls.localizeWithPath('vs/workbench/services/themes/common/iconExtensionPoint', 'contributes.icon.default.fontCharacter', 'The character for the icon in the icon font.'),
+                                    type: 'string'
+                                }
+                            },
+                            required: ['fontPath', 'fontCharacter'],
+                            defaultSnippets: [{ body: { fontPath: '${1:myiconfont.woff}', fontCharacter: '${2:\\\\E001}' } }]
+                        }
+                    ],
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/iconExtensionPoint', 'contributes.icon.default', 'The default of the icon. Either a reference to an extisting ThemeIcon or an icon in an icon font.'),
+                }
+            },
+            required: ['description', 'default'],
+            defaultSnippets: [{ body: { description: '${1:my icon}', default: { fontPath: '${2:myiconfont.woff}', fontCharacter: '${3:\\\\E001}' } } }]
+        },
+        defaultSnippets: [{ body: { '${1:my-icon-id}': { description: '${2:my icon}', default: { fontPath: '${3:myiconfont.woff}', fontCharacter: '${4:\\\\E001}' } } } }]
+    }
+}));

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

@@ -1,45 +1,30 @@
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
-import { getTokenClassificationRegistry, typeAndModifierIdPattern } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
+import { typeAndModifierIdPattern, getTokenClassificationRegistry } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
 const tokenClassificationRegistry = getTokenClassificationRegistry();
 const tokenTypeExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'semanticTokenTypes',
     jsonSchema: {
-        description: ( nls.localize('contributes.semanticTokenTypes', 'Contributes semantic token types.')),
+        description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenTypes', 'Contributes semantic token types.'),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
                     type: 'string',
-                    description: ( nls.localize(
-                        'contributes.semanticTokenTypes.id',
-                        'The identifier of the semantic token type'
-                    )),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenTypes.id', 'The identifier of the semantic token type'),
                     pattern: typeAndModifierIdPattern,
-                    patternErrorMessage: ( nls.localize(
-                        'contributes.semanticTokenTypes.id.format',
-                        'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*'
-                    )),
+                    patternErrorMessage: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenTypes.id.format', 'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*'),
                 },
                 superType: {
                     type: 'string',
-                    description: ( nls.localize(
-                        'contributes.semanticTokenTypes.superType',
-                        'The super type of the semantic token type'
-                    )),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenTypes.superType', 'The super type of the semantic token type'),
                     pattern: typeAndModifierIdPattern,
-                    patternErrorMessage: ( nls.localize(
-                        'contributes.semanticTokenTypes.superType.format',
-                        'Super types should be in the form letterOrDigit[_-letterOrDigit]*'
-                    )),
+                    patternErrorMessage: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenTypes.superType.format', 'Super types should be in the form letterOrDigit[_-letterOrDigit]*'),
                 },
                 description: {
                     type: 'string',
-                    description: ( nls.localize(
-                        'contributes.color.description',
-                        'The description of the semantic token type'
-                    )),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.color.description', 'The description of the semantic token type'),
                 }
             }
         }
@@ -48,31 +33,19 @@ const tokenTypeExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
 const tokenModifierExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'semanticTokenModifiers',
     jsonSchema: {
-        description: ( nls.localize(
-            'contributes.semanticTokenModifiers',
-            'Contributes semantic token modifiers.'
-        )),
+        description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenModifiers', 'Contributes semantic token modifiers.'),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
                     type: 'string',
-                    description: ( nls.localize(
-                        'contributes.semanticTokenModifiers.id',
-                        'The identifier of the semantic token modifier'
-                    )),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenModifiers.id', 'The identifier of the semantic token modifier'),
                     pattern: typeAndModifierIdPattern,
-                    patternErrorMessage: ( nls.localize(
-                        'contributes.semanticTokenModifiers.id.format',
-                        'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*'
-                    ))
+                    patternErrorMessage: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenModifiers.id.format', 'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*')
                 },
                 description: {
-                    description: ( nls.localize(
-                        'contributes.semanticTokenModifiers.description',
-                        'The description of the semantic token modifier'
-                    ))
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenModifiers.description', 'The description of the semantic token modifier')
                 }
             }
         }
@@ -81,26 +54,17 @@ const tokenModifierExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
 const tokenStyleDefaultsExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'semanticTokenScopes',
     jsonSchema: {
-        description: ( nls.localize(
-            'contributes.semanticTokenScopes',
-            'Contributes semantic token scope maps.'
-        )),
+        description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenScopes', 'Contributes semantic token scope maps.'),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 language: {
-                    description: ( nls.localize(
-                        'contributes.semanticTokenScopes.languages',
-                        'Lists the languge for which the defaults are.'
-                    )),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenScopes.languages', 'Lists the languge for which the defaults are.'),
                     type: 'string'
                 },
                 scopes: {
-                    description: ( nls.localize(
-                        'contributes.semanticTokenScopes.scopes',
-                        'Maps a semantic token (described by semantic token selector) to one or more textMate scopes used to represent that token.'
-                    )),
+                    description: nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'contributes.semanticTokenScopes.scopes', 'Maps a semantic token (described by semantic token selector) to one or more textMate scopes used to represent that token.'),
                     type: 'object',
                     additionalProperties: {
                         type: 'array',
@@ -117,36 +81,20 @@ class TokenClassificationExtensionPoints {
     constructor() {
         function validateTypeOrModifier(contribution, extensionPoint, collector) {
             if (typeof contribution.id !== 'string' || contribution.id.length === 0) {
-                collector.error(( nls.localize(
-                    'invalid.id',
-                    "'configuration.{0}.id' must be defined and can not be empty",
-                    extensionPoint
-                )));
+                collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.id', "'configuration.{0}.id' must be defined and can not be empty", extensionPoint));
                 return false;
             }
             if (!contribution.id.match(typeAndModifierIdPattern)) {
-                collector.error(( nls.localize(
-                    'invalid.id.format',
-                    "'configuration.{0}.id' must follow the pattern letterOrDigit[-_letterOrDigit]*",
-                    extensionPoint
-                )));
+                collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.id.format', "'configuration.{0}.id' must follow the pattern letterOrDigit[-_letterOrDigit]*", extensionPoint));
                 return false;
             }
             const superType = contribution.superType;
             if (superType && !superType.match(typeAndModifierIdPattern)) {
-                collector.error(( nls.localize(
-                    'invalid.superType.format',
-                    "'configuration.{0}.superType' must follow the pattern letterOrDigit[-_letterOrDigit]*",
-                    extensionPoint
-                )));
+                collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.superType.format', "'configuration.{0}.superType' must follow the pattern letterOrDigit[-_letterOrDigit]*", extensionPoint));
                 return false;
             }
             if (typeof contribution.description !== 'string' || contribution.id.length === 0) {
-                collector.error(( nls.localize(
-                    'invalid.description',
-                    "'configuration.{0}.description' must be defined and can not be empty",
-                    extensionPoint
-                )));
+                collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.description', "'configuration.{0}.description' must be defined and can not be empty", extensionPoint));
                 return false;
             }
             return true;
@@ -156,10 +104,7 @@ class TokenClassificationExtensionPoints {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( nls.localize(
-                        'invalid.semanticTokenTypeConfiguration',
-                        "'configuration.semanticTokenType' must be an array"
-                    )));
+                    collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.semanticTokenTypeConfiguration', "'configuration.semanticTokenType' must be an array"));
                     return;
                 }
                 for (const contribution of extensionValue) {
@@ -180,10 +125,7 @@ class TokenClassificationExtensionPoints {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( nls.localize(
-                        'invalid.semanticTokenModifierConfiguration',
-                        "'configuration.semanticTokenModifier' must be an array"
-                    )));
+                    collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.semanticTokenModifierConfiguration', "'configuration.semanticTokenModifier' must be an array"));
                     return;
                 }
                 for (const contribution of extensionValue) {
@@ -204,34 +146,22 @@ class TokenClassificationExtensionPoints {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( nls.localize(
-                        'invalid.semanticTokenScopes.configuration',
-                        "'configuration.semanticTokenScopes' must be an array"
-                    )));
+                    collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.semanticTokenScopes.configuration', "'configuration.semanticTokenScopes' must be an array"));
                     return;
                 }
                 for (const contribution of extensionValue) {
                     if (contribution.language && typeof contribution.language !== 'string') {
-                        collector.error(( nls.localize(
-                            'invalid.semanticTokenScopes.language',
-                            "'configuration.semanticTokenScopes.language' must be a string"
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.semanticTokenScopes.language', "'configuration.semanticTokenScopes.language' must be a string"));
                         continue;
                     }
                     if (!contribution.scopes || typeof contribution.scopes !== 'object') {
-                        collector.error(( nls.localize(
-                            'invalid.semanticTokenScopes.scopes',
-                            "'configuration.semanticTokenScopes.scopes' must be defined as an object"
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.semanticTokenScopes.scopes', "'configuration.semanticTokenScopes.scopes' must be defined as an object"));
                         continue;
                     }
                     for (const selectorString in contribution.scopes) {
                         const tmScopes = contribution.scopes[selectorString];
                         if (!Array.isArray(tmScopes) || ( tmScopes.some(l => typeof l !== 'string'))) {
-                            collector.error(( nls.localize(
-                                'invalid.semanticTokenScopes.scopes.value',
-                                "'configuration.semanticTokenScopes.scopes' values must be an array of strings"
-                            )));
+                            collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.semanticTokenScopes.scopes.value', "'configuration.semanticTokenScopes.scopes' values must be an array of strings"));
                             continue;
                         }
                         try {
@@ -239,11 +169,7 @@ class TokenClassificationExtensionPoints {
                             tokenClassificationRegistry.registerTokenStyleDefault(selector, { scopesToProbe: ( tmScopes.map(s => s.split(' '))) });
                         }
                         catch (e) {
-                            collector.error(( nls.localize(
-                                'invalid.semanticTokenScopes.scopes.selector',
-                                "configuration.semanticTokenScopes.scopes': Problems parsing selector {0}.",
-                                selectorString
-                            )));
+                            collector.error(nls.localizeWithPath('vs/workbench/services/themes/common/tokenClassificationExtensionPoint', 'invalid.semanticTokenScopes.scopes.selector', "configuration.semanticTokenScopes.scopes': Problems parsing selector {0}.", selectorString));
                         }
                     }
                 }