@codingame/monaco-vscode-api 24.3.0 → 25.0.1

package/vscode/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css

@@ -431,16 +431,17 @@
 	display: flex;
 }
 
-.extension-editor > .body > .content > .details > .readme-container {
+.extension-editor > .body > .content > .details > .content-container {
 	margin: 0px auto;
 	max-width: 75%;
 	height: 100%;
 	flex: 1;
 }
 
-.extension-editor > .body > .content > .details.narrow > .readme-container {
+.extension-editor > .body > .content > .details.narrow > .content-container {
 	margin: inherit;
 	max-width: inherit;
+	min-width: 0;
 }
 
 .extension-editor > .body > .content > .details > .additional-details-container {
@@ -526,67 +527,67 @@
 	padding: 0px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme {
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme {
 	height: 100%;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack {
-	height: 224px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack {
+	height: 200px;
 	padding-left: 20px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.one-row > .extension-pack {
-	height: 142px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.one-row > .extension-pack {
+	height: 118px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.two-rows > .extension-pack {
-	height: 224px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.two-rows > .extension-pack {
+	height: 200px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.three-rows > .extension-pack {
-	height: 306px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.three-rows > .extension-pack {
+	height: 282px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.more-rows > .extension-pack {
-	height: 326px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.more-rows > .extension-pack {
+	height: 302px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.one-row > .readme-content {
-	height: calc(100% - 142px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.one-row > .readme-content {
+	height: calc(100% - 118px);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.two-rows > .readme-content {
-	height: calc(100% - 224px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.two-rows > .readme-content {
+	height: calc(100% - 200px);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.three-rows > .readme-content {
-	height: calc(100% - 306px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.three-rows > .readme-content {
+	height: calc(100% - 282px);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.more-rows > .readme-content {
-	height: calc(100% - 326px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.more-rows > .readme-content {
+	height: calc(100% - 302px);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .header,
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .footer {
-	margin-bottom: 10px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack > .header {
 	margin-right: 30px;
 	font-weight: bold;
 	font-size: 120%;
-	border-bottom: 1px solid rgba(128, 128, 128, 0.22);
-	padding: 4px 6px;
+	padding: 6px;
 	line-height: 22px;
+	min-width: 150px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .extension-pack-content {
-	height: calc(100% - 60px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack > .extension-pack-content {
+	height: calc(100% - 34px);
+	border-top: 1px solid rgba(128, 128, 128, 0.22);
+	border-bottom: 1px solid rgba(128, 128, 128, 0.22);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .extension-pack-content > .monaco-scrollable-element {
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack > .extension-pack-content > .monaco-scrollable-element {
 	height: 100%;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .extension-pack-content > .monaco-scrollable-element > .subcontent {
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack > .extension-pack-content > .monaco-scrollable-element > .subcontent {
 	height: 100%;
 	overflow-y: scroll;
 	box-sizing: border-box;
@@ -757,7 +758,7 @@
 
 .extension-editor .extensions-grid-view > .extension-container {
 	width: 350px;
-	margin: 0 10px 20px 0;
+	margin: 5px 10px;
 }
 
 .extension-editor .extensions-grid-view .extension-list-item {

package/vscode/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css

@@ -87,3 +87,18 @@
 	border-top-color: var(--vscode-extensionButton-prominentBackground);
 	color: var(--vscode-extensionButton-prominentForeground);
 }
+
+.hc-black .extension-bookmark .recommendation,
+.hc-light .extension-bookmark .recommendation,
+.hc-black .extension-bookmark .pre-release,
+.hc-light .extension-bookmark .pre-release {
+	border-top-color: var(--vscode-contrastBorder);
+	color: var(--vscode-editor-background);
+}
+
+.hc-black .extension-bookmark .recommendation .codicon,
+.hc-light .extension-bookmark .recommendation .codicon,
+.hc-black .extension-bookmark .pre-release .codicon,
+.hc-light .extension-bookmark .pre-release .codicon {
+	color: var(--vscode-editor-background);
+}

package/vscode/src/vs/workbench/contrib/extensions/browser/webRecommendations.js

@@ -22,7 +22,7 @@ let WebRecommendations = class WebRecommendations extends ExtensionRecommendatio
                 reason: {
                     reasonId: ExtensionRecommendationReason.Application,
                     reasonText: ( localize(
-                        7833,
+                        7863,
                         "This extension is recommended for {0} for the Web",
                         this.productService.nameLong
                     ))

package/vscode/src/vs/workbench/contrib/extensions/browser/workspaceRecommendations.js

@@ -102,7 +102,7 @@ let WorkspaceRecommendations = class WorkspaceRecommendations extends ExtensionR
                             extension: extensionId,
                             reason: {
                                 reasonId: ExtensionRecommendationReason.Workspace,
-                                reasonText: ( localize(7834, "This extension is recommended by users of the current workspace."))
+                                reasonText: ( localize(7864, "This extension is recommended by users of the current workspace."))
                             }
                         });
                     }
@@ -114,7 +114,7 @@ let WorkspaceRecommendations = class WorkspaceRecommendations extends ExtensionR
                 extension,
                 reason: {
                     reasonId: ExtensionRecommendationReason.Workspace,
-                    reasonText: ( localize(7834, "This extension is recommended by users of the current workspace."))
+                    reasonText: ( localize(7864, "This extension is recommended by users of the current workspace."))
                 }
             });
         }

package/vscode/src/vs/workbench/contrib/extensions/common/extensionQuery.js

@@ -1,6 +1,8 @@
 
 import { FilterType, SortBy } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions } from '../../../services/extensionManagement/common/extensionFeatures.js';
 
 class Query {
     constructor(value, sortBy) {
@@ -9,7 +11,7 @@ class Query {
         this.value = value.trim();
     }
     static suggestions(query, galleryManifest) {
-        const commands = ['installed', 'updates', 'enabled', 'disabled', 'builtin'];
+        const commands = ['installed', 'updates', 'enabled', 'disabled', 'builtin', 'contribute'];
         if (galleryManifest?.capabilities.extensionQuery?.filtering?.some(c => c.name === FilterType.Featured)) {
             commands.push('featured');
         }
@@ -27,12 +29,17 @@ class Query {
             sortCommands.push('rating');
         }
         sortCommands.push('name', 'publishedDate', 'updateDate');
+        const contributeCommands = [];
+        for (const feature of ( Registry.as(Extensions.ExtensionFeaturesRegistry)).getExtensionFeatures()) {
+            contributeCommands.push(feature.id);
+        }
         const subcommands = {
             'sort': sortCommands,
             'category': isCategoriesEnabled ? ( EXTENSION_CATEGORIES.map(c => `"${c.toLowerCase()}"`)) : [],
             'tag': [''],
             'ext': [''],
-            'id': ['']
+            'id': [''],
+            'contribute': contributeCommands
         };
         const queryContains = (substr) => query.indexOf(substr) > -1;
         const hasSort = ( subcommands.sort.some(subcommand => queryContains(`@sort:${subcommand}`)));

package/vscode/src/vs/workbench/contrib/extensions/common/extensions.js

@@ -9,7 +9,7 @@ import { ExtensionGalleryManifestStatus } from '../../../../platform/extensionMa
 import { IExtensionsWorkbenchService } from './extensions.service.js';
 
 const VIEWLET_ID = 'workbench.view.extensions';
-const EXTENSIONS_CATEGORY = ( localize2(7835, "Extensions"));
+const EXTENSIONS_CATEGORY = ( localize2(7865, "Extensions"));
 var ExtensionState;
 (function (ExtensionState) {
     ExtensionState[ExtensionState["Installing"] = 0] = "Installing";

package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js

@@ -8,31 +8,31 @@ const ExtensionsConfigurationSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     type: 'object',
-    title: ( localize(7836, "Extensions")),
+    title: ( localize(7866, "Extensions")),
     additionalProperties: false,
     properties: {
         recommendations: {
             type: 'array',
             description: ( localize(
-                7837,
+                7867,
                 "List of extensions which should be recommended for users of this workspace. The identifier of an extension is always '${publisher}.${name}'. For example: 'vscode.csharp'."
             )),
             items: {
                 type: 'string',
                 pattern: EXTENSION_IDENTIFIER_PATTERN,
-                errorMessage: ( localize(7838, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
+                errorMessage: ( localize(7868, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
             },
         },
         unwantedRecommendations: {
             type: 'array',
             description: ( localize(
-                7839,
+                7869,
                 "List of extensions recommended by VS Code that should not be recommended for users of this workspace. The identifier of an extension is always '${publisher}.${name}'. For example: 'vscode.csharp'."
             )),
             items: {
                 type: 'string',
                 pattern: EXTENSION_IDENTIFIER_PATTERN,
-                errorMessage: ( localize(7838, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
+                errorMessage: ( localize(7868, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
             },
         },
     }

package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js

@@ -9,7 +9,7 @@ import { join } from '../../../../base/common/path.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const ExtensionEditorIcon = registerIcon('extensions-editor-label-icon', Codicon.extensions, ( localize(7840, 'Icon of the extensions editor label.')));
+const ExtensionEditorIcon = registerIcon('extensions-editor-label-icon', Codicon.extensions, ( localize(7870, 'Icon of the extensions editor label.')));
 class ExtensionsInput extends EditorInput {
     static { this.ID = 'workbench.extensions.input2'; }
     get typeId() {
@@ -30,7 +30,7 @@ class ExtensionsInput extends EditorInput {
     }
     get extension() { return this._extension; }
     getName() {
-        return localize(7841, "Extension: {0}", this._extension.displayName);
+        return localize(7871, "Extension: {0}", this._extension.displayName);
     }
     getIcon() {
         return ExtensionEditorIcon;

package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js

@@ -49,14 +49,14 @@ let KeymapExtensions = class KeymapExtensions extends Disposable {
             }
         };
         this.notificationService.prompt(Severity$1.Info, ( localize(
-            7842,
+            7872,
             "Disable other keymaps ({0}) to avoid conflicts between keybindings?",
             ( oldKeymaps.map(k => `'${k.local.manifest.displayName}'`)).join(', ')
         )), [{
-                label: ( localize(7843, "Yes")),
+                label: ( localize(7873, "Yes")),
                 run: () => onPrompt(true)
             }, {
-                label: ( localize(7844, "No")),
+                label: ( localize(7874, "No")),
                 run: () => onPrompt(false)
             }]);
     }

package/vscode/src/vs/workbench/contrib/extensions/common/runtimeExtensionsInput.js

@@ -6,7 +6,7 @@ import { EditorInput } from '../../../common/editor/editorInput.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const RuntimeExtensionsEditorIcon = registerIcon('runtime-extensions-editor-label-icon', Codicon.extensions, ( localize(7846, 'Icon of the runtime extensions editor label.')));
+const RuntimeExtensionsEditorIcon = registerIcon('runtime-extensions-editor-label-icon', Codicon.extensions, ( localize(7876, 'Icon of the runtime extensions editor label.')));
 class RuntimeExtensionsInput extends EditorInput {
     constructor() {
         super(...arguments);
@@ -29,7 +29,7 @@ class RuntimeExtensionsInput extends EditorInput {
         return RuntimeExtensionsInput._instance;
     }
     getName() {
-        return localize(7847, "Running Extensions");
+        return localize(7877, "Running Extensions");
     }
     getIcon() {
         return RuntimeExtensionsEditorIcon;

package/vscode/src/vs/workbench/contrib/extensions/common/searchExtensionsTool.d.ts

@@ -1,5 +1,5 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolProgress } from "../../chat/common/languageModelToolsService.js";
+import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolProgress } from "../../chat/common/tools/languageModelToolsService.js";
 import { IExtensionsWorkbenchService } from "./extensions.service.js";
 export declare const SearchExtensionsToolId = "vscode_searchExtensions_internal";
 export declare const SearchExtensionsToolData: IToolData;

package/vscode/src/vs/workbench/contrib/extensions/common/searchExtensionsTool.js

@@ -5,7 +5,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
 import { SortBy } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
-import { ToolDataSource } from '../../chat/common/languageModelToolsService.js';
+import { ToolDataSource } from '../../chat/common/tools/languageModelToolsService.js';
 import { ExtensionState } from './extensions.js';
 import { IExtensionsWorkbenchService } from './extensions.service.js';
 
@@ -15,9 +15,9 @@ const SearchExtensionsToolData = {
     toolReferenceName: 'extensions',
     legacyToolReferenceFullNames: ['extensions'],
     icon: ThemeIcon.fromId(Codicon.extensions.id),
-    displayName: ( localize(7848, 'Search Extensions')),
+    displayName: ( localize(7878, 'Search Extensions')),
     modelDescription: 'This is a tool for browsing Visual Studio Code Extensions Marketplace. It allows the model to search for extensions and retrieve detailed information about them. The model should use this tool whenever it needs to discover extensions or resolve information about known ones. To use the tool, the model has to provide the category of the extensions, relevant search keywords, or known extension IDs. Note that search results may include false positives, so reviewing and filtering is recommended.',
-    userDescription: ( localize(7849, 'Search for VS Code extensions')),
+    userDescription: ( localize(7879, 'Search for VS Code extensions')),
     source: ToolDataSource.Internal,
     inputSchema: {
         type: 'object',
@@ -54,7 +54,7 @@ let SearchExtensionsTool = class SearchExtensionsTool {
             return {
                 content: [{
                         kind: 'text',
-                        value: ( localize(7850, 'Please provide a category or keywords or ids to search for.'))
+                        value: ( localize(7880, 'Please provide a category or keywords or ids to search for.'))
                     }]
             };
         }

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js

@@ -26,7 +26,7 @@ const externalUriOpenersConfigurationNode = {
     properties: {
         [externalUriOpenersSettingId]: {
             type: 'object',
-            markdownDescription: ( localize(7854, "Configure the opener to use for external URIs (http, https).")),
+            markdownDescription: ( localize(7884, "Configure the opener to use for external URIs (http, https).")),
             defaultSnippets: [{
                     body: {
                         'example.com': '$1'
@@ -37,7 +37,7 @@ const externalUriOpenersConfigurationNode = {
                     {
                         type: 'string',
                         markdownDescription: ( localize(
-                            7855,
+                            7885,
                             "Map URI pattern to an opener id.\nExample patterns: \n{0}",
                             exampleUriPatterns
                         )),
@@ -45,12 +45,12 @@ const externalUriOpenersConfigurationNode = {
                     {
                         type: 'string',
                         markdownDescription: ( localize(
-                            7855,
+                            7885,
                             "Map URI pattern to an opener id.\nExample patterns: \n{0}",
                             exampleUriPatterns
                         )),
                         enum: [defaultExternalUriOpenerId],
-                        enumDescriptions: [( localize(7856, "Open using VS Code's standard opener."))],
+                        enumDescriptions: [( localize(7886, "Open using VS Code's standard opener."))],
                     },
                     externalUriOpenerIdSchemaAddition
                 ]

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js

@@ -12,7 +12,7 @@ import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { defaultExternalUriOpenerId, externalUriOpenersSettingId } from './configuration.js';
-import { testUrlMatchesGlob } from '../../url/common/urlGlob.js';
+import { testUrlMatchesGlob } from '../../../../platform/url/common/urlGlob.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 
 let ExternalUriOpenerService = class ExternalUriOpenerService extends Disposable {
@@ -128,15 +128,15 @@ let ExternalUriOpenerService = class ExternalUriOpenerService extends Disposable
         }));
         items.push({
             label: isWeb
-                ? ( localize(7857, 'Open in new browser window'))
-                : ( localize(7858, 'Open in default browser')),
+                ? ( localize(7887, 'Open in new browser window'))
+                : ( localize(7888, 'Open in default browser')),
             opener: undefined
         }, { type: 'separator' }, {
-            label: ( localize(7859, "Configure default opener...")),
+            label: ( localize(7889, "Configure default opener...")),
             opener: 'configureDefault'
         });
         const picked = await this.quickInputService.pick(items, {
-            placeHolder: ( localize(7860, "How would you like to open: {0}", (targetUri.toString())))
+            placeHolder: ( localize(7890, "How would you like to open: {0}", (targetUri.toString())))
         });
         if (!picked) {
             return true;

package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js

@@ -61,7 +61,7 @@ let BinaryFileEditor = class BinaryFileEditor extends BaseBinaryResourceEditor {
         }
     }
     getTitle() {
-        return this.input ? this.input.getName() : ( localize(7861, "Binary File Viewer"));
+        return this.input ? this.input.getName() : ( localize(7891, "Binary File Viewer"));
     }
 };
 BinaryFileEditor = BinaryFileEditor_1 = ( __decorate([

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js

@@ -67,7 +67,7 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(7862, "Text File Editor");
+        return localize(7892, "Text File Editor");
     }
     get input() {
         return this._input;
@@ -115,20 +115,20 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
         if (error.fileOperationResult === FileOperationResult.FILE_IS_DIRECTORY) {
             const actions = [];
             actions.push(toAction({
-                id: 'workbench.files.action.openFolder', label: ( localize(7863, "Open Folder")), run: async () => {
+                id: 'workbench.files.action.openFolder', label: ( localize(7893, "Open Folder")), run: async () => {
                     return this.hostService.openWindow([{ folderUri: input.resource }], { forceNewWindow: true });
                 }
             }));
             if (this.contextService.isInsideWorkspace(input.preferredResource)) {
                 actions.push(toAction({
-                    id: 'workbench.files.action.reveal', label: ( localize(7864, "Reveal Folder")), run: async () => {
+                    id: 'workbench.files.action.reveal', label: ( localize(7894, "Reveal Folder")), run: async () => {
                         await this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
                         return this.explorerService.select(input.preferredResource, true);
                     }
                 }));
             }
             throw createEditorOpenError(( localize(
-                7865,
+                7895,
                 "The file is not displayed in the text editor because it is a directory."
             )), actions, { forceMessage: true });
         }
@@ -136,14 +136,14 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
             let message;
             if (error instanceof TooLargeFileOperationError) {
                 message = ( localize(
-                    7866,
+                    7896,
                     "The file is not displayed in the text editor because it is very large ({0}).",
                     ByteSize.formatSize(error.size)
                 ));
             }
             else {
                 message = ( localize(
-                    7867,
+                    7897,
                     "The file is not displayed in the text editor because it is very large."
                 ));
             }
@@ -152,9 +152,9 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
         if (error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND &&
             !this.filesConfigurationService.isReadonly(input.preferredResource) &&
             (await this.pathService.hasValidBasename(input.preferredResource))) {
-            const fileNotFoundError = createEditorOpenError(( new FileOperationError(( localize(7868, "The editor could not be opened because the file was not found.")), FileOperationResult.FILE_NOT_FOUND)), [
+            const fileNotFoundError = createEditorOpenError(( new FileOperationError(( localize(7898, "The editor could not be opened because the file was not found.")), FileOperationResult.FILE_NOT_FOUND)), [
                 toAction({
-                    id: 'workbench.files.action.createMissingFile', label: ( localize(7869, "Create File")), run: async () => {
+                    id: 'workbench.files.action.createMissingFile', label: ( localize(7899, "Create File")), run: async () => {
                         await this.textFileService.create([{ resource: input.preferredResource }]);
                         return this.editorService.openEditor({
                             resource: input.preferredResource,

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js

@@ -36,7 +36,7 @@ const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext';
 const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution';
 const LEARN_MORE_DIRTY_WRITE_IGNORE_KEY = 'learnMoreDirtyWriteError';
 const conflictEditorHelp = ( localize(
-    7870,
+    7900,
     "Use the actions in the editor tool bar to either undo your changes or overwrite the content of the file with your changes."
 ));
 let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable {
@@ -99,7 +99,7 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             }
             else {
                 message = ( localize(
-                    7871,
+                    7901,
                     "Failed to save '{0}': The content of the file is newer. Please compare your version with the file contents or overwrite the content of the file with your changes.",
                     basename(resource)
                 ));
@@ -127,18 +127,18 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
                     message = isWindows ? ( localize(
-                        7872,
+                        7902,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
                         basename(resource)
                     )) : ( localize(
-                        7873,
+                        7903,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
                         basename(resource)
                     ));
                 }
                 else {
                     message = ( localize(
-                        7874,
+                        7904,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
                         basename(resource)
                     ));
@@ -146,18 +146,18 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             }
             else if (canSaveElevated && isPermissionDenied) {
                 message = isWindows ? ( localize(
-                    7875,
+                    7905,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
                     basename(resource)
                 )) : ( localize(
-                    7876,
+                    7906,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
                     basename(resource)
                 ));
             }
             else {
                 message = ( localize(
-                    7877,
+                    7907,
                     "Failed to save '{0}': {1}",
                     basename(resource),
                     toErrorMessage(error, false)
@@ -197,7 +197,7 @@ function clearPendingResolveSaveConflictMessages() {
 }
 let ResolveConflictLearnMoreAction = class ResolveConflictLearnMoreAction extends Action {
     constructor(openerService) {
-        super('workbench.files.action.resolveConflictLearnMore', ( localize(7878, "Learn More")));
+        super('workbench.files.action.resolveConflictLearnMore', ( localize(7908, "Learn More")));
         this.openerService = openerService;
     }
     async run() {
@@ -209,7 +209,7 @@ ResolveConflictLearnMoreAction = ( __decorate([
 ], ResolveConflictLearnMoreAction));
 let DoNotShowResolveConflictLearnMoreAction = class DoNotShowResolveConflictLearnMoreAction extends Action {
     constructor(storageService) {
-        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', ( localize(7879, "Don't Show Again")));
+        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', ( localize(7909, "Don't Show Again")));
         this.storageService = storageService;
     }
     async run(notification) {
@@ -222,7 +222,7 @@ DoNotShowResolveConflictLearnMoreAction = ( __decorate([
 ], DoNotShowResolveConflictLearnMoreAction));
 let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
     constructor(model, editorService, notificationService, instantiationService, productService) {
-        super('workbench.files.action.resolveConflict', ( localize(7880, "Compare")));
+        super('workbench.files.action.resolveConflict', ( localize(7910, "Compare")));
         this.model = model;
         this.editorService = editorService;
         this.notificationService = notificationService;
@@ -234,7 +234,7 @@ let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
             const resource = this.model.resource;
             const name = basename(resource);
             const editorLabel = ( localize(
-                7881,
+                7911,
                 "{0} (in file) ↔ {1} (in {2}) - Resolve save conflict",
                 name,
                 name,
@@ -262,7 +262,7 @@ ResolveSaveConflictAction = ( __decorate([
 ], ResolveSaveConflictAction));
 class SaveModelElevatedAction extends Action {
     constructor(model, options, triedToUnlock) {
-        super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? ( localize(7882, "Overwrite as Admin...")) : ( localize(7883, "Overwrite as Sudo...")) : isWindows ? ( localize(7884, "Retry as Admin...")) : ( localize(7885, "Retry as Sudo...")));
+        super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? ( localize(7912, "Overwrite as Admin...")) : ( localize(7913, "Overwrite as Sudo...")) : isWindows ? ( localize(7914, "Retry as Admin...")) : ( localize(7915, "Retry as Sudo...")));
         this.model = model;
         this.options = options;
         this.triedToUnlock = triedToUnlock;
@@ -280,7 +280,7 @@ class SaveModelElevatedAction extends Action {
 }
 class RetrySaveModelAction extends Action {
     constructor(model, options) {
-        super('workbench.files.action.saveModel', ( localize(7886, "Retry")));
+        super('workbench.files.action.saveModel', ( localize(7916, "Retry")));
         this.model = model;
         this.options = options;
     }
@@ -292,7 +292,7 @@ class RetrySaveModelAction extends Action {
 }
 class RevertModelAction extends Action {
     constructor(model) {
-        super('workbench.files.action.revertModel', ( localize(7887, "Revert")));
+        super('workbench.files.action.revertModel', ( localize(7917, "Revert")));
         this.model = model;
     }
     async run() {
@@ -335,7 +335,7 @@ SaveModelAsAction = ( __decorate([
 ], SaveModelAsAction));
 class UnlockModelAction extends Action {
     constructor(model, options) {
-        super('workbench.files.action.unlock', ( localize(7888, "Overwrite")));
+        super('workbench.files.action.unlock', ( localize(7918, "Overwrite")));
         this.model = model;
         this.options = options;
     }
@@ -347,7 +347,7 @@ class UnlockModelAction extends Action {
 }
 class SaveModelIgnoreModifiedSinceAction extends Action {
     constructor(model, options) {
-        super('workbench.files.action.saveIgnoreModifiedSince', ( localize(7888, "Overwrite")));
+        super('workbench.files.action.saveIgnoreModifiedSince', ( localize(7918, "Overwrite")));
         this.model = model;
         this.options = options;
     }
@@ -359,7 +359,7 @@ class SaveModelIgnoreModifiedSinceAction extends Action {
 }
 let ConfigureSaveConflictAction = class ConfigureSaveConflictAction extends Action {
     constructor(preferencesService) {
-        super('workbench.files.action.configureSaveConflict', ( localize(7889, "Configure")));
+        super('workbench.files.action.configureSaveConflict', ( localize(7919, "Configure")));
         this.preferencesService = preferencesService;
     }
     async run() {