@codingame/monaco-vscode-api 26.0.1 → 26.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "26.0.1",
+  "version": "26.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
@@ -15,13 +15,13 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-base-service-override": "26.0.1",
-    "@codingame/monaco-vscode-environment-service-override": "26.0.1",
-    "@codingame/monaco-vscode-extensions-service-override": "26.0.1",
-    "@codingame/monaco-vscode-files-service-override": "26.0.1",
-    "@codingame/monaco-vscode-host-service-override": "26.0.1",
-    "@codingame/monaco-vscode-layout-service-override": "26.0.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "26.0.1",
+    "@codingame/monaco-vscode-base-service-override": "26.1.0",
+    "@codingame/monaco-vscode-environment-service-override": "26.1.0",
+    "@codingame/monaco-vscode-extensions-service-override": "26.1.0",
+    "@codingame/monaco-vscode-files-service-override": "26.1.0",
+    "@codingame/monaco-vscode-host-service-override": "26.1.0",
+    "@codingame/monaco-vscode-layout-service-override": "26.1.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "26.1.0",
     "@vscode/iconv-lite-umd": "0.7.1",
     "dompurify": "3.3.1",
     "jschardet": "3.1.4",

package/services.js

@@ -409,10 +409,10 @@ export { IAgentSessionsService } from './vscode/src/vs/workbench/contrib/chat/br
 export { IUserAttentionService } from './vscode/src/vs/workbench/services/userAttention/common/userAttentionService.service.js';
 export { ICodeCompareModelService } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service.js';
 
-if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.109.0-7f573fc4-1087-4c0e-87e6-6adf5d047a20") {
-    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.109.0-7f573fc4-1087-4c0e-87e6-6adf5d047a20"}, ${window.monacoVscodeApiBuildId} is already loaded`);
+if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.109.2-15ed2676-2f6b-4cc9-babe-aa893ddbaccc") {
+    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.109.2-15ed2676-2f6b-4cc9-babe-aa893ddbaccc"}, ${window.monacoVscodeApiBuildId} is already loaded`);
 }
