@codingame/monaco-vscode-api 1.78.8 → 1.79.0

package/dist/vscode/vs/workbench/services/search/common/ignoreFile.js

@@ -0,0 +1,102 @@
+import * as glob from 'monaco-editor/esm/vs/base/common/glob.js';
+class IgnoreFile {
+    constructor(contents, location, parent) {
+        this.location = location;
+        this.parent = parent;
+        if (location[location.length - 1] === '\\') {
+            throw Error('Unexpected path format, do not use trailing backslashes');
+        }
+        if (location[location.length - 1] !== '/') {
+            location += '/';
+        }
+        this.isPathIgnored = this.parseIgnoreFile(contents, this.location, this.parent);
+    }
+    updateContents(contents) {
+        this.isPathIgnored = this.parseIgnoreFile(contents, this.location, this.parent);
+    }
+    isPathIncludedInTraversal(path, isDir) {
+        if (path[0] !== '/' || path[path.length - 1] === '/') {
+            throw Error('Unexpected path format, expectred to begin with slash and end without. got:' + path);
+        }
+        const ignored = this.isPathIgnored(path, isDir);
+        return !ignored;
+    }
+    isArbitraryPathIgnored(path, isDir) {
+        if (path[0] !== '/' || path[path.length - 1] === '/') {
+            throw Error('Unexpected path format, expectred to begin with slash and end without. got:' + path);
+        }
+        const segments = path.split('/').filter(x => x);
+        let ignored = false;
+        let walkingPath = '';
+        for (let i = 0; i < segments.length; i++) {
+            const isLast = i === segments.length - 1;
+            const segment = segments[i];
+            walkingPath = walkingPath + '/' + segment;
+            if (!this.isPathIncludedInTraversal(walkingPath, isLast ? isDir : true)) {
+                ignored = true;
+                break;
+            }
+        }
+        return ignored;
+    }
+    gitignoreLinesToExpression(lines, dirPath, trimForExclusions) {
+        const includeLines = ( lines.map(line => this.gitignoreLineToGlob(line, dirPath)));
+        const includeExpression = Object.create(null);
+        for (const line of includeLines) {
+            includeExpression[line] = true;
+        }
+        return glob.parse(includeExpression, { trimForExclusions });
+    }
+    parseIgnoreFile(ignoreContents, dirPath, parent) {
+        const contentLines = ( ignoreContents
+            .split('\n')
+            .map(line => line.trim()))
+            .filter(line => line && line[0] !== '#');
+        const fileLines = contentLines.filter(line => !line.endsWith('/'));
+        const fileIgnoreLines = fileLines.filter(line => !line.includes('!'));
+        const isFileIgnored = this.gitignoreLinesToExpression(fileIgnoreLines, dirPath, true);
+        const fileIncludeLines = ( fileLines.filter(line => line.includes('!')).map(line => line.replace(/!/g, '')));
+        const isFileIncluded = this.gitignoreLinesToExpression(fileIncludeLines, dirPath, false);
+        const dirIgnoreLines = contentLines.filter(line => !line.includes('!'));
+        const isDirIgnored = this.gitignoreLinesToExpression(dirIgnoreLines, dirPath, true);
+        const dirIncludeLines = ( contentLines.filter(line => line.includes('!')).map(line => line.replace(/!/g, '')));
+        const isDirIncluded = this.gitignoreLinesToExpression(dirIncludeLines, dirPath, false);
+        const isPathIgnored = (path, isDir) => {
+            if (!path.startsWith(dirPath)) {
+                return false;
+            }
+            if (isDir && isDirIgnored(path) && !isDirIncluded(path)) {
+                return true;
+            }
+            if (isFileIgnored(path) && !isFileIncluded(path)) {
+                return true;
+            }
+            if (parent) {
+                return parent.isPathIgnored(path, isDir);
+            }
+            return false;
+        };
+        return isPathIgnored;
+    }
+    gitignoreLineToGlob(line, dirPath) {
+        const firstSep = line.indexOf('/');
+        if (firstSep === -1 || firstSep === line.length - 1) {
+            line = '**/' + line;
+        }
+        else {
+            if (firstSep === 0) {
+                if (dirPath.slice(-1) === '/') {
+                    line = line.slice(1);
+                }
+            }
+            else {
+                if (dirPath.slice(-1) !== '/') {
+                    line = '/' + line;
+                }
+            }
+            line = dirPath + line;
+        }
+        return line;
+    }
+}
+export { IgnoreFile };

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

