@codingame/monaco-vscode-api 26.2.2 → 27.0.0

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

@@ -666,12 +666,12 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
         const contentValue = parse(content, errors);
         if (errors.length > 0) {
             return Promise.reject(( new Error(( localize(
-                14941,
+                15868,
                 "Problems parsing JSON theme file: {0}",
                 ( errors.map(e => getParseErrorMessage(e.error))).join(", ")
             )))));
         } else if (getNodeType(contentValue) !== "object") {
-            return Promise.reject(( new Error(( localize(14942, "Invalid format for JSON theme file: Object expected.")))));
+            return Promise.reject(( new Error(( localize(15869, "Invalid format for JSON theme file: Object expected.")))));
         }
         if (contentValue.include) {
             await _loadColorTheme(
@@ -689,7 +689,7 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
         if (colors) {
             if (typeof colors !== "object") {
                 return Promise.reject(( new Error(( localize(
-                    14943,
+                    15870,
                     "Problem parsing color theme file: {0}. Property 'colors' is not of type 'object'.",
                     (themeLocation.toString())
                 )))));
@@ -715,7 +715,7 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
                 );
             } else {
                 return Promise.reject(( new Error(( localize(
-                    14944,
+                    15871,
                     "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a TextMate theme file",
                     (themeLocation.toString())
                 )))));
@@ -731,7 +731,7 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
                     }
                 } catch (e) {
                     return Promise.reject(( new Error(( localize(
-                        14945,
+                        15872,
                         "Problem parsing color theme file: {0}. Property 'semanticTokenColors' contains a invalid selector",
                         (themeLocation.toString())
                     )))));
@@ -748,16 +748,16 @@ function _loadSyntaxTokens(extensionResourceLoaderService, themeLocation, result
             const contentValue = parse$1(content);
             const settings = contentValue.settings;
             if (!Array.isArray(settings)) {
-                return Promise.reject(( new Error(( localize(14946, "Problem parsing tmTheme file: {0}. 'settings' is not array.")))));
+                return Promise.reject(( new Error(( localize(15873, "Problem parsing tmTheme file: {0}. 'settings' is not array.")))));
             }
             convertSettings(settings, result);
             return Promise.resolve(null);
         } catch (e) {
-            return Promise.reject(( new Error(( localize(14947, "Problems parsing tmTheme file: {0}", e.message)))));
+            return Promise.reject(( new Error(( localize(15874, "Problems parsing tmTheme file: {0}", e.message)))));
         }
     }, error => {
         return Promise.reject(( new Error(( localize(
-            14948,
+            15875,
             "Problems loading tmTheme file {0}: {1}",
             (themeLocation.toString()),
             error.message

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

@@ -16,13 +16,13 @@ const iconIdPattern = `^${ThemeIcon.iconNameSegment}(-${ThemeIcon.iconNameSegmen
 const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "icons",
     jsonSchema: {
-        description: ( localize(15002, "Contributes extension defined themable icons")),
+        description: ( localize(15929, "Contributes extension defined themable icons")),
         type: "object",
         propertyNames: {
             pattern: iconIdPattern,
-            description: ( localize(15003, "The identifier of the themable icon")),
+            description: ( localize(15930, "The identifier of the themable icon")),
             patternErrorMessage: ( localize(
-                15004,
+                15931,
                 "Identifiers can only contain letters, digits and minuses and need to consist of at least two segments in the form `component-iconname`."
             ))
         },
@@ -31,18 +31,18 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 description: {
                     type: "string",
-                    description: ( localize(15005, "The description of the themable icon"))
+                    description: ( localize(15932, "The description of the themable icon"))
                 },
                 default: {
                     anyOf: [iconReferenceSchema, {
                         type: "object",
                         properties: {
                             fontPath: {
-                                description: ( localize(15006, "The path of the icon font that defines the icon.")),
+                                description: ( localize(15933, "The path of the icon font that defines the icon.")),
                                 type: "string"
                             },
                             fontCharacter: {
-                                description: ( localize(15007, "The character for the icon in the icon font.")),
+                                description: ( localize(15934, "The character for the icon in the icon font.")),
                                 type: "string"
                             }
                         },
@@ -55,7 +55,7 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         }]
                     }],
                     description: ( localize(
-                        15008,
+                        15935,
                         "The default of the icon. Either a reference to an existing ThemeIcon or an icon in an icon font."
                     ))
                 }
@@ -92,7 +92,7 @@ class IconExtensionPoint {
                 const collector = extension.collector;
                 if (!extensionValue || typeof extensionValue !== "object") {
                     collector.error(( localize(
-                        15009,
+                        15936,
                         "'configuration.icons' must be an object with the icon names as properties."
                     )));
                     return;
@@ -100,7 +100,7 @@ class IconExtensionPoint {
                 for (const id in extensionValue) {
                     if (!id.match(iconIdPattern)) {
                         collector.error(( localize(
-                            15010,
+                            15937,
                             "'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;
@@ -108,7 +108,7 @@ class IconExtensionPoint {
                     const iconContribution = extensionValue[id];
                     if (typeof iconContribution.description !== "string" || iconContribution.description.length === 0) {
                         collector.error(( localize(
-                            15011,
+                            15938,
                             "'configuration.icons.description' must be defined and can not be empty"
                         )));
                         return;
@@ -123,7 +123,7 @@ class IconExtensionPoint {
                         const format = formatMap[fileExt];
                         if (!format) {
                             collector.warn(( localize(
-                                15012,
+                                15939,
                                 "Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.",
                                 fileExt
                             )));
@@ -140,7 +140,7 @@ class IconExtensionPoint {
                         });
                         if (!isEqualOrParent(iconFontLocation, extensionLocation)) {
                             collector.warn(( localize(
-                                15013,
+                                15940,
                                 "Expected `contributes.icons.default.fontPath` ({0}) to be included inside extension's folder ({0}).",
                                 iconFontLocation.path,
                                 extensionLocation.path
@@ -156,7 +156,7 @@ class IconExtensionPoint {
                         }, iconContribution.description);
                     } else {
                         collector.error(( localize(
-                            15014,
+                            15941,
                             "'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`."
                         )));
                     }

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

@@ -10,26 +10,26 @@ const tokenClassificationRegistry = getTokenClassificationRegistry();
 const tokenTypeExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "semanticTokenTypes",
     jsonSchema: {
-        description: ( localize(15075, "Contributes semantic token types.")),
+        description: ( localize(16002, "Contributes semantic token types.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
                     type: "string",
-                    description: ( localize(15076, "The identifier of the semantic token type")),
+                    description: ( localize(16003, "The identifier of the semantic token type")),
                     pattern: typeAndModifierIdPattern,
-                    patternErrorMessage: ( localize(15077, "Identifiers should be in the form letterOrDigit[_-letterOrDigit]*"))
+                    patternErrorMessage: ( localize(16004, "Identifiers should be in the form letterOrDigit[_-letterOrDigit]*"))
                 },
                 superType: {
                     type: "string",
-                    description: ( localize(15078, "The super type of the semantic token type")),
+                    description: ( localize(16005, "The super type of the semantic token type")),
                     pattern: typeAndModifierIdPattern,
-                    patternErrorMessage: ( localize(15079, "Super types should be in the form letterOrDigit[_-letterOrDigit]*"))
+                    patternErrorMessage: ( localize(16006, "Super types should be in the form letterOrDigit[_-letterOrDigit]*"))
                 },
                 description: {
                     type: "string",
-                    description: ( localize(15080, "The description of the semantic token type"))
+                    description: ( localize(16007, "The description of the semantic token type"))
                 }
             }
         }
@@ -38,20 +38,20 @@ const tokenTypeExtPoint = ExtensionsRegistry.registerExtensionPoint({
 const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "semanticTokenModifiers",
     jsonSchema: {
-        description: ( localize(15081, "Contributes semantic token modifiers.")),
+        description: ( localize(16008, "Contributes semantic token modifiers.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
                     type: "string",
-                    description: ( localize(15082, "The identifier of the semantic token modifier")),
+                    description: ( localize(16009, "The identifier of the semantic token modifier")),
                     pattern: typeAndModifierIdPattern,
-                    patternErrorMessage: ( localize(15083, "Identifiers should be in the form letterOrDigit[_-letterOrDigit]*"))
+                    patternErrorMessage: ( localize(16010, "Identifiers should be in the form letterOrDigit[_-letterOrDigit]*"))
                 },
                 description: {
                     type: "string",
-                    description: ( localize(15084, "The description of the semantic token modifier"))
+                    description: ( localize(16011, "The description of the semantic token modifier"))
                 }
             }
         }
@@ -60,18 +60,18 @@ const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint({
 const tokenStyleDefaultsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "semanticTokenScopes",
     jsonSchema: {
-        description: ( localize(15085, "Contributes semantic token scope maps.")),
+        description: ( localize(16012, "Contributes semantic token scope maps.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 language: {
-                    description: ( localize(15086, "Lists the languge for which the defaults are.")),
+                    description: ( localize(16013, "Lists the languge for which the defaults are.")),
                     type: "string"
                 },
                 scopes: {
                     description: ( localize(
-                        15087,
+                        16014,
                         "Maps a semantic token (described by semantic token selector) to one or more textMate scopes used to represent that token."
                     )),
                     type: "object",
@@ -91,7 +91,7 @@ class TokenClassificationExtensionPoints {
         function validateTypeOrModifier(contribution, extensionPoint, collector) {
             if (typeof contribution.id !== "string" || contribution.id.length === 0) {
                 collector.error(( localize(
-                    15088,
+                    16015,
                     "'configuration.{0}.id' must be defined and can not be empty",
                     extensionPoint
                 )));
@@ -99,7 +99,7 @@ class TokenClassificationExtensionPoints {
             }
             if (!contribution.id.match(typeAndModifierIdPattern)) {
                 collector.error(( localize(
-                    15089,
+                    16016,
                     "'configuration.{0}.id' must follow the pattern letterOrDigit[-_letterOrDigit]*",
                     extensionPoint
                 )));
@@ -108,7 +108,7 @@ class TokenClassificationExtensionPoints {
             const superType = contribution.superType;
             if (superType && !superType.match(typeAndModifierIdPattern)) {
                 collector.error(( localize(
-                    15090,
+                    16017,
                     "'configuration.{0}.superType' must follow the pattern letterOrDigit[-_letterOrDigit]*",
                     extensionPoint
                 )));
@@ -116,7 +116,7 @@ class TokenClassificationExtensionPoints {
             }
             if (typeof contribution.description !== "string" || contribution.id.length === 0) {
                 collector.error(( localize(
-                    15091,
+                    16018,
                     "'configuration.{0}.description' must be defined and can not be empty",
                     extensionPoint
                 )));
@@ -129,7 +129,7 @@ class TokenClassificationExtensionPoints {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(15092, "'configuration.semanticTokenType' must be an array")));
+                    collector.error(( localize(16019, "'configuration.semanticTokenType' must be an array")));
                     return;
                 }
                 for (const contribution of extensionValue) {
@@ -150,7 +150,7 @@ class TokenClassificationExtensionPoints {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(15093, "'configuration.semanticTokenModifier' must be an array")));
+                    collector.error(( localize(16020, "'configuration.semanticTokenModifier' must be an array")));
                     return;
                 }
                 for (const contribution of extensionValue) {
@@ -171,17 +171,17 @@ class TokenClassificationExtensionPoints {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(15094, "'configuration.semanticTokenScopes' must be an array")));
+                    collector.error(( localize(16021, "'configuration.semanticTokenScopes' must be an array")));
                     return;
                 }
                 for (const contribution of extensionValue) {
                     if (contribution.language && typeof contribution.language !== "string") {
-                        collector.error(( localize(15095, "'configuration.semanticTokenScopes.language' must be a string")));
+                        collector.error(( localize(16022, "'configuration.semanticTokenScopes.language' must be a string")));
                         continue;
                     }
                     if (!contribution.scopes || typeof contribution.scopes !== "object") {
                         collector.error(( localize(
-                            15096,
+                            16023,
                             "'configuration.semanticTokenScopes.scopes' must be defined as an object"
                         )));
                         continue;
@@ -190,7 +190,7 @@ class TokenClassificationExtensionPoints {
                         const tmScopes = contribution.scopes[selectorString];
                         if (!Array.isArray(tmScopes) || ( tmScopes.some(l => typeof l !== "string"))) {
                             collector.error(( localize(
-                                15097,
+                                16024,
                                 "'configuration.semanticTokenScopes.scopes' values must be an array of strings"
                             )));
                             continue;
@@ -202,7 +202,7 @@ class TokenClassificationExtensionPoints {
                             });
                         } catch (e) {
                             collector.error(( localize(
-                                15098,
+                                16025,
                                 "configuration.semanticTokenScopes.scopes': Problems parsing selector {0}.",
                                 selectorString
                             )));

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

@@ -18,14 +18,14 @@ const PROFILE_URL_AUTHORITY_PREFIX = "profile-";
 function isProfileURL(uri) {
     return uri.authority === PROFILE_URL_AUTHORITY || ( new RegExp(`^${PROFILE_URL_AUTHORITY_PREFIX}`)).test(uri.authority);
 }
-const defaultUserDataProfileIcon = registerIcon("defaultProfile-icon", Codicon.settings, ( localize(15153, "Icon for Default Profile.")));
-const PROFILES_TITLE = ( localize2(15154, "Profiles"));
+const defaultUserDataProfileIcon = registerIcon("defaultProfile-icon", Codicon.settings, ( localize(16080, "Icon for Default Profile.")));
+const PROFILES_TITLE = ( localize2(16081, "Profiles"));
 const PROFILES_CATEGORY = {
     ...PROFILES_TITLE
 };
 const PROFILE_EXTENSION = "code-profile";
 const PROFILE_FILTER = [{
-    name: ( localize(15155, "Profile")),
+    name: ( localize(16082, "Profile")),
     extensions: [PROFILE_EXTENSION]
 }];
 const CURRENT_PROFILE_CONTEXT = ( new RawContextKey("currentProfile", ""));

package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js

@@ -3,7 +3,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const DEFAULT_ICON = registerIcon("settings-view-bar-icon", Codicon.settingsGear, ( localize(15156, "Settings icon in the view bar.")));
+const DEFAULT_ICON = registerIcon("settings-view-bar-icon", Codicon.settingsGear, ( localize(16083, "Settings icon in the view bar.")));
 const ICONS = [
 DEFAULT_ICON,
 Codicon.vm, Codicon.server, Codicon.recordKeys, Codicon.deviceMobile, Codicon.watch, Codicon.vr, Codicon.piano,

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

@@ -9,25 +9,25 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 function getSyncAreaLabel(source) {
     switch (source) {
     case SyncResource.Settings:
-        return localize(15186, "Settings");
+        return localize(16113, "Settings");
     case SyncResource.Keybindings:
-        return localize(15187, "Keyboard Shortcuts");
+        return localize(16114, "Keyboard Shortcuts");
     case SyncResource.Snippets:
-        return localize(15188, "Snippets");
+        return localize(16115, "Snippets");
     case SyncResource.Prompts:
-        return localize(15189, "Prompts and Instructions");
+        return localize(16116, "Prompts and Instructions");
     case SyncResource.Tasks:
-        return localize(15190, "Tasks");
+        return localize(16117, "Tasks");
     case SyncResource.Mcp:
-        return localize(15191, "MCP Servers");
+        return localize(16118, "MCP Servers");
     case SyncResource.Extensions:
-        return localize(15192, "Extensions");
+        return localize(16119, "Extensions");
     case SyncResource.GlobalState:
-        return localize(15193, "UI State");
+        return localize(16120, "UI State");
     case SyncResource.Profiles:
-        return localize(15194, "Profiles");
+        return localize(16121, "Profiles");
     case SyncResource.WorkspaceState:
-        return localize(15195, "Workspace State");
+        return localize(16122, "Workspace State");
     }
 }
 var AccountStatus;
@@ -36,8 +36,8 @@ var AccountStatus;
     AccountStatus["Unavailable"] = "unavailable";
     AccountStatus["Available"] = "available";
 })(AccountStatus || (AccountStatus = {}));
-const SYNC_TITLE = ( localize2(15196, "Settings Sync"));
-const SYNC_VIEW_ICON = registerIcon("settings-sync-view-icon", Codicon.sync, ( localize(15197, "View icon of the Settings Sync view.")));
+const SYNC_TITLE = ( localize2(16123, "Settings Sync"));
+const SYNC_VIEW_ICON = registerIcon("settings-sync-view-icon", Codicon.sync, ( localize(16124, "View icon of the Settings Sync view.")));
 const CONTEXT_SYNC_STATE = ( new RawContextKey("syncStatus", SyncStatus.Uninitialized));
 const CONTEXT_SYNC_ENABLEMENT = ( new RawContextKey("syncEnabled", false));
 const CONTEXT_ACCOUNT_STATE = ( new RawContextKey("userDataSyncAccountStatus", AccountStatus.Uninitialized));
@@ -50,7 +50,7 @@ const SYNC_VIEW_CONTAINER_ID = "workbench.view.sync";
 const SYNC_CONFLICTS_VIEW_ID = "workbench.views.sync.conflicts";
 const DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR = {
     id: "workbench.userDataSync.actions.downloadSyncActivity",
-    title: ( localize2(15198, "Download Settings Sync Activity")),
+    title: ( localize2(16125, "Download Settings Sync Activity")),
     category: Categories.Developer,
     f1: true,
     precondition: ( ContextKeyExpr.and(( CONTEXT_ACCOUNT_STATE.isEqualTo(AccountStatus.Available)), ( CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized))))

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js

@@ -453,7 +453,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         const saveCancellation = ( new CancellationTokenSource());
         return this.progressService.withProgress({
-            title: ( localize(15223, "Saving '{0}'", this.name)),
+            title: ( localize(16150, "Saving '{0}'", this.name)),
             location: ProgressLocation.Window,
             cancellable: true,
             delay: this.isDirty() ? 3000 : 5000
@@ -512,7 +512,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             versionId = this.versionId;
             this.inErrorMode = false;
             progress.report({
-                message: ( localize(15224, "Writing into file..."))
+                message: ( localize(16151, "Writing into file..."))
             });
             this.trace(`doSave(${versionId}) - before write()`);
             const lastResolvedFileStat = assertReturnsDefined(this.lastResolvedFileStat);
@@ -608,13 +608,13 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         let message;
         if (fileOperationError.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
             message = ( localize(
-                15225,
+                16152,
                 "Failed to save '{0}': The content of the file is newer. Do you want to overwrite the file with your changes?",
                 this.name
             ));
             primaryActions.push(toAction({
                 id: "fileWorkingCopy.overwrite",
-                label: ( localize(15226, "Overwrite")),
+                label: ( localize(16153, "Overwrite")),
                 run: () => this.save({
                     ...options,
                     ignoreModifiedSince: true,
@@ -623,7 +623,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }));
             primaryActions.push(toAction({
                 id: "fileWorkingCopy.revert",
-                label: ( localize(15227, "Revert")),
+                label: ( localize(16154, "Revert")),
                 run: () => this.revert()
             }));
         }
@@ -638,7 +638,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             if (canSaveElevated && (isPermissionDenied || triedToUnlock)) {
                 primaryActions.push(toAction({
                     id: "fileWorkingCopy.saveElevated",
-                    label: triedToUnlock ? isWindows ? ( localize(15228, "Overwrite as Admin...")) : ( localize(15229, "Overwrite as Sudo...")) : isWindows ? ( localize(15230, "Retry as Admin...")) : ( localize(15231, "Retry as Sudo...")),
+                    label: triedToUnlock ? isWindows ? ( localize(16155, "Overwrite as Admin...")) : ( localize(16156, "Overwrite as Sudo...")) : isWindows ? ( localize(16157, "Retry as Admin...")) : ( localize(16158, "Retry as Sudo...")),
                     run: () => {
                         this.save({
                             ...options,
@@ -652,7 +652,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             else if (isWriteLocked) {
                 primaryActions.push(toAction({
                     id: "fileWorkingCopy.unlock",
-                    label: ( localize(15226, "Overwrite")),
+                    label: ( localize(16153, "Overwrite")),
                     run: () => this.save({
                         ...options,
                         writeUnlock: true,
@@ -663,7 +663,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             else {
                 primaryActions.push(toAction({
                     id: "fileWorkingCopy.retry",
-                    label: ( localize(15232, "Retry")),
+                    label: ( localize(16159, "Retry")),
                     run: () => this.save({
                         ...options,
                         reason: SaveReason.EXPLICIT
@@ -672,7 +672,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }
             primaryActions.push(toAction({
                 id: "fileWorkingCopy.saveAs",
-                label: ( localize(15233, "Save As...")),
+                label: ( localize(16160, "Save As...")),
                 run: async () => {
                     const editor = this.workingCopyEditorService.findEditor(this);
                     if (editor) {
@@ -688,40 +688,40 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }));
             primaryActions.push(toAction({
                 id: "fileWorkingCopy.revert",
-                label: ( localize(15227, "Revert")),
+                label: ( localize(16154, "Revert")),
                 run: () => this.revert()
             }));
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
                     message = isWindows ? ( localize(
-                        15234,
+                        16161,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
                         this.name
                     )) : ( localize(
-                        15235,
+                        16162,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
                         this.name
                     ));
                 } else {
                     message = ( localize(
-                        15236,
+                        16163,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
                         this.name
                     ));
                 }
             } else if (canSaveElevated && isPermissionDenied) {
                 message = isWindows ? ( localize(
-                    15237,
+                    16164,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
                     this.name
                 )) : ( localize(
-                    15238,
+                    16165,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
                     this.name
                 ));
             } else {
                 message = ( localize(
-                    15239,
+                    16166,
                     "Failed to save '{0}': {1}",
                     this.name,
                     toErrorMessage(error, false)

package/vscode/src/vs/workbench/services/workspaces/common/workspaceEditing.d.ts

@@ -0,0 +1,12 @@
+import { IAnyWorkspaceIdentifier } from "../../../../platform/workspace/common/workspace.js";
+/**
+ * An event that is fired after entering a workspace. Clients can join the entering
+ * by providing a promise from the join method. This allows for long running operations
+ * to complete (e.g. to migrate data into the new workspace) before the workspace
+ * is fully entered.
+ */
+export interface IDidEnterWorkspaceEvent {
+    readonly oldWorkspace: IAnyWorkspaceIdentifier;
+    readonly newWorkspace: IAnyWorkspaceIdentifier;
+    join(promise: Promise<void>): void;
+}

package/vscode/src/vs/workbench/services/workspaces/common/workspaceEditing.service.d.ts

@@ -1,10 +1,17 @@
+import { Event } from "../../../../base/common/event.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IWorkspaceIdentifier } from "../../../../platform/workspace/common/workspace.js";
 import { IWorkspaceFolderCreationData } from "../../../../platform/workspaces/common/workspaces.js";
+import { IDidEnterWorkspaceEvent } from "./workspaceEditing.js";
 export declare const IWorkspaceEditingService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkspaceEditingService>;
 export interface IWorkspaceEditingService {
     readonly _serviceBrand: undefined;
     /**
+    * Fired after the workspace is entered. Allows listeners to join the
+    * entering with a promise to migrate data into this new workspace.
+    */
+    readonly onDidEnterWorkspace: Event<IDidEnterWorkspaceEvent>;
+    /**
     * Add folders to the existing workspace.
     * When `donotNotifyError` is `true`, error will be bubbled up otherwise, the service handles the error with proper message and action
     */

package/vscode-dts/vscode.d.ts

@@ -6477,6 +6477,21 @@ declare module 'vscode' {
 	 */
 	export type CharacterPair = [string, string];
 
+	/**
+	 * Configuration for line comments.
+	 */
+	export interface LineCommentRule {
+		/**
+		 * The line comment token, like `//`
+		 */
+		comment: string;
+		/**
+		 * Whether the comment token should not be indented and placed at the first column.
+		 * Defaults to false.
+		 */
+		noIndent?: boolean;
+	}
+
 	/**
 	 * Describes how comments for a language work.
 	 */
@@ -6485,7 +6500,7 @@ declare module 'vscode' {
 		/**
 		 * The line comment token, like `// this is a comment`
 		 */
-		lineComment?: string;
+		lineComment?: string | LineCommentRule;
 
 		/**
 		 * The block comment character pair, like `/* block comment */`
@@ -10781,6 +10796,16 @@ declare module 'vscode' {
 		 */
 		export const isNewAppInstall: boolean;
 
+		/**
+		 * Indicates whether the application is running in portable mode.
+		 *
+		 * Portable mode is enabled when the application is run from a folder that contains
+		 * a `data` directory, allowing for self-contained installations.
+		 *
+		 * Learn more about [Portable Mode](https://code.visualstudio.com/docs/editor/portable).
+		 */
+		export const isAppPortable: boolean;
+
 		/**
 		 * Indicates whether the users has telemetry enabled.
 		 * Can be observed to determine if the extension should send telemetry.