-window.monacoVscodeApiBuildId = "1.109.0-7f573fc4-1087-4c0e-87e6-6adf5d047a20";
+window.monacoVscodeApiBuildId = "1.109.2-15ed2676-2f6b-4cc9-babe-aa893ddbaccc";
 function registerCommands(options) {
     function asMenuId(menu) {
         switch (menu) {

package/vscode/src/vs/base/common/strings.d.ts

@@ -271,3 +271,33 @@ export declare const Ellipsis = "\u2026";
  * of throwing an exception.
  */
 export declare function multibyteAwareBtoa(str: string): string;
+/**
+ * Encodes a Unicode string to Punycode according to RFC 3492.
+ * This is the raw encoding without the "xn--" ACE prefix.
+ *
+ * @param input The Unicode string to encode.
+ * @returns The Punycode-encoded ASCII string.
+ * @throws Error if the input contains invalid surrogate pairs.
+ *
+ * @example
+ * // allow-any-unicode-next-line
+ * punycodeEncode('münchen') // returns 'mnchen-3ya'
+ * // allow-any-unicode-next-line
+ * punycodeEncode('bücher') // returns 'bcher-kva'
+ * // allow-any-unicode-next-line
+ * punycodeEncode('日本語') // returns 'wgv71a119e'
+ */
+export declare function punycodeEncode(input: string): string;
+/**
+ * Encodes a domain label using Punycode with the ACE prefix "xn--".
+ * If the label contains only ASCII characters, it is returned unchanged.
+ *
+ * @param label The domain label to encode.
+ * @returns The ACE-encoded label with "xn--" prefix, or the original label if all ASCII.
+ *
+ * @example
+ * // allow-any-unicode-next-line
+ * toPunycodeACE('münchen') // returns 'xn--mnchen-3ya'
+ * toPunycodeACE('example') // returns 'example' (no encoding needed)
+ */
+export declare function toPunycodeACE(label: string): string;

package/vscode/src/vs/base/common/strings.js

@@ -887,5 +887,16 @@ function toBinary(str) {
 function multibyteAwareBtoa(str) {
     return btoa(toBinary(str));
 }
+var PunycodeConstants;
+(function(PunycodeConstants) {
+    PunycodeConstants[PunycodeConstants["BASE"] = 36] = "BASE";
+    PunycodeConstants[PunycodeConstants["TMIN"] = 1] = "TMIN";
+    PunycodeConstants[PunycodeConstants["TMAX"] = 26] = "TMAX";
+    PunycodeConstants[PunycodeConstants["SKEW"] = 38] = "SKEW";
+    PunycodeConstants[PunycodeConstants["DAMP"] = 700] = "DAMP";
+    PunycodeConstants[PunycodeConstants["INITIAL_BIAS"] = 72] = "INITIAL_BIAS";
+    PunycodeConstants[PunycodeConstants["INITIAL_N"] = 128] = "INITIAL_N";
+    PunycodeConstants[PunycodeConstants["DELIMITER"] = 45] = "DELIMITER";
+})(PunycodeConstants || (PunycodeConstants = {}));
 
 export { AmbiguousCharacters, CodePointIterator, Ellipsis, GraphemeBreakType, GraphemeIterator, InvisibleCharacters, UNUSUAL_LINE_TERMINATORS, UTF8_BOM_CHARACTER, commonPrefixLength, commonSuffixLength, compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase, computeCodePoint, containsRTL, containsUnusualLineTerminators, containsUppercaseCharacter, convertSimple2RegExpPattern, count, createRegExp, endsWithIgnoreCase, equals, equalsIgnoreCase, escape, escapeRegExpCharacters, firstNonWhitespaceIndex, forAnsiStringParts, format, format2, fuzzyContains, getCharContainingOffset, getLeadingWhitespace, getLeftDeleteOffset, getNLines, getNextCodePoint, htmlAttributeEncodeValue, isAsciiDigit, isBasicASCII, isEmojiImprecise, isFalsyOrWhitespace, isFullWidthCharacter, isHighSurrogate, isLowSurrogate, isLowerAsciiLetter, isUpperAsciiLetter, joinStrings, lastNonWhitespaceIndex, lcut, ltrim, multibyteAwareBtoa, nextCharLength, noBreakWhitespace, prevCharLength, rcut, regExpLeadsToEndlessLoop, removeAnsiEscapeCodes, removeAnsiEscapeCodesFromPrompt, rtrim, singleLetterHash, splitLines, splitLinesIncludeSeparators, startsWithIgnoreCase, startsWithUTF8BOM, trim, truncate, truncateMiddle, uppercaseFirstLetter };

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPicker.css

@@ -34,7 +34,7 @@
 	display: flex;
 	height: 24px;
 	position: relative;
-	background: url('images/opacity-background.png');
+	background: url('./images/opacity-background.png');
 	background-size: 9px 9px;
 	image-rendering: pixelated;
 }
@@ -155,7 +155,7 @@
 	position: relative;
 	margin-left: 8px;
 	cursor: grab;
-	background: url('images/opacity-background.png');
+	background: url('./images/opacity-background.png');
 	background-size: 9px 9px;
 	image-rendering: pixelated;
 }

package/vscode/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.css

@@ -13,12 +13,12 @@
 	position: absolute;
 	resize: none;
 	overflow: hidden;
-	background: url('keyboard-light.svg') center center no-repeat;
+	background: url('./keyboard-light.svg') center center no-repeat;
 	border: 4px solid #F6F6F6;
 	border-radius: 4px;
 }
 
 .monaco-editor.vs-dark .iPadShowKeyboard {
-	background: url('keyboard-dark.svg') center center no-repeat;
+	background: url('./keyboard-dark.svg') center center no-repeat;
 	border: 4px solid #252526;
 }

package/vscode/src/vs/editor/standalone/browser/iPadShowKeyboard/keyboard-dark.svg

@@ -0,0 +1,10 @@
+<svg width="53" height="36" viewBox="0 0 53 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48.0364 4.01042H4.00779L4.00779 32.0286H48.0364V4.01042ZM4.00779 0.0078125C1.79721 0.0078125 0.00518799 1.79984 0.00518799 4.01042V32.0286C0.00518799 34.2392 1.79721 36.0312 4.00779 36.0312H48.0364C50.247 36.0312 52.039 34.2392 52.039 32.0286V4.01042C52.039 1.79984 50.247 0.0078125 48.0364 0.0078125H4.00779ZM8.01042 8.01302H12.013V12.0156H8.01042V8.01302ZM20.0182 8.01302H16.0156V12.0156H20.0182V8.01302ZM24.0208 8.01302H28.0234V12.0156H24.0208V8.01302ZM36.0286 8.01302H32.026V12.0156H36.0286V8.01302ZM40.0312 8.01302H44.0339V12.0156H40.0312V8.01302ZM16.0156 16.0182H8.01042V20.0208H16.0156V16.0182ZM20.0182 16.0182H24.0208V20.0208H20.0182V16.0182ZM32.026 16.0182H28.0234V20.0208H32.026V16.0182ZM44.0339 16.0182V20.0208H36.0286V16.0182H44.0339ZM12.013 24.0234H8.01042V28.026H12.013V24.0234ZM16.0156 24.0234H36.0286V28.026H16.0156V24.0234ZM44.0339 24.0234H40.0312V28.026H44.0339V24.0234Z" fill="#C5C5C5"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="53" height="36" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/vscode/src/vs/editor/standalone/browser/iPadShowKeyboard/keyboard-light.svg

@@ -0,0 +1,10 @@
+<svg width="53" height="36" viewBox="0 0 53 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48.0364 4.01042H4.00779L4.00779 32.0286H48.0364V4.01042ZM4.00779 0.0078125C1.79721 0.0078125 0.00518799 1.79984 0.00518799 4.01042V32.0286C0.00518799 34.2392 1.79721 36.0312 4.00779 36.0312H48.0364C50.247 36.0312 52.039 34.2392 52.039 32.0286V4.01042C52.039 1.79984 50.247 0.0078125 48.0364 0.0078125H4.00779ZM8.01042 8.01302H12.013V12.0156H8.01042V8.01302ZM20.0182 8.01302H16.0156V12.0156H20.0182V8.01302ZM24.0208 8.01302H28.0234V12.0156H24.0208V8.01302ZM36.0286 8.01302H32.026V12.0156H36.0286V8.01302ZM40.0312 8.01302H44.0339V12.0156H40.0312V8.01302ZM16.0156 16.0182H8.01042V20.0208H16.0156V16.0182ZM20.0182 16.0182H24.0208V20.0208H20.0182V16.0182ZM32.026 16.0182H28.0234V20.0208H32.026V16.0182ZM44.0339 16.0182V20.0208H36.0286V16.0182H44.0339ZM12.013 24.0234H8.01042V28.026H12.013V24.0234ZM16.0156 24.0234H36.0286V28.026H16.0156V24.0234ZM44.0339 24.0234H40.0312V28.026H44.0339V24.0234Z" fill="#424242"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="53" height="36" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/vscode/src/vs/platform/product/common/product.js

@@ -4,9 +4,9 @@ import productJson from '../../../../../product.json.js';
 var product = {
   ...productJson,
   quality: 'stable',
-  version: '1.109.0',
-  commit: 'bdd88df003631aaa0bcbe057cb0a940b80a476fa',
-  date: '2026-02-10T16:17:53.159Z',
+  version: '1.109.2',
+  commit: '591199df409fbf59b4b52d5ad4ee0470152a9b31',
+  date: '2026-02-11T14:53:29.016Z',
   ...(globalThis._VSCODE_PRODUCT_JSON ?? {})
 };
 

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

@@ -414,7 +414,7 @@
 }
 
 .extension-editor > .body > .content.loading {
-	background: url('loading.svg') center center no-repeat;
+	background: url('./loading.svg') center center no-repeat;
 }
 
 .extension-editor > .body > .content > .monaco-scrollable-element {

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

@@ -144,15 +144,15 @@
 }
 
 .extensions-viewlet > .extensions .extension-list-item.loading {
-	background: url('loading.svg') center center no-repeat;
+	background: url('./loading.svg') center center no-repeat;
 }
 
 .monaco-workbench.vs-dark .extensions-viewlet > .extensions .extension-list-item.loading {
-	background-image: url('loading-dark.svg');
+	background-image: url('./loading-dark.svg');
 }
 
 .monaco-workbench.hc-black .extensions-viewlet > .extensions .extension-list-item.loading {
-	background-image: url('loading-hc.svg');
+	background-image: url('./loading-hc.svg');
 }
 
 .extensions-viewlet > .extensions .extension-list-item.loading > .icon-container {

package/vscode/src/vs/workbench/contrib/extensions/browser/media/loading-dark.svg

@@ -0,0 +1,31 @@
+<?xml version='1.0' standalone='no' ?>
+<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='10px' height='10px'>
+	<style>
+    circle {
+      animation: ball 0.6s linear infinite;
+    }
+
+    circle:nth-child(2) { animation-delay: 0.075s; }
+    circle:nth-child(3) { animation-delay: 0.15s; }
+    circle:nth-child(4) { animation-delay: 0.225s; }
+    circle:nth-child(5) { animation-delay: 0.3s; }
+    circle:nth-child(6) { animation-delay: 0.375s; }
+    circle:nth-child(7) { animation-delay: 0.45s; }
+    circle:nth-child(8) { animation-delay: 0.525s; }
+
+    @keyframes ball {
+      from { opacity: 1; }
+      to { opacity: 0.3; }
+    }
+	</style>
+	<g style="fill:grey;">
+		<circle cx='5' cy='1' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='2.1716' r='1' style='opacity:0.3;' />
+		<circle cx='9' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='5' cy='9' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='1' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='2.1716' r='1' style='opacity:0.3;' />
+	</g>
+</svg>

package/vscode/src/vs/workbench/contrib/extensions/browser/media/loading-hc.svg

@@ -0,0 +1,31 @@
+<?xml version='1.0' standalone='no' ?>
+<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='10px' height='10px'>
+	<style>
+    circle {
+      animation: ball 0.6s linear infinite;
+    }
+
+    circle:nth-child(2) { animation-delay: 0.075s; }
+    circle:nth-child(3) { animation-delay: 0.15s; }
+    circle:nth-child(4) { animation-delay: 0.225s; }
+    circle:nth-child(5) { animation-delay: 0.3s; }
+    circle:nth-child(6) { animation-delay: 0.375s; }
+    circle:nth-child(7) { animation-delay: 0.45s; }
+    circle:nth-child(8) { animation-delay: 0.525s; }
+
+    @keyframes ball {
+      from { opacity: 1; }
+      to { opacity: 0.3; }
+    }
+	</style>
+	<g style="fill:white;">
+		<circle cx='5' cy='1' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='2.1716' r='1' style='opacity:0.3;' />
+		<circle cx='9' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='5' cy='9' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='1' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='2.1716' r='1' style='opacity:0.3;' />
+	</g>
+</svg>

package/vscode/src/vs/workbench/contrib/extensions/browser/media/loading.svg

@@ -0,0 +1,31 @@
+<?xml version='1.0' standalone='no' ?>
+<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='10px' height='10px'>
+	<style>
+    circle {
+      animation: ball 0.6s linear infinite;
+    }
+
+    circle:nth-child(2) { animation-delay: 0.075s; }
+    circle:nth-child(3) { animation-delay: 0.15s; }
+    circle:nth-child(4) { animation-delay: 0.225s; }
+    circle:nth-child(5) { animation-delay: 0.3s; }
+    circle:nth-child(6) { animation-delay: 0.375s; }
+    circle:nth-child(7) { animation-delay: 0.45s; }
+    circle:nth-child(8) { animation-delay: 0.525s; }
+
+    @keyframes ball {
+      from { opacity: 1; }
+      to { opacity: 0.3; }
+    }
+	</style>
+	<g>
+		<circle cx='5' cy='1' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='2.1716' r='1' style='opacity:0.3;' />
+		<circle cx='9' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='7.8284' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='5' cy='9' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='7.8284' r='1' style='opacity:0.3;' />
+		<circle cx='1' cy='5' r='1' style='opacity:0.3;' />
+		<circle cx='2.1716' cy='2.1716' r='1' style='opacity:0.3;' />
+	</g>
+</svg>

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

@@ -520,36 +520,36 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 break;
             }
             const options = [{
-                label: ( localize(9372, "Show Output")),
+                label: ( localize(9373, "Show Output")),
                 run: () => this.showOutput()
             }];
             if (cnx.definition.devMode?.debug?.type === "debugpy" && debug) {
                 this._notificationService.prompt(Severity$1.Error, ( localize(
-                    9373,
+                    9374,
                     "The command \"{0}\" was not found. You can specify the path to debugpy in the `dev.debug.debugpyPath` option.",
                     cnx.launchDefinition.command,
                     cnx.definition.label
                 )), [...options, {
-                    label: ( localize(9374, "View Docs")),
+                    label: ( localize(9375, "View Docs")),
                     run: () => this._openerService.open(( URI.parse("https://aka.ms/vscode-mcp-install/debugpy")))
                 }]);
                 return;
             }
             if (docsLink) {
                 options.push({
-                    label: ( localize(9375, "Install {0}", cnx.launchDefinition.command)),
+                    label: ( localize(9376, "Install {0}", cnx.launchDefinition.command)),
                     run: () => this._openerService.open(( URI.parse(docsLink)))
                 });
             }
             this._notificationService.prompt(Severity$1.Error, ( localize(
-                9376,
+                9377,
                 "The command \"{0}\" needed to run {1} was not found.",
                 cnx.launchDefinition.command,
                 cnx.definition.label
             )), options);
         } else {
             this._notificationService.warn(( localize(
-                9377,
+                9378,
                 "The MCP server {0} could not be started: {1}",
                 cnx.definition.label,
                 error.message
@@ -632,7 +632,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         const validated = [];
         for (const [i, result] of validations.entries()) {
             if ("error" in result) {
-                error += ( localize(9378, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
+                error += ( localize(9379, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
                 for (const message of result.error) {
                     error += `\t- ${message}\n`;
                 }
@@ -957,7 +957,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
         notificationService.notify({
             severity: Severity$1.Warning,
             message: ( localize(
-                9379,
+                9380,
                 "MCP server `{0}` has tools with invalid parameters which will be omitted.",
                 serverName
             )),
@@ -967,7 +967,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
                     enabled: true,
                     id: "mcpBadSchema.show",
                     tooltip: "",
-                    label: ( localize(9380, "Show")),
+                    label: ( localize(9381, "Show")),
                     run: () => {
                         editorService.openEditor({
                             resource: undefined,

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

@@ -179,13 +179,13 @@ var McpConnectionState;
     McpConnectionState.toString = s => {
         switch (s.state) {
         case Kind.Stopped:
-            return localize(9384, "Stopped");
+            return localize(9385, "Stopped");
         case Kind.Starting:
-            return localize(9385, "Starting");
+            return localize(9386, "Starting");
         case Kind.Running:
-            return localize(9386, "Running");
+            return localize(9387, "Running");
         case Kind.Error:
-            return localize(9387, "Error {0}", s.message);
+            return localize(9388, "Error {0}", s.message);
         default:
             assertNever();
         }

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

@@ -106,7 +106,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return localize(9433, "Merging: {0}", super.getName());
+        return localize(9434, "Merging: {0}", super.getName());
     }
     async resolve() {
         if (!this._inputModel) {
@@ -190,13 +190,13 @@ MergeEditorInput = MergeEditorInput_1 = ( __decorate([( __param(4, IInstantiatio
 function alertFocusedEditor(editor) {
     switch (editor) {
     case "input1":
-        alert(( localize(9434, "Incoming, Left Input")));
+        alert(( localize(9435, "Incoming, Left Input")));
         break;
     case "input2":
-        alert(( localize(9435, "Current, Right Input")));
+        alert(( localize(9436, "Current, Right Input")));
         break;
     case "result":
-        alert(( localize(9436, "Merge Result")));
+        alert(( localize(9437, "Merge Result")));
         break;
     }
 }

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

@@ -134,32 +134,32 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         if (someDirty) {
             const isMany = inputModels.length > 1;
             const message = isMany ? ( localize(
-                9437,
+                9438,
                 "Do you want keep the merge result of {0} files?",
                 inputModels.length
             )) : ( localize(
-                9438,
+                9439,
                 "Do you want keep the merge result of {0}?",
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
             const hasUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
             const buttons = [{
-                label: hasUnhandledConflicts ? ( localize(9439, "&&Save With Conflicts")) : ( localize(9440, "&&Save")),
+                label: hasUnhandledConflicts ? ( localize(9440, "&&Save With Conflicts")) : ( localize(9441, "&&Save")),
                 run: () => ConfirmResult.SAVE
             }, {
-                label: ( localize(9441, "Do&&n't Save")),
+                label: ( localize(9442, "Do&&n't Save")),
                 run: () => ConfirmResult.DONT_SAVE
             }];
             choice = (await this.dialogService.prompt({
                 type: Severity$1.Info,
                 message,
                 detail: hasUnhandledConflicts ? isMany ? ( localize(
-                    9442,
+                    9443,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 )) : ( localize(
-                    9443,
+                    9444,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
-                )) : isMany ? ( localize(9444, "The merge results will be lost if you don't save them.")) : ( localize(9445, "The merge result will be lost if you don't save it.")),
+                )) : isMany ? ( localize(9445, "The merge results will be lost if you don't save them.")) : ( localize(9446, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => ConfirmResult.CANCEL
@@ -184,12 +184,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const {
                 confirmed
             } = await this.dialogService.confirm({
-                message: ( localize(9446, "Do you want to accept the merge result?")),
+                message: ( localize(9447, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    9447,
+                    9448,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(9448, "&&Accept Merge"))
+                primaryButton: ( localize(9449, "&&Accept Merge"))
             });
             if (confirmed) {
                 await this.accept();
@@ -221,7 +221,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._languageService = _languageService;
     }
     static {
-        this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource("merge-editor.source", ( localize(9449, "Before Resolving Conflicts In Merge Editor")));
+        this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource("merge-editor.source", ( localize(9450, "Before Resolving Conflicts In Merge Editor")));
     }
     async createInputModel(args) {
         const store = ( new DisposableStore());
@@ -356,11 +356,11 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         const someUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
         if (someDirty) {
             const message = isMany ? ( localize(
-                9450,
+                9451,
                 "Do you want to save the changes you made to {0} files?",
                 inputModels.length
             )) : ( localize(
-                9451,
+                9452,
                 "Do you want to save the changes you made to {0}?",
                 basename(inputModels[0].resultUri)
             ));
@@ -370,17 +370,17 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 type: Severity$1.Info,
                 message,
                 detail: someUnhandledConflicts ? isMany ? ( localize(
-                    9452,
+                    9453,
                     "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                 )) : ( localize(
-                    9453,
+                    9454,
                     "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
-                )) : isMany ? ( localize(9454, "Your changes will be lost if you don't save them.")) : ( localize(9455, "Your changes will be lost if you don't save them.")),
+                )) : isMany ? ( localize(9455, "Your changes will be lost if you don't save them.")) : ( localize(9456, "Your changes will be lost if you don't save them.")),
                 buttons: [{
-                    label: someUnhandledConflicts ? ( localize(9456, "&&Save with Conflicts")) : ( localize(9457, "&&Save")),
+                    label: someUnhandledConflicts ? ( localize(9457, "&&Save with Conflicts")) : ( localize(9458, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 }, {
-                    label: ( localize(9458, "Do&&n't Save")),
+                    label: ( localize(9459, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }],
                 cancelButton: {
@@ -393,15 +393,15 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 confirmed,
                 checkboxChecked
             } = await this._dialogService.confirm({
-                message: isMany ? ( localize(9459, "Do you want to close {0} merge editors?", inputModels.length)) : ( localize(
-                    9460,
+                message: isMany ? ( localize(9460, "Do you want to close {0} merge editors?", inputModels.length)) : ( localize(
+                    9461,
                     "Do you want to close the merge editor for {0}?",
                     basename(inputModels[0].resultUri)
                 )),
-                detail: someUnhandledConflicts ? isMany ? ( localize(9461, "The files contain unhandled conflicts.")) : ( localize(9462, "The file contains unhandled conflicts.")) : undefined,
-                primaryButton: someUnhandledConflicts ? ( localize(9463, "&&Close with Conflicts")) : ( localize(9464, "&&Close")),
+                detail: someUnhandledConflicts ? isMany ? ( localize(9462, "The files contain unhandled conflicts.")) : ( localize(9463, "The file contains unhandled conflicts.")) : undefined,
+                primaryButton: someUnhandledConflicts ? ( localize(9464, "&&Close with Conflicts")) : ( localize(9465, "&&Close")),
                 checkbox: {
-                    label: ( localize(9465, "Do not ask me again"))
+                    label: ( localize(9466, "Do not ask me again"))
                 }
             });
             if (checkboxChecked) {

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

@@ -403,7 +403,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: UndoRedoElementType.Resource,
             resource: this.resultTextModel.uri,
             code: "setInputHandled",
-            label: ( localize(9466, "Set Input Handled")),
+            label: ( localize(9467, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -628,7 +628,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = "undoMarkAsHandled";
-        this.label = ( localize(9467, "Undo Mark As Handled"));
+        this.label = ( localize(9468, "Undo Mark As Handled"));
         this.type = UndoRedoElementType.Resource;
     }
     redo() {

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

@@ -4,35 +4,35 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 
 const ctxIsMergeEditor = ( new RawContextKey("isMergeEditor", false, {
     type: "boolean",
-    description: ( localize(9519, "The editor is a merge editor"))
+    description: ( localize(9520, "The editor is a merge editor"))
 }));
 const ctxIsMergeResultEditor = ( new RawContextKey("isMergeResultEditor", false, {
     type: "boolean",
-    description: ( localize(9520, "The editor is a the result editor of a merge editor."))
+    description: ( localize(9521, "The editor is a the result editor of a merge editor."))
 }));
 const ctxMergeEditorLayout = ( new RawContextKey("mergeEditorLayout", "mixed", {
     type: "string",
-    description: ( localize(9521, "The layout mode of a merge editor"))
+    description: ( localize(9522, "The layout mode of a merge editor"))
 }));
 const ctxMergeEditorShowBase = ( new RawContextKey("mergeEditorShowBase", false, {
     type: "boolean",
-    description: ( localize(9522, "If the merge editor shows the base version"))
+    description: ( localize(9523, "If the merge editor shows the base version"))
 }));
 const ctxMergeEditorShowBaseAtTop = ( new RawContextKey("mergeEditorShowBaseAtTop", false, {
     type: "boolean",
-    description: ( localize(9523, "If base should be shown at the top"))
+    description: ( localize(9524, "If base should be shown at the top"))
 }));
 const ctxMergeEditorShowNonConflictingChanges = ( new RawContextKey("mergeEditorShowNonConflictingChanges", false, {
     type: "boolean",
-    description: ( localize(9524, "If the merge editor shows non-conflicting changes"))
+    description: ( localize(9525, "If the merge editor shows non-conflicting changes"))
 }));
 const ctxMergeBaseUri = ( new RawContextKey("mergeEditorBaseUri", "", {
     type: "string",
-    description: ( localize(9525, "The uri of the baser of a merge editor"))
+    description: ( localize(9526, "The uri of the baser of a merge editor"))
 }));
 const ctxMergeResultUri = ( new RawContextKey("mergeEditorResultUri", "", {
     type: "string",
-    description: ( localize(9526, "The uri of the result of a merge editor"))
+    description: ( localize(9527, "The uri of the result of a merge editor"))
 }));
 const StorageCloseWithConflicts = "mergeEditorCloseWithConflicts";
 

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(9532, "Icon of the multi diff editor label.")));
+const MultiDiffEditorIcon = registerIcon("multi-diff-editor-label-icon", Codicon.diffMultiple, ( localize(9533, "Icon of the multi diff editor label.")));
 
 export { MultiDiffEditorIcon };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js

@@ -145,11 +145,11 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         };
         this._register(autorun(reader => {
             const resources = this.resources.read(reader);
-            const label = this.label ?? ( localize(9534, "Multi Diff Editor"));
+            const label = this.label ?? ( localize(9535, "Multi Diff Editor"));
             if (resources && resources.length === 1) {
-                this._name = ( localize(9535, "{0} (1 file)", label));
+                this._name = ( localize(9536, "{0} (1 file)", label));
             } else if (resources) {
-                this._name = ( localize(9536, "{0} ({1} files)", label, resources.length));
+                this._name = ( localize(9537, "{0} ({1} files)", label, resources.length));
             } else {
                 this._name = label;
             }