@@ -5,7 +5,7 @@ import * as glob from 'monaco-editor/esm/vs/base/common/glob.js';
 import { untildify } from 'monaco-editor/esm/vs/base/common/labels.js';
 import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import * as paths from 'monaco-editor/esm/vs/base/common/path.js';
+import * as path from 'monaco-editor/esm/vs/base/common/path.js';
 import { isAbsolutePath, isEqual, basename } from 'monaco-editor/esm/vs/base/common/resources.js';
 import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
 import { assertIsDefined, isDefined } from 'monaco-editor/esm/vs/base/common/types.js';
@@ -43,7 +43,7 @@ let QueryBuilder = class QueryBuilder {
             usePCRE2: searchConfig.search.usePCRE2 || fallbackToPCRE || false,
             beforeContext: options.beforeContext,
             afterContext: options.afterContext,
-            userDisabledExcludesAndIgnoreFiles: options.disregardExcludeSettings && options.disregardIgnoreFiles
+            userDisabledExcludesAndIgnoreFiles: options.disregardExcludeSettings && options.disregardIgnoreFiles,
         };
     }
     getContentPattern(inputPattern, options) {
@@ -61,6 +61,24 @@ let QueryBuilder = class QueryBuilder {
         if (this.isMultiline(inputPattern)) {
             newPattern.isMultiline = true;
         }
+        if (options.notebookSearchConfig?.includeMarkupInput) {
+            if (!newPattern.notebookInfo) {
+                newPattern.notebookInfo = {};
+            }
+            newPattern.notebookInfo.isInNotebookMarkdownInput = options.notebookSearchConfig.includeMarkupInput;
+        }
+        if (options.notebookSearchConfig?.includeCodeInput) {
+            if (!newPattern.notebookInfo) {
+                newPattern.notebookInfo = {};
+            }
+            newPattern.notebookInfo.isInNotebookCellInput = options.notebookSearchConfig.includeCodeInput;
+        }
+        if (options.notebookSearchConfig?.includeOutput) {
+            if (!newPattern.notebookInfo) {
+                newPattern.notebookInfo = {};
+            }
+            newPattern.notebookInfo.isInNotebookCellOutput = options.notebookSearchConfig.includeOutput;
+        }
         return newPattern;
     }
     file(folders, options = {}) {
@@ -130,7 +148,7 @@ let QueryBuilder = class QueryBuilder {
             }
             const providerExists = isAbsolutePath(file);
             if (providerExists) {
-                const searchRoot = this.workspaceContextService.getWorkspaceFolder(file)?.uri ?? file.with({ path: paths.dirname(file.fsPath) });
+                const searchRoot = this.workspaceContextService.getWorkspaceFolder(file)?.uri ?? file.with({ path: path.dirname(file.fsPath) });
                 let folderQuery = foldersToSearch.get(searchRoot);
                 if (!folderQuery) {
                     hasIncludedFile = true;
@@ -138,7 +156,7 @@ let QueryBuilder = class QueryBuilder {
                     folderQueries.push(folderQuery);
                     foldersToSearch.set(searchRoot, folderQuery);
                 }
-                const relPath = paths.relative(searchRoot.fsPath, file.fsPath);
+                const relPath = path.relative(searchRoot.fsPath, file.fsPath);
                 assertIsDefined(folderQuery.includePattern)[relPath.replace(/\\/g, '/')] = true;
             }
             else {
@@ -182,7 +200,7 @@ let QueryBuilder = class QueryBuilder {
     }
     parseSearchPaths(pattern) {
         const isSearchPath = (segment) => {
-            return paths.isAbsolute(segment) || /^\.\.?([\/\\]|$)/.test(segment);
+            return path.isAbsolute(segment) || /^\.\.?([\/\\]|$)/.test(segment);
         };
         const patterns = Array.isArray(pattern) ? pattern : splitGlobPattern(pattern);
         const segments = ( patterns
@@ -252,7 +270,7 @@ let QueryBuilder = class QueryBuilder {
         return Array.from(( searchPathPatternMap.values()));
     }
     expandOneSearchPath(searchPath) {
-        if (paths.isAbsolute(searchPath)) {
+        if (path.isAbsolute(searchPath)) {
             const workspaceFolders = this.workspaceContextService.getWorkspace().folders;
             if (workspaceFolders[0] && workspaceFolders[0].uri.scheme !== Schemas.file) {
                 return [{
@@ -260,14 +278,14 @@ let QueryBuilder = class QueryBuilder {
                     }];
             }
             return [{
-                    searchPath: URI.file(paths.normalize(searchPath))
+                    searchPath: URI.file(path.normalize(searchPath))
                 }];
         }
         if (this.workspaceContextService.getWorkbenchState() === 2 ) {
             const workspaceUri = this.workspaceContextService.getWorkspace().folders[0].uri;
             searchPath = normalizeSlashes(searchPath);
             if (searchPath.startsWith('../') || searchPath === '..') {
-                const resolvedPath = paths.posix.resolve(workspaceUri.path, searchPath);
+                const resolvedPath = path.posix.resolve(workspaceUri.path, searchPath);
                 return [{
                         searchPath: workspaceUri.with({ path: resolvedPath })
                     }];

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

@@ -4,7 +4,7 @@ import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
 import * as extpath from 'monaco-editor/esm/vs/base/common/extpath.js';
 import { getNLines } from 'monaco-editor/esm/vs/base/common/strings.js';
 import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import * as paths from 'monaco-editor/esm/vs/base/common/path.js';
+import * as path from 'monaco-editor/esm/vs/base/common/path.js';
 import { isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
 const SEARCH_ELIDED_PREFIX = '⟪ ';
 const SEARCH_ELIDED_SUFFIX = ' characters skipped ⟫';
@@ -26,8 +26,9 @@ class FileMatch {
     }
 }
 class TextSearchMatch {
-    constructor(text, range, previewOptions) {
+    constructor(text, range, previewOptions, webviewIndex) {
         this.ranges = range;
+        this.webviewIndex = webviewIndex;
         const ranges = Array.isArray(range) ? range : [range];
         if (previewOptions && previewOptions.matchLines === 1 && isSingleLineRangeList(ranges)) {
             text = getNLines(text, previewOptions.matchLines);
@@ -114,7 +115,7 @@ function pathIncludedInQuery(queryProps, fsPath) {
             return !!queryProps.folderQueries && ( queryProps.folderQueries.some(fq => {
                 const searchPath = fq.folder.fsPath;
                 if (extpath.isEqualOrParent(fsPath, searchPath)) {
-                    const relPath = paths.relative(searchPath, fsPath);
+                    const relPath = path.relative(searchPath, fsPath);
                     return !fq.includePattern || !!glob.match(fq.includePattern, relPath);
                 }
                 else {

package/dist/vscode/vs/workbench/services/semanticSimilarity/common/semanticSimilarityService.js

@@ -0,0 +1,3 @@
+import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+const ISemanticSimilarityService = ( createDecorator('ISemanticSimilarityService'));
+export { ISemanticSimilarityService };

package/dist/vscode/vs/workbench/services/textMate/browser/workerHost/textMateWorkerTokenizerController.js

@@ -82,11 +82,7 @@ class TextMateWorkerTokenizerController extends Disposable {
                 const changes = ( ( this._pendingChanges.map(c => c.changes)).map(c => changesToString(c))).join(' then ');
                 console.log('Considering non-processed changes', changes);
             }
-            const curToFutureTransformerTokens = MonotonousIndexTransformer.fromMany(( this._pendingChanges.map((c) => ( new ArrayEdit(( c.changes.map((c) => ( new SingleArrayEdit(
-                c.range.startLineNumber - 1,
-                (c.range.endLineNumber - c.range.startLineNumber) + 1,
-                countEOL(c.text)[0] + 1
-            )))))))));
+            const curToFutureTransformerTokens = MonotonousIndexTransformer.fromMany(( this._pendingChanges.map((c) => fullLineArrayEditFromModelContentChange(c.changes))));
             const b = ( new ContiguousMultilineTokensBuilder());
             for (const t of tokens) {
                 for (let i = t.startLineNumber; i <= t.endLineNumber; i++) {
@@ -105,8 +101,7 @@ class TextMateWorkerTokenizerController extends Disposable {
                 }
             }
         }
-        this._backgroundTokenizationStore.setTokens(tokens);
-        const curToFutureTransformerStates = MonotonousIndexTransformer.fromMany(( this._pendingChanges.map((c) => lineArrayEditFromModelContentChange(c.changes))));
+        const curToFutureTransformerStates = MonotonousIndexTransformer.fromMany(( this._pendingChanges.map((c) => fullLineArrayEditFromModelContentChange(c.changes))));
         for (const d of stateDeltas) {
             let prevState = d.startLineNumber <= 1 ? this._initialState : this._states.getEndState(d.startLineNumber - 1);
             for (let i = 0; i < d.stateDeltas.length; i++) {
@@ -129,13 +124,14 @@ class TextMateWorkerTokenizerController extends Disposable {
                 prevState = state;
             }
         }
+        this._backgroundTokenizationStore.setTokens(tokens);
     }
 }
-function lineArrayEditFromModelContentChange(c) {
+function fullLineArrayEditFromModelContentChange(c) {
     return ( new ArrayEdit(( c.map((c) => ( new SingleArrayEdit(
         c.range.startLineNumber - 1,
-        c.range.endLineNumber - c.range.startLineNumber,
-        countEOL(c.text)[0]
+        c.range.endLineNumber - c.range.startLineNumber + 1,
+        countEOL(c.text)[0] + 1
     ))))));
 }
 function changesToString(changes) {

package/dist/vscode/vs/workbench/services/textfile/common/textfiles.js

@@ -8,7 +8,7 @@ class TextFileOperationError extends FileOperationError {
         return obj instanceof Error && !isUndefinedOrNull(obj.textFileOperationResult);
     }
     constructor(message, textFileOperationResult, options) {
-        super(message, 11 );
+        super(message, 10 );
         this.textFileOperationResult = textFileOperationResult;
         this.options = options;
     }

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

@@ -1,5 +1,5 @@
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as paths from 'monaco-editor/esm/vs/base/common/path.js';
+import * as path from 'monaco-editor/esm/vs/base/common/path.js';
 import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
 import * as Json from 'monaco-editor/esm/vs/base/common/json.js';
 import { ExtensionData } from '../common/workbenchThemeService.js';
@@ -26,7 +26,7 @@ class FileIconThemeData {
     }
     static fromExtensionTheme(iconTheme, iconThemeLocation, extensionData) {
         const id = extensionData.extensionId + '-' + iconTheme.id;
-        const label = iconTheme.label || paths.basename(iconTheme.path);
+        const label = iconTheme.label || path.basename(iconTheme.path);
         const settingsId = iconTheme.id;
         const themeData = ( new FileIconThemeData(id, label, settingsId));
         themeData.description = iconTheme.description;

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

@@ -1,10 +1,9 @@
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as paths from 'monaco-editor/esm/vs/base/common/path.js';
+import * as path from 'monaco-editor/esm/vs/base/common/path.js';
 import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
 import * as Json from 'monaco-editor/esm/vs/base/common/json.js';
-import { ExtensionData } from '../common/workbenchThemeService.js';
+import { ThemeSettingDefaults, ExtensionData } from '../common/workbenchThemeService.js';
 import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
-import { DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE } from '../common/themeConfiguration.js';
 import { fontIdRegex, fontWeightRegex, fontStyleRegex, fontFormatRegex } from '../common/productIconThemeSchema.js';
 import { isObject, isString } from 'monaco-editor/esm/vs/base/common/types.js';
 import { getIconRegistry, IconFontDefinition } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
@@ -47,7 +46,7 @@ class ProductIconThemeData {
     }
     static fromExtensionTheme(iconTheme, iconThemeLocation, extensionData) {
         const id = extensionData.extensionId + '-' + iconTheme.id;
-        const label = iconTheme.label || paths.basename(iconTheme.path);
+        const label = iconTheme.label || path.basename(iconTheme.path);
         const settingsId = iconTheme.id;
         const themeData = ( new ProductIconThemeData(id, label, settingsId));
         themeData.description = iconTheme.description;
@@ -67,7 +66,7 @@ class ProductIconThemeData {
     static get defaultTheme() {
         let themeData = ProductIconThemeData._defaultProductIconTheme;
         if (!themeData) {
-            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( nls.localize('defaultTheme', 'Default')), DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE));
+            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( nls.localize('defaultTheme', 'Default')), ThemeSettingDefaults.PRODUCT_ICON_THEME));
             themeData.isLoaded = true;
             themeData.extensionData = undefined;
             themeData.watch = false;

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 import * as types from 'monaco-editor/esm/vs/base/common/types.js';
 import { IExtensionService } from '../../extensions/common/extensions.js';
-import { ThemeSettings, ExtensionData, VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME } from '../common/workbenchThemeService.js';
+import { ThemeSettingDefaults, ThemeSettings, ExtensionData, VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME, COLOR_THEME_LIGHT_INITIAL_COLORS, COLOR_THEME_DARK_INITIAL_COLORS } from '../common/workbenchThemeService.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
@@ -35,8 +35,6 @@ import { IUserDataInitializationService } from '../../userData/browser/userDataI
 import { getIconsStyleSheet } from 'monaco-editor/esm/vs/platform/theme/browser/iconsStyleSheet.js';
 import { getColorRegistry, asCssVariableName } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-const DEFAULT_COLOR_THEME_ID = 'vs-dark vscode-theme-defaults-themes-dark_plus-json';
-const DEFAULT_LIGHT_COLOR_THEME_ID = 'vs vscode-theme-defaults-themes-light_plus-json';
 const PERSISTED_OS_COLOR_SCHEME = 'osColorScheme';
 const PERSISTED_OS_COLOR_SCHEME_SCOPE = -1 ;
 const defaultThemeExtensionId = 'vscode-theme-defaults';
@@ -67,6 +65,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.extensionResourceLoaderService = extensionResourceLoaderService;
         this.logService = logService;
         this.hostColorService = hostColorService;
+        this.hasDefaultUpdated = false;
         this.themeExtensionsActivated = ( (new Map()));
         this.container = layoutService.container;
         this.settings = ( (new ThemeConfiguration(configurationService)));
@@ -105,21 +104,24 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.currentProductIconTheme = ProductIconThemeData.createUnloadedTheme('');
         this.productIconThemeSequencer = ( (new Sequencer()));
         let themeData = ColorThemeData.fromStorageData(this.storageService);
-        if (themeData && this.settings.colorTheme !== themeData.settingsId && this.settings.isDefaultColorTheme()) {
+        const colorThemeSetting = this.settings.colorTheme;
+        if (themeData && colorThemeSetting !== themeData.settingsId && this.settings.isDefaultColorTheme()) {
+            this.hasDefaultUpdated = themeData.settingsId === ThemeSettingDefaults.COLOR_THEME_DARK_OLD || themeData.settingsId === ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD;
             themeData = undefined;
         }
         const preferredColorScheme = this.getPreferredColorScheme();
+        const defaultColorMap = colorThemeSetting === ThemeSettingDefaults.COLOR_THEME_LIGHT ? COLOR_THEME_LIGHT_INITIAL_COLORS : colorThemeSetting === ThemeSettingDefaults.COLOR_THEME_DARK ? COLOR_THEME_DARK_INITIAL_COLORS : undefined;
         if (preferredColorScheme && themeData?.type !== preferredColorScheme && this.storageService.get(PERSISTED_OS_COLOR_SCHEME, PERSISTED_OS_COLOR_SCHEME_SCOPE) !== preferredColorScheme) {
-            themeData = ColorThemeData.createUnloadedThemeForThemeType(preferredColorScheme);
+            themeData = ColorThemeData.createUnloadedThemeForThemeType(preferredColorScheme, undefined);
         }
         if (!themeData) {
             const initialColorTheme = environmentService.options?.initialColorTheme;
             if (initialColorTheme) {
-                themeData = ColorThemeData.createUnloadedThemeForThemeType(initialColorTheme.themeType, initialColorTheme.colors);
+                themeData = ColorThemeData.createUnloadedThemeForThemeType(initialColorTheme.themeType, initialColorTheme.colors ?? defaultColorMap);
             }
         }
         if (!themeData) {
-            themeData = ColorThemeData.createUnloadedThemeForThemeType(isWeb ? ColorScheme.LIGHT : ColorScheme.DARK);
+            themeData = ColorThemeData.createUnloadedThemeForThemeType(isWeb ? ColorScheme.LIGHT : ColorScheme.DARK, defaultColorMap);
         }
         themeData.setCustomizations(this.settings);
         this.applyTheme(themeData, undefined, true);
@@ -155,7 +157,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
             if (devThemes.length) {
                 return this.setColorTheme(devThemes[0].id, 8 );
             }
-            const fallbackTheme = this.currentColorTheme.type === ColorScheme.LIGHT ? DEFAULT_LIGHT_COLOR_THEME_ID : DEFAULT_COLOR_THEME_ID;
+            const fallbackTheme = this.currentColorTheme.type === ColorScheme.LIGHT ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
             const theme = this.colorThemeRegistry.findThemeBySettingsId(this.settings.colorTheme, fallbackTheme);
             const preferredColorScheme = this.getPreferredColorScheme();
             const prevScheme = this.storageService.get(PERSISTED_OS_COLOR_SCHEME, PERSISTED_OS_COLOR_SCHEME_SCOPE);
@@ -244,7 +246,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.colorThemeRegistry.onDidChange(async (event) => {
             updateColorThemeConfigurationSchemas(event.themes);
             if (await this.restoreColorTheme()) {
-                if (this.currentColorTheme.id === DEFAULT_COLOR_THEME_ID && !types.isUndefined(prevColorId) && (await this.colorThemeRegistry.findThemeById(prevColorId))) {
+                if (this.currentColorTheme.settingsId === ThemeSettingDefaults.COLOR_THEME_DARK && !types.isUndefined(prevColorId) && (await this.colorThemeRegistry.findThemeById(prevColorId))) {
                     await this.setColorTheme(prevColorId, 'auto');
                     prevColorId = undefined;
                 }
@@ -254,7 +256,8 @@ let WorkbenchThemeService = class WorkbenchThemeService {
             }
             else if (( (event.removed.some(t => t.settingsId === this.currentColorTheme.settingsId)))) {
                 prevColorId = this.currentColorTheme.id;
-                await this.setColorTheme(DEFAULT_COLOR_THEME_ID, 'auto');
+                const defaultTheme = this.colorThemeRegistry.findThemeBySettingsId(ThemeSettingDefaults.COLOR_THEME_DARK);
+                await this.setColorTheme(defaultTheme, 'auto');
             }
         });
         let prevFileIconId = undefined;
@@ -354,6 +357,9 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         }
         return null;
     }
+    hasUpdatedDefaultThemes() {
+        return this.hasDefaultUpdated;
+    }
     getColorTheme() {
         return this.currentColorTheme;
     }

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

@@ -5,22 +5,19 @@ import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/c
 import { textmateColorsSchemaId, textmateColorGroupSchemaId } from './colorThemeSchema.js';
 import { workbenchColorsSchemaId } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { tokenStylingSchemaId } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
-import { ThemeSettings } from './workbenchThemeService.js';
+import { ThemeSettings, ThemeSettingDefaults } from './workbenchThemeService.js';
 import { isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
-const DEFAULT_THEME_DARK_SETTING_VALUE = 'Default Dark+';
-const DEFAULT_THEME_LIGHT_SETTING_VALUE = 'Default Light+';
-const DEFAULT_THEME_HC_DARK_SETTING_VALUE = 'Default High Contrast';
-const DEFAULT_THEME_HC_LIGHT_SETTING_VALUE = 'Default High Contrast Light';
-const DEFAULT_FILE_ICON_THEME_SETTING_VALUE = 'vs-seti';
-const DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE = 'Default';
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 const colorThemeSettingEnum = [];
 const colorThemeSettingEnumItemLabels = [];
 const colorThemeSettingEnumDescriptions = [];
+function formatSettingAsLink(str) {
+    return `\`#${str}#\``;
+}
 const colorThemeSettingSchema = {
     type: 'string',
     description: ( nls.localize('colorTheme', "Specifies the color theme used in the workbench.")),
-    default: isWeb ? DEFAULT_THEME_LIGHT_SETTING_VALUE : DEFAULT_THEME_DARK_SETTING_VALUE,
+    default: isWeb ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK,
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
@@ -29,11 +26,11 @@ const colorThemeSettingSchema = {
 const preferredDarkThemeSettingSchema = {
     type: 'string',
     markdownDescription: ( nls.localize(
-        { key: 'preferredDarkColorTheme', comment: ['`#{0}#` will become a link to an other setting. Do not remove backtick or #'] },
-        'Specifies the preferred color theme for dark OS appearance when `#{0}#` is enabled.',
-        ThemeSettings.DETECT_COLOR_SCHEME
+        { key: 'preferredDarkColorTheme', comment: ['{0} will become a link to another setting.'] },
+        'Specifies the preferred color theme for dark OS appearance when {0} is enabled.',
+        formatSettingAsLink(ThemeSettings.DETECT_COLOR_SCHEME)
     )),
-    default: DEFAULT_THEME_DARK_SETTING_VALUE,
+    default: ThemeSettingDefaults.COLOR_THEME_DARK,
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
@@ -42,11 +39,11 @@ const preferredDarkThemeSettingSchema = {
 const preferredLightThemeSettingSchema = {
     type: 'string',
     markdownDescription: ( nls.localize(
-        { key: 'preferredLightColorTheme', comment: ['`#{0}#` will become a link to an other setting. Do not remove backtick or #'] },
-        'Specifies the preferred color theme for light OS appearance when `#{0}#` is enabled.',
-        ThemeSettings.DETECT_COLOR_SCHEME
+        { key: 'preferredLightColorTheme', comment: ['{0} will become a link to another setting.'] },
+        'Specifies the preferred color theme for light OS appearance when {0} is enabled.',
+        formatSettingAsLink(ThemeSettings.DETECT_COLOR_SCHEME)
     )),
-    default: DEFAULT_THEME_LIGHT_SETTING_VALUE,
+    default: ThemeSettingDefaults.COLOR_THEME_LIGHT,
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
@@ -55,11 +52,11 @@ const preferredLightThemeSettingSchema = {
 const preferredHCDarkThemeSettingSchema = {
     type: 'string',
     markdownDescription: ( nls.localize(
-        { key: 'preferredHCDarkColorTheme', comment: ['`#{0}#` will become a link to an other setting. Do not remove backtick or #'] },
-        'Specifies the preferred color theme used in high contrast dark mode when `#{0}#` is enabled.',
-        ThemeSettings.DETECT_HC
+        { key: 'preferredHCDarkColorTheme', comment: ['{0} will become a link to another setting.'] },
+        'Specifies the preferred color theme used in high contrast dark mode when {0} is enabled.',
+        formatSettingAsLink(ThemeSettings.DETECT_HC)
     )),
-    default: DEFAULT_THEME_HC_DARK_SETTING_VALUE,
+    default: ThemeSettingDefaults.COLOR_THEME_HC_DARK,
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
@@ -68,11 +65,11 @@ const preferredHCDarkThemeSettingSchema = {
 const preferredHCLightThemeSettingSchema = {
     type: 'string',
     markdownDescription: ( nls.localize(
-        { key: 'preferredHCLightColorTheme', comment: ['`#{0}#` will become a link to an other setting. Do not remove backtick or #'] },
-        'Specifies the preferred color theme used in high contrast light mode when `#{0}#` is enabled.',
-        ThemeSettings.DETECT_HC
+        { key: 'preferredHCLightColorTheme', comment: ['{0} will become a link to another setting.'] },
+        'Specifies the preferred color theme used in high contrast light mode when {0} is enabled.',
+        formatSettingAsLink(ThemeSettings.DETECT_HC)
     )),
-    default: DEFAULT_THEME_HC_LIGHT_SETTING_VALUE,
+    default: ThemeSettingDefaults.COLOR_THEME_HC_LIGHT,
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
@@ -81,10 +78,10 @@ const preferredHCLightThemeSettingSchema = {
 const detectColorSchemeSettingSchema = {
     type: 'boolean',
     markdownDescription: ( nls.localize(
-        'detectColorScheme',
-        'If set, automatically switch to the preferred color theme based on the OS appearance. If the OS appearance is dark, the theme specified at `#{0}#` is used, for light `#{1}#`.',
-        ThemeSettings.PREFERRED_DARK_THEME,
-        ThemeSettings.PREFERRED_LIGHT_THEME
+        { key: 'detectColorScheme', comment: ['{0} and {1} will become links to other settings.'] },
+        'If set, automatically switch to the preferred color theme based on the OS appearance. If the OS appearance is dark, the theme specified at {0} is used, for light {1}.',
+        formatSettingAsLink(ThemeSettings.PREFERRED_DARK_THEME),
+        formatSettingAsLink(ThemeSettings.PREFERRED_LIGHT_THEME)
     )),
     default: false
 };
@@ -102,7 +99,7 @@ const colorCustomizationsSchema = {
 };
 const fileIconThemeSettingSchema = {
     type: ['string', 'null'],
-    default: DEFAULT_FILE_ICON_THEME_SETTING_VALUE,
+    default: ThemeSettingDefaults.FILE_ICON_THEME,
     description: ( nls.localize(
         'iconTheme',
         "Specifies the file icon theme used in the workbench or 'null' to not show any file icons."
@@ -114,9 +111,9 @@ const fileIconThemeSettingSchema = {
 };
 const productIconThemeSettingSchema = {
     type: ['string', 'null'],
-    default: DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE,
+    default: ThemeSettingDefaults.PRODUCT_ICON_THEME,
     description: ( nls.localize('productIconTheme', "Specifies the product icon theme used.")),
-    enum: [DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE],
+    enum: [ThemeSettingDefaults.PRODUCT_ICON_THEME],
     enumItemLabels: [( nls.localize('defaultProductIconThemeLabel', 'Default'))],
     enumDescriptions: [( nls.localize('defaultProductIconThemeDesc', 'Default'))],
     errorMessage: ( nls.localize('productIconThemeError', "Product icon theme is unknown or not installed."))
@@ -125,10 +122,10 @@ const detectHCSchemeSettingSchema = {
     type: 'boolean',
     default: true,
     markdownDescription: ( nls.localize(
-        'autoDetectHighContrast',
-        "If enabled, will automatically change to high contrast theme if the OS is using a high contrast theme. The high contrast theme to use is specified by `#{0}#` and `#{1}#`.",
-        ThemeSettings.PREFERRED_HC_DARK_THEME,
-        ThemeSettings.PREFERRED_HC_LIGHT_THEME
+        { key: 'autoDetectHighContrast', comment: ['{0} and {1} will become links to other settings.'] },
+        "If enabled, will automatically change to high contrast theme if the OS is using a high contrast theme. The high contrast theme to use is specified by {0} and {1}",
+        formatSettingAsLink(ThemeSettings.PREFERRED_HC_DARK_THEME),
+        formatSettingAsLink(ThemeSettings.PREFERRED_HC_LIGHT_THEME)
     )),
     scope: 1
 };
@@ -201,8 +198,9 @@ const tokenColorSchema = {
                 'Use `enabled` in `editor.semanticTokenColorCustomizations` setting instead.'
             )),
             markdownDeprecationMessage: ( nls.localize(
-                'editorColors.semanticHighlighting.deprecationMessageMarkdown',
-                'Use `enabled` in `#editor.semanticTokenColorCustomizations#` setting instead.'
+                { key: 'editorColors.semanticHighlighting.deprecationMessageMarkdown', comment: ['{0} will become a link to another setting.'] },
+                'Use `enabled` in {0} setting instead.',
+                formatSettingAsLink('editor.semanticTokenColorCustomizations')
             )),
             type: 'boolean'
         }
@@ -371,4 +369,4 @@ class ThemeConfiguration {
         return this.configurationService.updateValue(key, value, settingsTarget);
     }
 }
-export { DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE, ThemeConfiguration, updateColorThemeConfigurationSchemas, updateFileIconThemeConfigurationSchemas, updateProductIconThemeConfigurationSchemas };
+export { ThemeConfiguration, updateColorThemeConfigurationSchemas, updateFileIconThemeConfigurationSchemas, updateProductIconThemeConfigurationSchemas };

package/dist/vscode/vs/workbench/services/themes/common/themeExtensionPoints.js

@@ -206,23 +206,19 @@ class ThemeRegistry {
         });
         return resultingThemes;
     }
-    findThemeById(themeId, defaultId) {
+    findThemeById(themeId) {
         if (this.builtInTheme && this.builtInTheme.id === themeId) {
             return this.builtInTheme;
         }
         const allThemes = this.getThemes();
-        let defaultTheme = undefined;
         for (const t of allThemes) {
             if (t.id === themeId) {
                 return t;
             }
-            if (t.id === defaultId) {
-                defaultTheme = t;
-            }
         }
-        return defaultTheme;
+        return undefined;
     }
-    findThemeBySettingsId(settingsId, defaultId) {
+    findThemeBySettingsId(settingsId, defaultSettingsId) {
         if (this.builtInTheme && this.builtInTheme.settingsId === settingsId) {
             return this.builtInTheme;
         }
@@ -232,7 +228,7 @@ class ThemeRegistry {
             if (t.settingsId === settingsId) {
                 return t;
             }
-            if (t.id === defaultId) {
+            if (t.settingsId === defaultSettingsId) {
                 defaultTheme = t;
             }
         }