@codingame/monaco-vscode-api 8.0.4 → 9.0.2

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

@@ -1,12 +1,13 @@
-import { mapArrayOrNot } from '../../../../base/common/arrays.js';
 import { isThenable } from '../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { basename } from '../../../../base/common/path.js';
 import { isEqual, relativePath, dirname } from '../../../../base/common/resources.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
 import { URI } from '../../../../base/common/uri.js';
-import { QueryType, resolvePatternsForProvider, DEFAULT_MAX_SEARCH_RESULTS, QueryGlobTester, hasSiblingPromiseFn } from './search.js';
+import { QueryType, resolvePatternsForProvider, excludeToGlobPattern, QueryGlobTester, DEFAULT_MAX_SEARCH_RESULTS, DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS, hasSiblingPromiseFn } from './search.js';
+import { TextSearchMatchNew } from './searchExtTypes.js';
 class TextSearchManager {
     constructor(queryProviderPair, fileUtils, processType) {
         this.queryProviderPair = queryProviderPair;
@@ -31,7 +32,7 @@ class TextSearchManager {
                 }
                 if (!this.isLimitHit) {
                     const resultSize = this.resultSize(result);
-                    if (extensionResultIsMatch(result) && typeof this.query.maxResults === 'number' && this.resultCount + resultSize > this.query.maxResults) {
+                    if (result instanceof TextSearchMatchNew && typeof this.query.maxResults === 'number' && this.resultCount + resultSize > this.query.maxResults) {
                         this.isLimitHit = true;
                         isCanceled = true;
                         tokenSource.cancel();
@@ -39,30 +40,18 @@ class TextSearchManager {
                     }
                     const newResultSize = this.resultSize(result);
                     this.resultCount += newResultSize;
-                    if (newResultSize > 0 || !extensionResultIsMatch(result)) {
+                    const a = result instanceof TextSearchMatchNew;
+                    if (newResultSize > 0 || !a) {
                         this.collector.add(result, folderIdx);
                     }
                 }
             };
-            Promise.all(( folderQueries.map((fq, i) => {
-                return this.searchInFolder(fq, r => onResult(r, i), tokenSource.token);
-            }))).then(results => {
+            this.doSearch(folderQueries, onResult, tokenSource.token).then(result => {
                 tokenSource.dispose();
                 this.collector.flush();
-                const someFolderHitLImit = ( results.some(result => !!result && !!result.limitHit));
                 resolve({
-                    limitHit: this.isLimitHit || someFolderHitLImit,
-                    messages: results.flatMap(result => {
-                        if (!result?.message) {
-                            return [];
-                        }
-                        if (Array.isArray(result.message)) {
-                            return result.message;
-                        }
-                        else {
-                            return [result.message];
-                        }
-                    }),
+                    limitHit: this.isLimitHit || result?.limitHit,
+                    messages: this.getMessagesFromResults(result),
                     stats: {
                         type: this.processType
                     }
@@ -74,8 +63,17 @@ class TextSearchManager {
             });
         }));
     }
+    getMessagesFromResults(result) {
+        if (!result?.message) {
+            return [];
+        }
+        if (Array.isArray(result.message)) {
+            return result.message;
+        }
+        return [result.message];
+    }
     resultSize(result) {
-        if (extensionResultIsMatch(result)) {
+        if (result instanceof TextSearchMatchNew) {
             return Array.isArray(result.ranges) ?
                 result.ranges.length :
                 1;
@@ -85,25 +83,21 @@ class TextSearchManager {
         }
     }
     trimResultToSize(result, size) {
-        const rangesArr = Array.isArray(result.ranges) ? result.ranges : [result.ranges];
-        const matchesArr = Array.isArray(result.preview.matches) ? result.preview.matches : [result.preview.matches];
-        return {
-            ranges: rangesArr.slice(0, size),
-            preview: {
-                matches: matchesArr.slice(0, size),
-                text: result.preview.text
-            },
-            uri: result.uri
-        };
+        return ( new TextSearchMatchNew(result.uri, result.ranges.slice(0, size), result.previewText));
     }
-    async searchInFolder(folderQuery, onResult, token) {
-        const queryTester = ( new QueryGlobTester(this.query, folderQuery));
+    async doSearch(folderQueries, onResult, token) {
+        const folderMappings = TernarySearchTree.forUris();
+        folderQueries.forEach((fq, i) => {
+            const queryTester = ( new QueryGlobTester(this.query, fq));
+            folderMappings.set(fq.folder, { queryTester, folder: fq.folder, folderIdx: i });
+        });
         const testingPs = [];
         const progress = {
             report: (result) => {
-                if (!this.validateProviderResult(result)) {
-                    return;
+                if (result.uri === undefined) {
+                    throw Error('Text search result URI is undefined. Please check provider implementation.');
                 }
+                const folderQuery = folderMappings.findSubstr(result.uri);
                 const hasSibling = folderQuery.folder.scheme === Schemas.file ?
                     hasSiblingPromiseFn(() => {
                         return this.fileUtils.readdir(dirname(result.uri));
@@ -111,21 +105,31 @@ class TextSearchManager {
                     undefined;
                 const relativePath$1 = relativePath(folderQuery.folder, result.uri);
                 if (relativePath$1) {
-                    const included = queryTester.includedInQuery(relativePath$1, basename(relativePath$1), hasSibling);
+                    const included = folderQuery.queryTester.includedInQuery(relativePath$1, basename(relativePath$1), hasSibling);
                     if (isThenable(included)) {
                         testingPs.push(included.then(isIncluded => {
                             if (isIncluded) {
-                                onResult(result);
+                                onResult(result, folderQuery.folderIdx);
                             }
                         }));
                     }
                     else if (included) {
-                        onResult(result);
+                        onResult(result, folderQuery.folderIdx);
                     }
                 }
             }
         };
-        const searchOptions = this.getSearchOptionsForFolder(folderQuery);
+        const folderOptions = ( folderQueries.map(fq => this.getSearchOptionsForFolder(fq)));
+        const searchOptions = {
+            folderOptions,
+            maxFileSize: this.query.maxFileSize,
+            maxResults: this.query.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
+            previewOptions: this.query.previewOptions ?? DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS,
+            surroundingContext: this.query.surroundingContext ?? 0,
+        };
+        if ('usePCRE2' in this.query) {
+            searchOptions.usePCRE2 = this.query.usePCRE2;
+        }
         let result;
         if (this.queryProviderPair.query.type === QueryType.aiText) {
             result = await this.queryProviderPair.provider.provideAITextSearchResults(this.queryProviderPair.query.contentPattern, searchOptions, progress, token);
@@ -138,48 +142,31 @@ class TextSearchManager {
         }
         return result;
     }
-    validateProviderResult(result) {
-        if (extensionResultIsMatch(result)) {
-            if (Array.isArray(result.ranges)) {
-                if (!Array.isArray(result.preview.matches)) {
-                    console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same type.');
-                    return false;
-                }
-                if (result.preview.matches.length !== result.ranges.length) {
-                    console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
-                    return false;
-                }
-            }
-            else {
-                if (Array.isArray(result.preview.matches)) {
-                    console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
     getSearchOptionsForFolder(fq) {
         const includes = resolvePatternsForProvider(this.query.includePattern, fq.includePattern);
-        const excludes = resolvePatternsForProvider(this.query.excludePattern, fq.excludePattern);
+        let excludePattern = fq.excludePattern?.map(e => ({
+            folder: e.folder,
+            patterns: resolvePatternsForProvider(this.query.excludePattern, e.pattern)
+        }));
+        if (!excludePattern || excludePattern.length === 0) {
+            excludePattern = [{
+                    folder: undefined,
+                    patterns: resolvePatternsForProvider(this.query.excludePattern, undefined)
+                }];
+        }
+        const excludes = excludeToGlobPattern(excludePattern);
         const options = {
             folder: ( URI.from(fq.folder)),
             excludes,
             includes,
-            useIgnoreFiles: !fq.disregardIgnoreFiles,
-            useGlobalIgnoreFiles: !fq.disregardGlobalIgnoreFiles,
-            useParentIgnoreFiles: !fq.disregardParentIgnoreFiles,
+            useIgnoreFiles: {
+                local: !fq.disregardIgnoreFiles,
+                parent: !fq.disregardParentIgnoreFiles,
+                global: !fq.disregardGlobalIgnoreFiles
+            },
             followSymlinks: !fq.ignoreSymlinks,
-            encoding: fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding),
-            maxFileSize: this.query.maxFileSize,
-            maxResults: this.query.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
-            previewOptions: this.query.previewOptions,
-            afterContext: this.query.afterContext,
-            beforeContext: this.query.beforeContext
+            encoding: (fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding)) ?? '',
         };
-        if ('usePCRE2' in this.query) {
-            options.usePCRE2 = this.query.usePCRE2;
-        }
         return options;
     }
 }
@@ -228,23 +215,23 @@ class TextSearchResultsCollector {
     }
 }
 function extensionResultToFrontendResult(data) {
-    if (extensionResultIsMatch(data)) {
+    if (data instanceof TextSearchMatchNew) {
         return {
-            preview: {
-                matches: mapArrayOrNot(data.preview.matches, m => ({
-                    startLineNumber: m.start.line,
-                    startColumn: m.start.character,
-                    endLineNumber: m.end.line,
-                    endColumn: m.end.character
-                })),
-                text: data.preview.text
-            },
-            ranges: mapArrayOrNot(data.ranges, r => ({
-                startLineNumber: r.start.line,
-                startColumn: r.start.character,
-                endLineNumber: r.end.line,
-                endColumn: r.end.character
-            }))
+            previewText: data.previewText,
+            rangeLocations: ( data.ranges.map(r => ({
+                preview: {
+                    startLineNumber: r.previewRange.start.line,
+                    startColumn: r.previewRange.start.character,
+                    endLineNumber: r.previewRange.end.line,
+                    endColumn: r.previewRange.end.character
+                },
+                source: {
+                    startLineNumber: r.sourceRange.start.line,
+                    startColumn: r.sourceRange.start.character,
+                    endLineNumber: r.sourceRange.end.line,
+                    endColumn: r.sourceRange.end.character
+                },
+            }))),
         };
     }
     else {
@@ -254,9 +241,6 @@ function extensionResultToFrontendResult(data) {
         };
     }
 }
-function extensionResultIsMatch(data) {
-    return !!data.preview;
-}
 class BatchedCollector {
     static { this.TIMEOUT = 4000; }
     static { this.START_BATCH_AFTER_COUNT = 50; }
@@ -315,4 +299,4 @@ class BatchedCollector {
         }
     }
 }
-export { BatchedCollector, TextSearchManager, TextSearchResultsCollector, extensionResultIsMatch };
+export { BatchedCollector, TextSearchManager, TextSearchResultsCollector };

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

@@ -5,7 +5,7 @@ const grammarsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'grammars',
     deps: [languagesExtPoint],
     jsonSchema: {
-        description: ( localize(6178, 'Contributes textmate tokenizers.')),
+        description: ( localize(6156, 'Contributes textmate tokenizers.')),
         type: 'array',
         defaultSnippets: [{ body: [{ language: '${1:id}', scopeName: 'source.${2:id}', path: './syntaxes/${3:id}.tmLanguage.' }] }],
         items: {
@@ -13,43 +13,43 @@ const grammarsExtPoint = ExtensionsRegistry.registerExtensionPoint({
             defaultSnippets: [{ body: { language: '${1:id}', scopeName: 'source.${2:id}', path: './syntaxes/${3:id}.tmLanguage.' } }],
             properties: {
                 language: {
-                    description: ( localize(6179, 'Language identifier for which this syntax is contributed to.')),
+                    description: ( localize(6157, 'Language identifier for which this syntax is contributed to.')),
                     type: 'string'
                 },
                 scopeName: {
-                    description: ( localize(6180, 'Textmate scope name used by the tmLanguage file.')),
+                    description: ( localize(6158, 'Textmate scope name used by the tmLanguage file.')),
                     type: 'string'
                 },
                 path: {
                     description: ( localize(
-                        6181,
+                        6159,
                         'Path of the tmLanguage file. The path is relative to the extension folder and typically starts with \'./syntaxes/\'.'
                     )),
                     type: 'string'
                 },
                 embeddedLanguages: {
                     description: ( localize(
-                        6182,
+                        6160,
                         'A map of scope name to language id if this grammar contains embedded languages.'
                     )),
                     type: 'object'
                 },
                 tokenTypes: {
-                    description: ( localize(6183, 'A map of scope name to token types.')),
+                    description: ( localize(6161, 'A map of scope name to token types.')),
                     type: 'object',
                     additionalProperties: {
                         enum: ['string', 'comment', 'other']
                     }
                 },
                 injectTo: {
-                    description: ( localize(6184, 'List of language scope names to which this grammar is injected to.')),
+                    description: ( localize(6162, 'List of language scope names to which this grammar is injected to.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 balancedBracketScopes: {
-                    description: ( localize(6185, 'Defines which scope names contain balanced brackets.')),
+                    description: ( localize(6163, 'Defines which scope names contain balanced brackets.')),
                     type: 'array',
                     items: {
                         type: 'string'
@@ -57,7 +57,7 @@ const grammarsExtPoint = ExtensionsRegistry.registerExtensionPoint({
                     default: ['*'],
                 },
                 unbalancedBracketScopes: {
-                    description: ( localize(6186, 'Defines which scope names do not contain balanced brackets.')),
+                    description: ( localize(6164, 'Defines which scope names do not contain balanced brackets.')),
                     type: 'array',
                     items: {
                         type: 'string'

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

@@ -33,7 +33,7 @@ import { IProgressService } from '../../../../platform/progress/common/progress.
 var TextFileEditorModel_1;
 let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel {
     static { TextFileEditorModel_1 = this; }
-    static { this.TEXTFILE_SAVE_ENCODING_SOURCE = SaveSourceRegistry.registerSource('textFileEncoding.source', ( localize(5735, "File Encoding Changed"))); }
+    static { this.TEXTFILE_SAVE_ENCODING_SOURCE = SaveSourceRegistry.registerSource('textFileEncoding.source', ( localize(5683, "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) {
@@ -502,7 +502,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         }
         const saveCancellation = ( (new CancellationTokenSource()));
         return this.progressService.withProgress({
-            title: ( localize(5736, "Saving '{0}'", this.name)),
+            title: ( localize(5684, "Saving '{0}'", this.name)),
             location: ProgressLocation.Window,
             cancellable: true,
             delay: this.isDirty() ? 3000 : 5000
@@ -552,7 +552,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             }
             versionId = this.versionId;
             this.inErrorMode = false;
-            progress.report({ message: ( localize(5737, "Writing into file...")) });
+            progress.report({ message: ( localize(5685, "Writing into file...")) });
             this.trace(`doSave(${versionId}) - before write()`);
             const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
             const resolvedTextFileEditorModel = this;
@@ -611,6 +611,9 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         else if (this.lastResolvedFileStat.mtime <= newFileStat.mtime) {
             this.lastResolvedFileStat = newFileStat;
         }
+        else {
+            this.lastResolvedFileStat = { ...this.lastResolvedFileStat, readonly: newFileStat.readonly, locked: newFileStat.locked };
+        }
         if (this.isReadonly() !== oldReadonly) {
             this._onDidChangeReadonly.fire();
         }
@@ -659,7 +662,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             return;
         }
         this.logService.info(`Adjusting encoding based on configured language override to '${encoding}' for ${( (this.resource.toString(true)))}.`);
-        return this.setEncodingInternal(encoding, EncodingMode.Decode);
+        return this.forceResolveFromFile();
     }
     setEncoding(encoding, mode) {
         this.hasEncodingSetExplicitly = true;

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

@@ -26,30 +26,30 @@ const colorIdPattern = '^\\w+[.\\w+]*$';
 const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'colors',
     jsonSchema: {
-        description: ( localize(683, 'Contributes extension defined themable colors')),
+        description: ( localize(593, 'Contributes extension defined themable colors')),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
                     type: 'string',
-                    description: ( localize(684, 'The identifier of the themable color')),
+                    description: ( localize(594, 'The identifier of the themable color')),
                     pattern: colorIdPattern,
                     patternErrorMessage: ( localize(
-                        685,
+                        595,
                         'Identifiers must only contain letters, digits and dots and can not start with a dot'
                     )),
                 },
                 description: {
                     type: 'string',
-                    description: ( localize(686, 'The description of the themable color')),
+                    description: ( localize(596, 'The description of the themable color')),
                 },
                 defaults: {
                     type: 'object',
                     properties: {
                         light: {
                             description: ( localize(
-                                687,
+                                597,
                                 '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',
@@ -60,7 +60,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         dark: {
                             description: ( localize(
-                                688,
+                                598,
                                 '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',
@@ -71,7 +71,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         highContrast: {
                             description: ( localize(
-                                689,
+                                599,
                                 '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',
@@ -82,7 +82,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         highContrastLight: {
                             description: ( localize(
-                                690,
+                                600,
                                 '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',
@@ -105,7 +105,7 @@ class ColorExtensionPoint {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(691, "'configuration.colors' must be a array")));
+                    collector.error(( localize(601, "'configuration.colors' must be a array")));
                     return;
                 }
                 const parseColorValue = (s, name) => {
@@ -118,7 +118,7 @@ class ColorExtensionPoint {
                         }
                     }
                     collector.error(( localize(
-                        692,
+                        602,
                         "{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
                     )));
@@ -126,19 +126,19 @@ class ColorExtensionPoint {
                 };
                 for (const colorContribution of extensionValue) {
                     if (typeof colorContribution.id !== 'string' || colorContribution.id.length === 0) {
-                        collector.error(( localize(693, "'configuration.colors.id' must be defined and can not be empty")));
+                        collector.error(( localize(603, "'configuration.colors.id' must be defined and can not be empty")));
                         return;
                     }
                     if (!colorContribution.id.match(colorIdPattern)) {
                         collector.error(( localize(
-                            694,
+                            604,
                             "'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(( localize(
-                            695,
+                            605,
                             "'configuration.colors.description' must be defined and can not be empty"
                         )));
                         return;
@@ -146,21 +146,21 @@ class ColorExtensionPoint {
                     const defaults = colorContribution.defaults;
                     if (!defaults || typeof defaults !== 'object' || typeof defaults.light !== 'string' || typeof defaults.dark !== 'string') {
                         collector.error(( localize(
-                            696,
+                            606,
                             "'configuration.colors.defaults' must be defined and must contain 'light' and 'dark'"
                         )));
                         return;
                     }
                     if (defaults.highContrast && typeof defaults.highContrast !== 'string') {
                         collector.error(( localize(
-                            697,
+                            607,
                             "If defined, 'configuration.colors.defaults.highContrast' must be a string."
                         )));
                         return;
                     }
                     if (defaults.highContrastLight && typeof defaults.highContrastLight !== 'string') {
                         collector.error(( localize(
-                            698,
+                            608,
                             "If defined, 'configuration.colors.defaults.highContrastLight' must be a string."
                         )));
                         return;
@@ -196,11 +196,11 @@ class ColorDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(699, "ID")),
-            ( localize(700, "Description")),
-            ( localize(701, "Dark Default")),
-            ( localize(702, "Light Default")),
-            ( localize(703, "High Contrast Default")),
+            ( localize(609, "ID")),
+            ( localize(610, "Description")),
+            ( localize(611, "Dark Default")),
+            ( localize(612, "Light Default")),
+            ( localize(613, "High Contrast Default")),
         ];
         const toColor = (colorReference) => colorReference[0] === '#' ? ( (Color.fromHex(colorReference))) : undefined;
         const rows = ( (colors.sort((a, b) => a.id.localeCompare(b.id))
@@ -224,7 +224,7 @@ class ColorDataRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'colors',
-    label: ( localize(704, "Colors")),
+    label: ( localize(614, "Colors")),
     access: {
         canToggle: false
     },

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

@@ -14,13 +14,13 @@ const iconIdPattern = `^${ThemeIcon.iconNameSegment}(-${ThemeIcon.iconNameSegmen
 const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'icons',
     jsonSchema: {
-        description: ( localize(705, 'Contributes extension defined themable icons')),
+        description: ( localize(615, 'Contributes extension defined themable icons')),
         type: 'object',
         propertyNames: {
             pattern: iconIdPattern,
-            description: ( localize(706, 'The identifier of the themable icon')),
+            description: ( localize(616, 'The identifier of the themable icon')),
             patternErrorMessage: ( localize(
-                707,
+                617,
                 'Identifiers can only contain letters, digits and minuses and need to consist of at least two segments in the form `component-iconname`.'
             )),
         },
@@ -29,7 +29,7 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 description: {
                     type: 'string',
-                    description: ( localize(708, 'The description of the themable icon')),
+                    description: ( localize(618, 'The description of the themable icon')),
                 },
                 default: {
                     anyOf: [
@@ -38,11 +38,11 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                             type: 'object',
                             properties: {
                                 fontPath: {
-                                    description: ( localize(709, 'The path of the icon font that defines the icon.')),
+                                    description: ( localize(619, 'The path of the icon font that defines the icon.')),
                                     type: 'string'
                                 },
                                 fontCharacter: {
-                                    description: ( localize(710, 'The character for the icon in the icon font.')),
+                                    description: ( localize(620, 'The character for the icon in the icon font.')),
                                     type: 'string'
                                 }
                             },
@@ -51,7 +51,7 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         }
                     ],
                     description: ( localize(
-                        711,
+                        621,
                         'The default of the icon. Either a reference to an extisting ThemeIcon or an icon in an icon font.'
                     )),
                 }
@@ -70,7 +70,7 @@ class IconExtensionPoint {
                 const collector = extension.collector;
                 if (!extensionValue || typeof extensionValue !== 'object') {
                     collector.error(( localize(
-                        712,
+                        622,
                         "'configuration.icons' must be an object with the icon names as properties."
                     )));
                     return;
@@ -78,7 +78,7 @@ class IconExtensionPoint {
                 for (const id in extensionValue) {
                     if (!id.match(iconIdPattern)) {
                         collector.error(( localize(
-                            713,
+                            623,
                             "'configuration.icons' keys represent the icon id and can only contain letter, digits and minuses. They need to consist of at least two segments in the form `component-iconname`."
                         )));
                         return;
@@ -86,7 +86,7 @@ class IconExtensionPoint {
                     const iconContribution = extensionValue[id];
                     if (typeof iconContribution.description !== 'string' || iconContribution.description.length === 0) {
                         collector.error(( localize(
-                            714,
+                            624,
                             "'configuration.icons.description' must be defined and can not be empty"
                         )));
                         return;
@@ -100,7 +100,7 @@ class IconExtensionPoint {
                         const format = formatMap[fileExt];
                         if (!format) {
                             collector.warn(( localize(
-                                715,
+                                625,
                                 "Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.",
                                 fileExt
                             )));
@@ -110,7 +110,7 @@ class IconExtensionPoint {
                         const iconFontLocation = joinPath(extensionLocation, defaultIcon.fontPath);
                         if (!isEqualOrParent(iconFontLocation, extensionLocation)) {
                             collector.warn(( localize(
-                                716,
+                                626,
                                 "Expected `contributes.icons.default.fontPath` ({0}) to be included inside extension's folder ({0}).",
                                 iconFontLocation.path,
                                 extensionLocation.path
@@ -129,7 +129,7 @@ class IconExtensionPoint {
                     }
                     else {
                         collector.error(( localize(
-                            717,
+                            627,
                             "'configuration.icons.default' must be either a reference to the id of an other theme icon (string) or a icon definition (object) with properties `fontPath` and `fontCharacter`."
                         )));
                     }