@codingame/monaco-vscode-api 7.1.0 → 8.0.0

package/vscode/src/vs/workbench/services/preferences/common/preferencesModels.d.ts

@@ -1,5 +1,5 @@
 import { IStringDictionary } from '../../../../base/common/collections.js';
-import { Event, Emitter } from '../../../../base/common/event.js';
+import { Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import '../../../../editor/editor.api.js';
@@ -41,17 +41,19 @@ declare class Settings2EditorModel extends AbstractSettingsModel implements ISet
 declare class DefaultSettings extends Disposable {
     private _mostCommonlyUsedSettingsKeys;
     readonly target: ConfigurationTarget;
+    readonly configurationService: IConfigurationService;
     private _allSettingsGroups;
     private _content;
     private _contentWithoutMostCommonlyUsed;
     private _settingsByName;
-    readonly _onDidChange: Emitter<void>;
+    private readonly _onDidChange;
     readonly onDidChange: Event<void>;
-    constructor(_mostCommonlyUsedSettingsKeys: string[], target: ConfigurationTarget);
+    constructor(_mostCommonlyUsedSettingsKeys: string[], target: ConfigurationTarget, configurationService: IConfigurationService);
     getContent(forceUpdate?: boolean): string;
     getContentWithoutMostCommonlyUsed(forceUpdate?: boolean): string;
     getSettingsGroups(forceUpdate?: boolean): ISettingsGroup[];
     private initialize;
+    private reset;
     private parse;
     getRegisteredGroups(): ISettingsGroup[];
     private sortGroups;

package/vscode/src/vs/workbench/services/remote/common/remoteAgentService.d.ts

@@ -11,6 +11,7 @@ interface IRemoteAgentConnection {
     readonly remoteAuthority: string;
     readonly onReconnecting: Event<void>;
     readonly onDidStateChange: Event<PersistentConnectionEvent>;
+    end(): Promise<void>;
     dispose(): void;
     getChannel<T extends IChannel>(channelName: string): T;
     withChannel<T extends IChannel, R>(channelName: string, callback: (channel: T) => Promise<R>): Promise<R>;

package/vscode/src/vs/workbench/services/remote/common/remoteAgentService.service.d.ts

@@ -25,6 +25,10 @@ interface IRemoteAgentService {
     * may be delayed if the extension host is busy.
     */
     getRoundTripTime(): Promise<number | undefined>;
+    /**
+    * Gracefully ends the current connection, if any.
+    */
+    endConnection(): Promise<void>;
     getDiagnosticInfo(options: IDiagnosticInfoOptions): Promise<IDiagnosticInfo | undefined>;
     updateTelemetryLevel(telemetryLevel: TelemetryLevel): Promise<void>;
     logTelemetry(eventName: string, data?: ITelemetryData): Promise<void>;

package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import '../../../../platform/instantiation/common/extensions.js';
@@ -8,7 +8,6 @@ import { IStorageService } from '../../../../platform/storage/common/storage.ser
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
 import { TunnelModel } from './tunnelModel.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
-const _moduleId = "vs/workbench/services/remote/common/remoteExplorerService";
 const REMOTE_EXPLORER_TYPE_KEY = 'remote.explorerType';
 const TUNNEL_VIEW_ID = '~remote.forwardedPorts';
 const TUNNEL_VIEW_CONTAINER_ID = '~remote.forwardedPortsContainer';
@@ -37,7 +36,7 @@ const getStartedWalkthrough = {
     required: ['id'],
     properties: {
         id: {
-            description: ( localizeWithPath(_moduleId, 0, 'The ID of a Get Started walkthrough to open.')),
+            description: ( localize(3079, 'The ID of a Get Started walkthrough to open.')),
             type: 'string'
         },
     }
@@ -45,13 +44,12 @@ const getStartedWalkthrough = {
 const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'remoteHelp',
     jsonSchema: {
-        description: ( localizeWithPath(_moduleId, 1, 'Contributes help information for Remote')),
+        description: ( localize(3080, 'Contributes help information for Remote')),
         type: 'object',
         properties: {
             'getStarted': {
-                description: ( localizeWithPath(
-                    _moduleId,
-                    2,
+                description: ( localize(
+                    3081,
                     "The url, or a command that returns the url, to your project's Getting Started page, or a walkthrough ID contributed by your project's extension"
                 )),
                 oneOf: [
@@ -60,34 +58,30 @@ const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 ]
             },
             'documentation': {
-                description: ( localizeWithPath(
-                    _moduleId,
-                    3,
+                description: ( localize(
+                    3082,
                     "The url, or a command that returns the url, to your project's documentation page"
                 )),
                 type: 'string'
             },
             'feedback': {
-                description: ( localizeWithPath(
-                    _moduleId,
-                    4,
+                description: ( localize(
+                    3083,
                     "The url, or a command that returns the url, to your project's feedback reporter"
                 )),
                 type: 'string',
-                markdownDeprecationMessage: ( localizeWithPath(_moduleId, 5, "Use {0} instead", '`reportIssue`'))
+                markdownDeprecationMessage: ( localize(3084, "Use {0} instead", '`reportIssue`'))
             },
             'reportIssue': {
-                description: ( localizeWithPath(
-                    _moduleId,
-                    6,
+                description: ( localize(
+                    3085,
                     "The url, or a command that returns the url, to your project's issue reporter"
                 )),
                 type: 'string'
             },
             'issues': {
-                description: ( localizeWithPath(
-                    _moduleId,
-                    7,
+                description: ( localize(
+                    3086,
                     "The url, or a command that returns the url, to your project's issues list"
                 )),
                 type: 'string'

package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { debounce } from '../../../../base/common/decorators.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { hash } from '../../../../base/common/hash.js';
@@ -21,13 +21,12 @@ import { isString, isNumber, isObject } from '../../../../base/common/types.js';
 import { deepClone } from '../../../../base/common/objects.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-const _moduleId = "vs/workbench/services/remote/common/tunnelModel";
 const MISMATCH_LOCAL_PORT_COOLDOWN = 10 * 1000;
 const TUNNELS_TO_RESTORE = 'remote.tunnels.toRestore';
 const TUNNELS_TO_RESTORE_EXPIRATION = 'remote.tunnels.toRestoreExpiration';
 const RESTORE_EXPIRATION_TIME = 1000 * 60 * 60 * 24 * 14;
 const ACTIVATION_EVENT = 'onTunnel';
-const forwardedPortsViewEnabled = ( (new RawContextKey('forwardedPortsViewEnabled', false, ( localizeWithPath(_moduleId, 0, "Whether the Ports view is enabled.")))));
+const forwardedPortsViewEnabled = ( (new RawContextKey('forwardedPortsViewEnabled', false, ( localize(8640, "Whether the Ports view is enabled.")))));
 function parseAddress(address) {
     const matches = address.match(/^([a-zA-Z0-9_-]+(?:\.[a-zA-Z0-9_-]+)*:)?([0-9]+)$/);
     if (!matches) {
@@ -49,11 +48,11 @@ var TunnelSource;
 })(TunnelSource || (TunnelSource = {}))));
 const UserTunnelSource = {
     source: TunnelSource.User,
-    description: ( localizeWithPath(_moduleId, 1, "User Forwarded"))
+    description: ( localize(8641, "User Forwarded"))
 };
 const AutoTunnelSource = {
     source: TunnelSource.Auto,
-    description: ( localizeWithPath(_moduleId, 2, "Auto Forwarded"))
+    description: ( localize(8642, "Auto Forwarded"))
 };
 function mapHasAddress(map, host, port) {
     const initialAddress = map.get(makeAddress(host, port));
@@ -356,6 +355,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                         protocol: attributes?.get(tunnel.tunnelRemotePort)?.protocol ?? TunnelProtocol.Http,
                         localUri: await this.makeLocalUri(tunnel.localAddress, attributes?.get(tunnel.tunnelRemotePort)),
                         localPort: tunnel.tunnelLocalPort,
+                        name: attributes?.get(tunnel.tunnelRemotePort)?.label,
                         runningProcess: matchingCandidate?.detail,
                         hasRunningProcess: !!matchingCandidate,
                         pid: matchingCandidate?.pid,
@@ -382,6 +382,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                     protocol: attributes?.protocol ?? TunnelProtocol.Http,
                     localUri: await this.makeLocalUri(tunnel.localAddress, attributes),
                     localPort: tunnel.tunnelLocalPort,
+                    name: attributes?.label,
                     closeable: true,
                     runningProcess: matchingCandidate?.detail,
                     hasRunningProcess: !!matchingCandidate,
@@ -556,9 +557,8 @@ let TunnelModel = class TunnelModel extends Disposable {
             return;
         }
         this.mismatchCooldown = newCooldown;
-        const mismatchString = ( localizeWithPath(
-            _moduleId,
-            3,
+        const mismatchString = ( localize(
+            8643,
             "Local port {0} could not be used for forwarding to remote port {1}.\n\nThis usually happens when there is already another process using local port {0}.\n\nPort number {2} has been used instead.",
             expectedLocal,
             tunnel.tunnelRemotePort,
@@ -725,7 +725,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                     privacy: TunnelPrivacyId.ConstantPrivate,
                     source: {
                         source: TunnelSource.Extension,
-                        description: ( localizeWithPath(_moduleId, 4, "Statically Forwarded"))
+                        description: ( localize(8644, "Statically Forwarded"))
                     }
                 });
                 this.tunnelService.setEnvironmentTunnel(tunnel.remoteAddress.host, tunnel.remoteAddress.port, localAddress, TunnelPrivacyId.ConstantPrivate, TunnelProtocol.Http);

package/vscode/src/vs/workbench/services/search/common/queryBuilder.js

@@ -11,7 +11,7 @@ import { containsUppercaseCharacter, escapeRegExpCharacters, rtrim } from '../..
 import { assertIsDefined, isDefined } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { isMultilineRegexSource } from '../../../../editor/common/model/textModelSearch.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { toWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
@@ -19,7 +19,6 @@ import { IWorkspaceContextService } from '../../../../platform/workspace/common/
 import { IEditorGroupsService } from '../../editor/common/editorGroupsService.service.js';
 import { IPathService } from '../../path/common/pathService.service.js';
 import { QueryType, pathIncludedInQuery, getExcludes } from './search.js';
-const _moduleId = "vs/workbench/services/search/common/queryBuilder";
 let QueryBuilder = class QueryBuilder {
     constructor(configurationService, workspaceContextService, editorGroupsService, logService, pathService) {
         this.configurationService = configurationService;
@@ -332,12 +331,7 @@ let QueryBuilder = class QueryBuilder {
             else {
                 const probableWorkspaceFolderNameMatch = searchPath.match(/\.[\/\\](.+)[\/\\]?/);
                 const probableWorkspaceFolderName = probableWorkspaceFolderNameMatch ? probableWorkspaceFolderNameMatch[1] : searchPath;
-                const searchPathNotFoundError = ( localizeWithPath(
-                    _moduleId,
-                    0,
-                    "Workspace folder does not exist: {0}",
-                    probableWorkspaceFolderName
-                ));
+                const searchPathNotFoundError = ( localize(5241, "Workspace folder does not exist: {0}", probableWorkspaceFolderName));
                 throw ( (new Error(searchPathNotFoundError)));
             }
         }

package/vscode/src/vs/workbench/services/search/common/search.js

@@ -132,7 +132,7 @@ function getExcludes(configuration, includeSearchExcludes = true) {
         return undefined;
     }
     if (!fileExcludes || !searchExcludes) {
-        return fileExcludes || searchExcludes;
+        return fileExcludes || searchExcludes || undefined;
     }
     let allExcludes = Object.create(null);
     allExcludes = mixin(allExcludes, deepClone(fileExcludes));

package/vscode/src/vs/workbench/services/search/common/searchExtTypes.js

@@ -1,6 +1,46 @@
+import { asArray } from '../../../../base/common/arrays.js';
 var TextSearchCompleteMessageType;
 ( (function(TextSearchCompleteMessageType) {
     TextSearchCompleteMessageType[TextSearchCompleteMessageType["Information"] = 1] = "Information";
     TextSearchCompleteMessageType[TextSearchCompleteMessageType["Warning"] = 2] = "Warning";
 })(TextSearchCompleteMessageType || (TextSearchCompleteMessageType = {})));
-export { TextSearchCompleteMessageType };
+class TextSearchMatchNew {
+    constructor(uri, ranges, previewText) {
+        this.uri = uri;
+        this.ranges = ranges;
+        this.previewText = previewText;
+    }
+}
+class TextSearchContextNew {
+    constructor(uri, text, lineNumber) {
+        this.uri = uri;
+        this.text = text;
+        this.lineNumber = lineNumber;
+    }
+}
+var ExcludeSettingOptions;
+( (function(ExcludeSettingOptions) {
+    ExcludeSettingOptions[ExcludeSettingOptions["none"] = 1] = "none";
+    ExcludeSettingOptions[ExcludeSettingOptions["filesExclude"] = 2] = "filesExclude";
+    ExcludeSettingOptions[ExcludeSettingOptions["searchAndFilesExclude"] = 3] = "searchAndFilesExclude";
+})(ExcludeSettingOptions || (ExcludeSettingOptions = {})));
+var TextSearchCompleteMessageTypeNew;
+( (function(TextSearchCompleteMessageTypeNew) {
+    TextSearchCompleteMessageTypeNew[TextSearchCompleteMessageTypeNew["Information"] = 1] = "Information";
+    TextSearchCompleteMessageTypeNew[TextSearchCompleteMessageTypeNew["Warning"] = 2] = "Warning";
+})(
+    TextSearchCompleteMessageTypeNew || (TextSearchCompleteMessageTypeNew = {})
+));
+function isTextSearchMatch(object) {
+    return 'uri' in object && 'ranges' in object && 'preview' in object;
+}
+function oldToNewTextSearchResult(result) {
+    if (isTextSearchMatch(result)) {
+        const ranges = ( asArray(result.ranges).map(r => ({ sourceRange: r, previewRange: r })));
+        return ( new TextSearchMatchNew(result.uri, ranges, result.preview.text));
+    }
+    else {
+        return ( new TextSearchContextNew(result.uri, result.text, result.lineNumber));
+    }
+}
+export { ExcludeSettingOptions, TextSearchCompleteMessageType, TextSearchCompleteMessageTypeNew, TextSearchContextNew, TextSearchMatchNew, oldToNewTextSearchResult };

package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js

@@ -1,12 +1,11 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
 import { languagesExtPoint } from '../../language/common/languageService.js';
-const _moduleId = "vs/workbench/services/textMate/common/TMGrammars";
 const grammarsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'grammars',
     deps: [languagesExtPoint],
     jsonSchema: {
-        description: ( localizeWithPath(_moduleId, 0, 'Contributes textmate tokenizers.')),
+        description: ( localize(6142, 'Contributes textmate tokenizers.')),
         type: 'array',
         defaultSnippets: [{ body: [{ language: '${1:id}', scopeName: 'source.${2:id}', path: './syntaxes/${3:id}.tmLanguage.' }] }],
         items: {
@@ -14,53 +13,43 @@ const grammarsExtPoint = ExtensionsRegistry.registerExtensionPoint({
             defaultSnippets: [{ body: { language: '${1:id}', scopeName: 'source.${2:id}', path: './syntaxes/${3:id}.tmLanguage.' } }],
             properties: {
                 language: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        1,
-                        'Language identifier for which this syntax is contributed to.'
-                    )),
+                    description: ( localize(6143, 'Language identifier for which this syntax is contributed to.')),
                     type: 'string'
                 },
                 scopeName: {
-                    description: ( localizeWithPath(_moduleId, 2, 'Textmate scope name used by the tmLanguage file.')),
+                    description: ( localize(6144, 'Textmate scope name used by the tmLanguage file.')),
                     type: 'string'
                 },
                 path: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        3,
+                    description: ( localize(
+                        6145,
                         'Path of the tmLanguage file. The path is relative to the extension folder and typically starts with \'./syntaxes/\'.'
                     )),
                     type: 'string'
                 },
                 embeddedLanguages: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        4,
+                    description: ( localize(
+                        6146,
                         'A map of scope name to language id if this grammar contains embedded languages.'
                     )),
                     type: 'object'
                 },
                 tokenTypes: {
-                    description: ( localizeWithPath(_moduleId, 5, 'A map of scope name to token types.')),
+                    description: ( localize(6147, 'A map of scope name to token types.')),
                     type: 'object',
                     additionalProperties: {
                         enum: ['string', 'comment', 'other']
                     }
                 },
                 injectTo: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        6,
-                        'List of language scope names to which this grammar is injected to.'
-                    )),
+                    description: ( localize(6148, 'List of language scope names to which this grammar is injected to.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 balancedBracketScopes: {
-                    description: ( localizeWithPath(_moduleId, 7, 'Defines which scope names contain balanced brackets.')),
+                    description: ( localize(6149, 'Defines which scope names contain balanced brackets.')),
                     type: 'array',
                     items: {
                         type: 'string'
@@ -68,11 +57,7 @@ const grammarsExtPoint = ExtensionsRegistry.registerExtensionPoint({
                     default: ['*'],
                 },
                 unbalancedBracketScopes: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        8,
-                        'Defines which scope names do not contain balanced brackets.'
-                    )),
+                    description: ( localize(6150, 'Defines which scope names do not contain balanced brackets.')),
                     type: 'array',
                     items: {
                         type: 'string'

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { mark } from '../../../../base/common/performance.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
@@ -31,10 +31,9 @@ import { IExtensionService } from '../../extensions/common/extensions.service.js
 import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 var TextFileEditorModel_1;
-const _moduleId = "vs/workbench/services/textfile/common/textFileEditorModel";
 let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel {
     static { TextFileEditorModel_1 = this; }
-    static { this.TEXTFILE_SAVE_ENCODING_SOURCE = SaveSourceRegistry.registerSource('textFileEncoding.source', ( localizeWithPath(_moduleId, 0, "File Encoding Changed"))); }
+    static { this.TEXTFILE_SAVE_ENCODING_SOURCE = SaveSourceRegistry.registerSource('textFileEncoding.source', ( localize(5699, "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, progressService) {
@@ -503,7 +502,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         }
         const saveCancellation = ( (new CancellationTokenSource()));
         return this.progressService.withProgress({
-            title: ( localizeWithPath(_moduleId, 1, "Saving '{0}'", this.name)),
+            title: ( localize(5700, "Saving '{0}'", this.name)),
             location: ProgressLocation.Window,
             cancellable: true,
             delay: this.isDirty() ? 3000 : 5000
@@ -553,7 +552,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             }
             versionId = this.versionId;
             this.inErrorMode = false;
-            progress.report({ message: ( localizeWithPath(_moduleId, 2, "Writing into file...")) });
+            progress.report({ message: ( localize(5701, "Writing into file...")) });
             this.trace(`doSave(${versionId}) - before write()`);
             const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
             const resolvedTextFileEditorModel = this;

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
 import { Extensions as Extensions$1 } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -20,39 +20,36 @@ import { SyncDescriptor } from '../../../../platform/instantiation/common/descri
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
-const _moduleId = "vs/workbench/services/themes/common/colorExtensionPoint";
 const colorRegistry = ( (Registry.as(Extensions$1.ColorContribution)));
 const colorReferenceSchema = colorRegistry.getColorReferenceSchema();
 const colorIdPattern = '^\\w+[.\\w+]*$';
 const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'colors',
     jsonSchema: {
-        description: ( localizeWithPath(_moduleId, 0, 'Contributes extension defined themable colors')),
+        description: ( localize(579, 'Contributes extension defined themable colors')),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
                     type: 'string',
-                    description: ( localizeWithPath(_moduleId, 1, 'The identifier of the themable color')),
+                    description: ( localize(580, 'The identifier of the themable color')),
                     pattern: colorIdPattern,
-                    patternErrorMessage: ( localizeWithPath(
-                        _moduleId,
-                        2,
+                    patternErrorMessage: ( localize(
+                        581,
                         'Identifiers must only contain letters, digits and dots and can not start with a dot'
                     )),
                 },
                 description: {
                     type: 'string',
-                    description: ( localizeWithPath(_moduleId, 3, 'The description of the themable color')),
+                    description: ( localize(582, 'The description of the themable color')),
                 },
                 defaults: {
                     type: 'object',
                     properties: {
                         light: {
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                4,
+                            description: ( localize(
+                                583,
                                 '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',
@@ -62,9 +59,8 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                             ]
                         },
                         dark: {
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                5,
+                            description: ( localize(
+                                584,
                                 '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',
@@ -74,9 +70,8 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                             ]
                         },
                         highContrast: {
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                6,
+                            description: ( localize(
+                                585,
                                 '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',
@@ -86,9 +81,8 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                             ]
                         },
                         highContrastLight: {
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                7,
+                            description: ( localize(
+                                586,
                                 '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',
@@ -111,7 +105,7 @@ class ColorExtensionPoint {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localizeWithPath(_moduleId, 8, "'configuration.colors' must be a array")));
+                    collector.error(( localize(587, "'configuration.colors' must be a array")));
                     return;
                 }
                 const parseColorValue = (s, name) => {
@@ -123,9 +117,8 @@ class ColorExtensionPoint {
                             return s;
                         }
                     }
-                    collector.error(( localizeWithPath(
-                        _moduleId,
-                        9,
+                    collector.error(( localize(
+                        588,
                         "{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
                     )));
@@ -133,50 +126,41 @@ class ColorExtensionPoint {
                 };
                 for (const colorContribution of extensionValue) {
                     if (typeof colorContribution.id !== 'string' || colorContribution.id.length === 0) {
-                        collector.error(( localizeWithPath(
-                            _moduleId,
-                            10,
-                            "'configuration.colors.id' must be defined and can not be empty"
-                        )));
+                        collector.error(( localize(589, "'configuration.colors.id' must be defined and can not be empty")));
                         return;
                     }
                     if (!colorContribution.id.match(colorIdPattern)) {
-                        collector.error(( localizeWithPath(
-                            _moduleId,
-                            11,
+                        collector.error(( localize(
+                            590,
                             "'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(( localizeWithPath(
-                            _moduleId,
-                            12,
+                        collector.error(( localize(
+                            591,
                             "'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(( localizeWithPath(
-                            _moduleId,
-                            13,
+                        collector.error(( localize(
+                            592,
                             "'configuration.colors.defaults' must be defined and must contain 'light' and 'dark'"
                         )));
                         return;
                     }
                     if (defaults.highContrast && typeof defaults.highContrast !== 'string') {
-                        collector.error(( localizeWithPath(
-                            _moduleId,
-                            14,
+                        collector.error(( localize(
+                            593,
                             "If defined, 'configuration.colors.defaults.highContrast' must be a string."
                         )));
                         return;
                     }
                     if (defaults.highContrastLight && typeof defaults.highContrastLight !== 'string') {
-                        collector.error(( localizeWithPath(
-                            _moduleId,
-                            15,
+                        collector.error(( localize(
+                            594,
                             "If defined, 'configuration.colors.defaults.highContrastLight' must be a string."
                         )));
                         return;
@@ -212,11 +196,11 @@ class ColorDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localizeWithPath(_moduleId, 16, "ID")),
-            ( localizeWithPath(_moduleId, 17, "Description")),
-            ( localizeWithPath(_moduleId, 18, "Dark Default")),
-            ( localizeWithPath(_moduleId, 19, "Light Default")),
-            ( localizeWithPath(_moduleId, 20, "High Contrast Default")),
+            ( localize(595, "ID")),
+            ( localize(596, "Description")),
+            ( localize(597, "Dark Default")),
+            ( localize(598, "Light Default")),
+            ( localize(599, "High Contrast Default")),
         ];
         const toColor = (colorReference) => colorReference[0] === '#' ? ( (Color.fromHex(colorReference))) : undefined;
         const rows = ( (colors.sort((a, b) => a.id.localeCompare(b.id))
@@ -240,7 +224,7 @@ class ColorDataRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'colors',
-    label: ( localizeWithPath(_moduleId, 21, "Colors")),
+    label: ( localize(600, "Colors")),
     access: {
         canToggle: false
     },