@codingame/monaco-vscode-api 24.3.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/mcp/common/mcpConfiguration.js

@@ -24,16 +24,16 @@ const allDiscoverySources = ( Object.keys({
     [DiscoverySource.CursorWorkspace]: true,
 }));
 const discoverySourceLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(8964, "Claude Desktop")),
-    [DiscoverySource.Windsurf]: ( localize(8965, "Windsurf")),
-    [DiscoverySource.CursorGlobal]: ( localize(8966, "Cursor (Global)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(8967, "Cursor (Workspace)")),
+    [DiscoverySource.ClaudeDesktop]: ( localize(8989, "Claude Desktop")),
+    [DiscoverySource.Windsurf]: ( localize(8990, "Windsurf")),
+    [DiscoverySource.CursorGlobal]: ( localize(8991, "Cursor (Global)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(8992, "Cursor (Workspace)")),
 };
 const discoverySourceSettingsLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(8968, "Claude Desktop configuration (`claude_desktop_config.json`)")),
-    [DiscoverySource.Windsurf]: ( localize(8969, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
-    [DiscoverySource.CursorGlobal]: ( localize(8970, "Cursor global configuration (`~/.cursor/mcp.json`)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(8971, "Cursor workspace configuration (`.cursor/mcp.json`)")),
+    [DiscoverySource.ClaudeDesktop]: ( localize(8993, "Claude Desktop configuration (`claude_desktop_config.json`)")),
+    [DiscoverySource.Windsurf]: ( localize(8994, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
+    [DiscoverySource.CursorGlobal]: ( localize(8995, "Cursor global configuration (`~/.cursor/mcp.json`)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(8996, "Cursor workspace configuration (`.cursor/mcp.json`)")),
 };
 const mcpConfigurationSection = 'mcp';
 const mcpDiscoverySection = 'chat.mcp.discovery.enabled';
@@ -55,14 +55,14 @@ const mcpDevModeProps = (stdio) => ({
     dev: {
         type: 'object',
         markdownDescription: ( localize(
-            8972,
+            8997,
             'Enabled development mode for the server. When present, the server will be started eagerly and output will be included in its output. Properties inside the `dev` object can configure additional behavior.'
         )),
         examples: [{ watch: 'src/**/*.ts', debug: { type: 'node' } }],
         properties: {
             watch: {
                 description: ( localize(
-                    8973,
+                    8998,
                     'A glob pattern or list of glob patterns relative to the workspace folder to watch. The MCP server will be restarted when these files change.'
                 )),
                 examples: ['src/**/*.ts'],
@@ -71,7 +71,7 @@ const mcpDevModeProps = (stdio) => ({
             ...(stdio && {
                 debug: {
                     markdownDescription: ( localize(
-                        8974,
+                        8999,
                         'If set, debugs the MCP server using the given runtime as it\'s started.'
                     )),
                     oneOf: [
@@ -82,7 +82,7 @@ const mcpDevModeProps = (stdio) => ({
                                 type: {
                                     type: 'string',
                                     enum: ['node'],
-                                    description: ( localize(8975, "Debug the MCP server using Node.js."))
+                                    description: ( localize(9000, "Debug the MCP server using Node.js."))
                                 }
                             },
                             additionalProperties: false
@@ -94,11 +94,11 @@ const mcpDevModeProps = (stdio) => ({
                                 type: {
                                     type: 'string',
                                     enum: ['debugpy'],
-                                    description: ( localize(8976, "Debug the MCP server using Python and debugpy."))
+                                    description: ( localize(9001, "Debug the MCP server using Python and debugpy."))
                                 },
                                 debugpyPath: {
                                     type: 'string',
-                                    description: ( localize(8977, "Path to the debugpy executable."))
+                                    description: ( localize(9002, "Path to the debugpy executable."))
                                 },
                             },
                             additionalProperties: false
@@ -117,34 +117,34 @@ const mcpStdioServerSchema = {
         type: {
             type: 'string',
             enum: ['stdio'],
-            description: ( localize(8978, "The type of the server."))
+            description: ( localize(9003, "The type of the server."))
         },
         command: {
             type: 'string',
-            description: ( localize(8979, "The command to run the server."))
+            description: ( localize(9004, "The command to run the server."))
         },
         cwd: {
             type: 'string',
             description: ( localize(
-                8980,
+                9005,
                 "The working directory for the server command. Defaults to the workspace folder when run in a workspace."
             )),
             examples: ['${workspaceFolder}'],
         },
         args: {
             type: 'array',
-            description: ( localize(8981, "Arguments passed to the server.")),
+            description: ( localize(9006, "Arguments passed to the server.")),
             items: {
                 type: 'string'
             },
         },
         envFile: {
             type: 'string',
-            description: ( localize(8982, "Path to a file containing environment variables for the server.")),
+            description: ( localize(9007, "Path to a file containing environment variables for the server.")),
             examples: ['${workspaceFolder}/.env'],
         },
         env: {
-            description: ( localize(8983, "Environment variables passed to the server.")),
+            description: ( localize(9008, "Environment variables passed to the server.")),
             additionalProperties: {
                 anyOf: [
                     { type: 'null' },
@@ -159,7 +159,7 @@ const mcpStdioServerSchema = {
 const mcpServerSchema = {
     id: mcpSchemaId,
     type: 'object',
-    title: ( localize(8984, "Model Context Protocol Servers")),
+    title: ( localize(9009, "Model Context Protocol Servers")),
     allowTrailingCommas: true,
     allowComments: true,
     additionalProperties: false,
@@ -180,18 +180,18 @@ const mcpServerSchema = {
                             type: {
                                 type: 'string',
                                 enum: ['http', 'sse'],
-                                description: ( localize(8978, "The type of the server."))
+                                description: ( localize(9003, "The type of the server."))
                             },
                             url: {
                                 type: 'string',
                                 format: 'uri',
                                 pattern: '^https?:\\/\\/.+',
-                                patternErrorMessage: ( localize(8985, "The URL must start with 'http://' or 'https://'.")),
-                                description: ( localize(8986, "The URL of the Streamable HTTP or SSE endpoint."))
+                                patternErrorMessage: ( localize(9010, "The URL must start with 'http://' or 'https://'.")),
+                                description: ( localize(9011, "The URL of the Streamable HTTP or SSE endpoint."))
                             },
                             headers: {
                                 type: 'object',
-                                description: ( localize(8987, "Additional headers sent to the server.")),
+                                description: ( localize(9012, "Additional headers sent to the server.")),
                                 additionalProperties: { type: 'string' },
                             },
                             ...mcpDevModeProps(false),
@@ -214,7 +214,7 @@ const mcpContributionPoint = {
     },
     jsonSchema: {
         description: ( localize(
-            8988,
+            9013,
             'Contributes Model Context Protocol servers. Users of this should also use `vscode.lm.registerMcpServerDefinitionProvider`.'
         )),
         type: 'array',
@@ -225,15 +225,15 @@ const mcpContributionPoint = {
             defaultSnippets: [{ body: { id: '', label: '' } }],
             properties: {
                 id: {
-                    description: ( localize(8989, "Unique ID for the collection.")),
+                    description: ( localize(9014, "Unique ID for the collection.")),
                     type: 'string'
                 },
                 label: {
-                    description: ( localize(8990, "Display name for the collection.")),
+                    description: ( localize(9015, "Display name for the collection.")),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(8991, "Condition which must be true to enable this collection.")),
+                    description: ( localize(9016, "Condition which must be true to enable this collection.")),
                     type: 'string'
                 }
             }
@@ -250,7 +250,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
     }
     render(manifest) {
         const mcpServerDefinitionProviders = manifest.contributes?.mcpServerDefinitionProviders ?? [];
-        const headers = [( localize(8992, "ID")), ( localize(8993, "Name"))];
+        const headers = [( localize(9017, "ID")), ( localize(9018, "Name"))];
         const rows = ( mcpServerDefinitionProviders
             .map(mcpServerDefinitionProvider => {
             return [
@@ -269,7 +269,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: mcpConfigurationSection,
-    label: ( localize(8994, "MCP Servers")),
+    label: ( localize(9019, "MCP Servers")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.d.ts

@@ -14,7 +14,7 @@ import { IMcpDevModeConfig, IMcpServerConfiguration } from "../../../../platform
 import { StorageScope } from "../../../../platform/storage/common/storage.js";
 import { IWorkspaceFolder, IWorkspaceFolderData } from "../../../../platform/workspace/common/workspace.js";
 import { IWorkbenchLocalMcpServer } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService";
-import { ToolProgress } from "../../chat/common/languageModelToolsService.js";
+import { ToolProgress } from "../../chat/common/tools/languageModelToolsService.js";
 import { McpServerRequestHandler } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/contrib/mcp/common/mcpServerRequestHandler";
 import { IMcpWorkbenchService } from "./mcpTypes.service.js";
 import { MCP } from "./modelContextProtocol.js";

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.js

@@ -170,13 +170,13 @@ var McpConnectionState;
     McpConnectionState.toString = (s) => {
         switch (s.state) {
             case Kind.Stopped:
-                return localize(9039, 'Stopped');
+                return localize(9064, 'Stopped');
             case Kind.Starting:
-                return localize(9040, 'Starting');
+                return localize(9065, 'Starting');
             case Kind.Running:
-                return localize(9041, 'Running');
+                return localize(9066, 'Running');
             case Kind.Error:
-                return localize(9042, 'Error {0}', s.message);
+                return localize(9067, 'Error {0}', s.message);
             default:
                 assertNever();
         }

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypesUtils.d.ts

@@ -1,6 +1,6 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { IReader } from "../../../../base/common/observable.js";
-import { ToolDataSource } from "../../chat/common/languageModelToolsService.js";
+import { ToolDataSource } from "../../chat/common/tools/languageModelToolsService.js";
 import { IMcpServer, IMcpServerStartOpts } from "./mcpTypes.js";
 import { IMcpService } from "./mcpTypes.service.js";
 import { MCP } from "./modelContextProtocol.js";

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -76,7 +76,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return localize(9088, "Merging: {0}", super.getName());
+        return localize(9113, "Merging: {0}", super.getName());
     }
     async resolve() {
         if (!this._inputModel) {
@@ -164,13 +164,13 @@ MergeEditorInput = MergeEditorInput_1 = ( __decorate([
 function alertFocusedEditor(editor) {
     switch (editor) {
         case 'input1':
-            alert(( localize(9089, "Incoming, Left Input")));
+            alert(( localize(9114, "Incoming, Left Input")));
             break;
         case 'input2':
-            alert(( localize(9090, "Current, Right Input")));
+            alert(( localize(9115, "Current, Right Input")));
             break;
         case 'result':
-            alert(( localize(9091, "Merge Result")));
+            alert(( localize(9116, "Merge Result")));
             break;
     }
 }

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -5,7 +5,7 @@ import { onUnexpectedError, BugIndicatingError } from '../../../../base/common/e
 import { Event } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
-import { basename, isEqual } from '../../../../base/common/resources.js';
+import { basename } from '../../../../base/common/resources.js';
 import Severity$1 from '../../../../base/common/severity.js';
 import { IModelService } from '../../../../editor/common/services/model.service.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.service.js';
@@ -108,12 +108,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const isMany = inputModels.length > 1;
             const message = isMany
                 ? ( localize(
-                9092,
+                9117,
                 'Do you want keep the merge result of {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                9093,
+                9118,
                 'Do you want keep the merge result of {0}?',
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
@@ -121,12 +121,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localize(9094, "&&Save With Conflicts")) :
-                        ( localize(9095, "&&Save")),
+                        ( localize(9119, "&&Save With Conflicts")) :
+                        ( localize(9120, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 },
                 {
-                    label: ( localize(9096, "Do&&n't Save")),
+                    label: ( localize(9121, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }
             ];
@@ -136,16 +136,16 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 detail: hasUnhandledConflicts
                     ? isMany
                         ? ( localize(
-                    9097,
+                    9122,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 ))
                         : ( localize(
-                    9098,
+                    9123,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
                 ))
                     : isMany
-                        ? ( localize(9099, "The merge results will be lost if you don't save them."))
-                        : ( localize(9100, "The merge result will be lost if you don't save it.")),
+                        ? ( localize(9124, "The merge results will be lost if you don't save them."))
+                        : ( localize(9125, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => ConfirmResult.CANCEL
@@ -170,12 +170,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localize(9101, "Do you want to accept the merge result?")),
+                message: ( localize(9126, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    9102,
+                    9127,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(9103, '&&Accept Merge'))
+                primaryButton: ( localize(9128, '&&Accept Merge'))
             });
             if (confirmed) {
                 await this.accept();
@@ -202,19 +202,9 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._modelService = _modelService;
         this._languageService = _languageService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(9104, "Before Resolving Conflicts In Merge Editor"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(9129, "Before Resolving Conflicts In Merge Editor"))); }
     async createInputModel(args) {
         const store = ( new DisposableStore());
-        let resultTextFileModel = undefined;
-        const modelListener = store.add(( new DisposableStore()));
-        const handleDidCreate = (model) => {
-            if (isEqual(args.result, model.resource)) {
-                modelListener.clear();
-                resultTextFileModel = model;
-            }
-        };
-        modelListener.add(this.textFileService.files.onDidCreate(handleDidCreate));
-        this.textFileService.files.models.forEach(handleDidCreate);
         let [base, result, input1Data, input2Data,] = await Promise.all([
             this._textModelService.createModelReference(args.base).then(v => ({
                 object: v.object.textEditorModel,
@@ -237,6 +227,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         }
         store.add(base);
         store.add(result);
+        const resultTextFileModel = this.textFileService.files.models.find(m => ( m.resource.toString()) === ( result.object.textEditorModel.uri.toString()));
         if (!resultTextFileModel) {
             throw ( new BugIndicatingError());
         }
@@ -328,12 +319,12 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         if (someDirty) {
             const message = isMany
                 ? ( localize(
-                9105,
+                9130,
                 'Do you want to save the changes you made to {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                9106,
+                9131,
                 'Do you want to save the changes you made to {0}?',
                 basename(inputModels[0].resultUri)
             ));
@@ -343,25 +334,25 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 detail: someUnhandledConflicts ?
                     isMany
                         ? ( localize(
-                        9107,
+                        9132,
                         "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                         : ( localize(
-                        9108,
+                        9133,
                         "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                     : isMany
-                        ? ( localize(9109, "Your changes will be lost if you don't save them."))
-                        : ( localize(9110, "Your changes will be lost if you don't save them.")),
+                        ? ( localize(9134, "Your changes will be lost if you don't save them."))
+                        : ( localize(9135, "Your changes will be lost if you don't save them.")),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localize(9111, '&&Save with Conflicts'))
-                            : ( localize(9112, '&&Save')),
+                            ? ( localize(9136, '&&Save with Conflicts'))
+                            : ( localize(9137, '&&Save')),
                         run: () => ConfirmResult.SAVE
                     },
                     {
-                        label: ( localize(9113, "Do&&n't Save")),
+                        label: ( localize(9138, "Do&&n't Save")),
                         run: () => ConfirmResult.DONT_SAVE
                     }
                 ],
@@ -374,21 +365,21 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, StorageScope.PROFILE, false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
-                    ? ( localize(9114, 'Do you want to close {0} merge editors?', inputModels.length))
+                    ? ( localize(9139, 'Do you want to close {0} merge editors?', inputModels.length))
                     : ( localize(
-                    9115,
+                    9140,
                     'Do you want to close the merge editor for {0}?',
                     basename(inputModels[0].resultUri)
                 )),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localize(9116, "The files contain unhandled conflicts."))
-                        : ( localize(9117, "The file contains unhandled conflicts."))
+                        ? ( localize(9141, "The files contain unhandled conflicts."))
+                        : ( localize(9142, "The file contains unhandled conflicts."))
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localize(9118, '&&Close with Conflicts'))
-                    : ( localize(9119, '&&Close')),
-                checkbox: { label: ( localize(9120, "Do not ask me again")) }
+                    ? ( localize(9143, '&&Close with Conflicts'))
+                    : ( localize(9144, '&&Close')),
+                checkbox: { label: ( localize(9145, "Do not ask me again")) }
             });
             if (checkboxChecked) {
                 this._storageService.store(StorageCloseWithConflicts, true, StorageScope.PROFILE, StorageTarget.USER);

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -373,7 +373,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: UndoRedoElementType.Resource,
             resource: this.resultTextModel.uri,
             code: 'setInputHandled',
-            label: ( localize(9121, "Set Input Handled")),
+            label: ( localize(9146, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -588,7 +588,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = 'undoMarkAsHandled';
-        this.label = ( localize(9122, 'Undo Mark As Handled'));
+        this.label = ( localize(9147, 'Undo Mark As Handled'));
         this.type = UndoRedoElementType.Resource;
     }
     redo() {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js

@@ -84,15 +84,15 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localize(9136, "Manual Resolution")),
-                    tooltip: ( localize(9137, "This conflict has been resolved manually.")),
+                    text: ( localize(9161, "Manual Resolution")),
+                    tooltip: ( localize(9162, "This conflict has been resolved manually.")),
                 });
             }
             else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localize(9138, 'No Changes Accepted')),
+                    text: ( localize(9163, 'No Changes Accepted')),
                     tooltip: ( localize(
-                        9139,
+                        9164,
                         'The current resolution of this conflict equals the common ancestor of both the right and left changes.'
                     )),
                 });
@@ -114,20 +114,20 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localize(9140, 'Remove {0}', model.input1.title)), async () => {
+                stateToggles.push(command(( localize(9165, 'Remove {0}', model.input1.title)), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, state.withInputValue(1, false), true, tx);
                         model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
                     });
-                }, ( localize(9141, 'Remove {0} from the result document.', model.input1.title))));
+                }, ( localize(9166, 'Remove {0} from the result document.', model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localize(9140, 'Remove {0}', model.input2.title)), async () => {
+                stateToggles.push(command(( localize(9165, 'Remove {0}', model.input2.title)), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
                         model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
                     });
-                }, ( localize(9141, 'Remove {0} from the result document.', model.input2.title))));
+                }, ( localize(9166, 'Remove {0} from the result document.', model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both &&
                 state.firstInput === 2) {
@@ -135,13 +135,13 @@ class ActionsSource {
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localize(9142, 'Reset to base')), async () => {
+                result.push(command(( localize(9167, 'Reset to base')), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
                 }, ( localize(
-                    9143,
+                    9168,
                     'Reset this conflict to the common ancestor of both the right and left changes.'
                 ))));
             }
@@ -173,16 +173,16 @@ class ActionsSource {
             const otherInputNumber = inputNumber === 1 ? 2 : 1;
             if (state.kind !== ModifiedBaseRangeStateKind.unrecognized && !state.isInputIncluded(inputNumber)) {
                 if (!state.isInputIncluded(otherInputNumber) || !this.viewModel.shouldUseAppendInsteadOfAccept.read(reader)) {
-                    result.push(command(( localize(9144, "Accept {0}", inputData.title)), async () => {
+                    result.push(command(( localize(9169, "Accept {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(9145, "Accept {0} in the result document.", inputData.title))));
+                    }, ( localize(9170, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
                         const commandName = modifiedBaseRange.isOrderRelevant
-                            ? ( localize(9146, "Accept Combination ({0} First)", inputData.title))
-                            : ( localize(9147, "Accept Combination"));
+                            ? ( localize(9171, "Accept Combination ({0} First)", inputData.title))
+                            : ( localize(9172, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, ModifiedBaseRangeState.base
@@ -191,36 +191,36 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            9148,
+                            9173,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 else {
-                    result.push(command(( localize(9149, "Append {0}", inputData.title)), async () => {
+                    result.push(command(( localize(9174, "Append {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(9150, "Append {0} to the result document.", inputData.title))));
+                    }, ( localize(9175, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localize(9151, "Accept Combination", inputData.title)), async () => {
+                        result.push(command(( localize(9176, "Accept Combination", inputData.title)), async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, true), inputNumber, tx);
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            9148,
+                            9173,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localize(9152, 'Ignore')), async () => {
+                    result.push(command(( localize(9177, 'Ignore')), async () => {
                         transaction((tx) => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localize(9153, "Don't take this side of the conflict."))));
+                    }, ( localize(9178, "Don't take this side of the conflict."))));
                 }
             }
             return result;

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

@@ -2,34 +2,34 @@
 import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
-const ctxIsMergeEditor = ( new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(9174, 'The editor is a merge editor')) }));
+const ctxIsMergeEditor = ( new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(9199, 'The editor is a merge editor')) }));
 const ctxIsMergeResultEditor = ( new RawContextKey(
  'isMergeResultEditor',
  false,
- { type: 'boolean', description: ( localize(9175, 'The editor is a the result editor of a merge editor.')) }
+ { type: 'boolean', description: ( localize(9200, 'The editor is a the result editor of a merge editor.')) }
 ));
 const ctxMergeEditorLayout = ( new RawContextKey(
  'mergeEditorLayout',
  'mixed',
- { type: 'string', description: ( localize(9176, 'The layout mode of a merge editor')) }
+ { type: 'string', description: ( localize(9201, 'The layout mode of a merge editor')) }
 ));
 const ctxMergeEditorShowBase = ( new RawContextKey(
  'mergeEditorShowBase',
  false,
- { type: 'boolean', description: ( localize(9177, 'If the merge editor shows the base version')) }
+ { type: 'boolean', description: ( localize(9202, 'If the merge editor shows the base version')) }
 ));
 const ctxMergeEditorShowBaseAtTop = ( new RawContextKey(
  'mergeEditorShowBaseAtTop',
  false,
- { type: 'boolean', description: ( localize(9178, 'If base should be shown at the top')) }
+ { type: 'boolean', description: ( localize(9203, 'If base should be shown at the top')) }
 ));
 const ctxMergeEditorShowNonConflictingChanges = ( new RawContextKey(
  'mergeEditorShowNonConflictingChanges',
  false,
- { type: 'boolean', description: ( localize(9179, 'If the merge editor shows non-conflicting changes')) }
+ { type: 'boolean', description: ( localize(9204, 'If the merge editor shows non-conflicting changes')) }
 ));
-const ctxMergeBaseUri = ( new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(9180, 'The uri of the baser of a merge editor')) }));
-const ctxMergeResultUri = ( new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(9181, 'The uri of the result of a merge editor')) }));
+const ctxMergeBaseUri = ( new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(9205, 'The uri of the baser of a merge editor')) }));
+const ctxMergeResultUri = ( new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(9206, 'The uri of the result of a merge editor')) }));
 const StorageCloseWithConflicts = 'mergeEditorCloseWithConflicts';
 
 export { StorageCloseWithConflicts, ctxIsMergeEditor, ctxIsMergeResultEditor, ctxMergeBaseUri, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, ctxMergeResultUri };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js

@@ -3,6 +3,6 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localize(9187, 'Icon of the multi diff editor label.')));
+const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localize(9212, 'Icon of the multi diff editor label.')));
 
 export { MultiDiffEditorIcon };