@codingame/monaco-vscode-view-common-service-override 32.0.0 → 32.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "32.0.0",
+  "version": "32.0.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-common service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "32.0.0",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "32.0.0"
+    "@codingame/monaco-vscode-api": "32.0.2",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "32.0.2"
   },
   "main": "index.js",
   "module": "index.js",

package/service-override/vs/workbench/contrib/webview/browser/pre/index.html

@@ -5,7 +5,7 @@
 	<meta charset="UTF-8">
 
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-4iXnHx3puY8EO0djr5yXkmzShogiDoTzrjUeJjTZBmU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-2bgY7b4AY+EULl24tUGduYOHUHUBH5EuIHGYqk8TM+k=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
@@ -53,9 +53,6 @@
 
 		perfMark('scriptStart');
 
-		/** @type {MessageChannel | undefined} */
-		let outerIframeMessageChannel;
-
 		/**
 		 * Use polling to track focus of main webview and iframes within the webview
 		 *
@@ -201,7 +198,7 @@
 			::highlight(current-find-highlight) {
 				background-color: var(--vscode-editor-findMatchBackground);
 			}
-			}`;
+		}`;
 
 		/**
 		 * @param {boolean} allowMultipleAPIAcquire
@@ -258,65 +255,30 @@
 			}
 
 			const swPath = encodeURI(`${serviceWorkerUri}?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
-			navigator.serviceWorker.register(swPath, { type: 'module' })
+			navigator.serviceWorker.register(swPath, { type: 'module', updateViaCache: 'none' })
 				.then(async registration => {
-					/**
-					 * @param {MessageEvent} event
-					 */
-					const versionHandler = async (event) => {
-						if (event.data.channel !== 'version') {
-							return;
-						}
-
-						navigator.serviceWorker.removeEventListener('message', versionHandler);
-						if (event.data.version === expectedWorkerVersion) {
-							return resolve();
-						} else {
-							console.log(`Found unexpected service worker version. Found: ${event.data.version}. Expected: ${expectedWorkerVersion}`);
-							console.log(`Attempting to reload service worker`);
-
-							// If we have the wrong version, try once (and only once) to unregister and re-register
-							// Note that `.update` doesn't seem to work desktop electron at the moment so we use
-							// `unregister` and `register` here.
-							return registration.unregister()
-								.then(() => navigator.serviceWorker.register(swPath))
-								.finally(() => { resolve(); });
-						}
-					};
-					navigator.serviceWorker.addEventListener('message', versionHandler);
-
-					const postVersionMessage = (/** @type {ServiceWorker} */ controller) => {
-						outerIframeMessageChannel = new MessageChannel();
-						controller.postMessage({ channel: 'version' }, [outerIframeMessageChannel.port2]);
-					};
-
-					// At this point, either the service worker is ready and
-					// became our controller, or we need to wait for it.
-					// Note that navigator.serviceWorker.controller could be a
-					// controller from a previously loaded service worker.
-					const currentController = navigator.serviceWorker.controller;
-					if (currentController?.scriptURL.endsWith(swPath)) {
-						// service worker already loaded & ready to receive messages
-						postVersionMessage(currentController);
-					} else {
-						if (currentController) {
-							console.log(`Found unexpected service worker controller. Found: ${currentController.scriptURL}. Expected: ${swPath}. Waiting for controllerchange.`);
-						} else {
-							console.log(`No service worker controller found. Waiting for controllerchange.`);
-						}
+					if (navigator.serviceWorker.controller) {
+						// A previous SW is already controlling. Force an update
+						// check so we don't serve stale resources after a VS Code
+						// update. register() resolves before the update check
+						// completes, so we must call update() explicitly to wait
+						// for the download + byte-comparison to finish.
+						registration = await registration.update();
+					}
 
-						// Either there's no controlling service worker, or it's an old one.
-						// Wait for it to change before posting the message
-						const onControllerChange = () => {
-							navigator.serviceWorker.removeEventListener('controllerchange', onControllerChange);
-							if (navigator.serviceWorker.controller) {
-								postVersionMessage(navigator.serviceWorker.controller);
-							} else {
-								return reject(new Error('No controller found.'));
-							}
-						};
-						navigator.serviceWorker.addEventListener('controllerchange', onControllerChange);
+					// If a new worker was found, wait for it to take control via skipWaiting() + clients.claim() in the SW.
+					if (
+						// New worker
+						registration.installing || registration.waiting
+						// First ever load
+						|| !navigator.serviceWorker.controller
+					) {
+						await new Promise(r => {
+							navigator.serviceWorker.addEventListener('controllerchange', r, { once: true });
+						});
 					}
+
+					return resolve();
 				}).catch(error => {
 					if (!onElectron && error instanceof Error && error.message.includes('user denied permission')) {
 						return reject(new Error(`Could not register service worker. Please make sure third party cookies are enabled: ${error}`));
@@ -460,11 +422,21 @@
 
 		if (!disableServiceWorker) {
 			hostMessaging.onMessage('did-load-resource', (_event, data) => {
-				assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-resource', data }, data.data?.buffer ? [data.data.buffer] : []);
+				const transfer = data.stream ? [data.stream] : [];
+				assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-resource', data }, transfer);
 			});
 
-			hostMessaging.onMessage('did-load-localhost', (_event, data) => {
-				assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-localhost', data });
+			for (const channel of [
+				'did-load-resource-end',
+				'did-load-localhost',
+			]) {
+				hostMessaging.onMessage(channel, (_event, data) => {
+					assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel, data });
+				});
+			}
+
+			hostMessaging.onMessage('did-load-resource-chunk', (_event, data) => {
+				assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-resource-chunk', data }, data.data?.buffer ? [data.data.buffer] : []);
 			});
 
 			navigator.serviceWorker.addEventListener('message', event => {
@@ -711,7 +683,7 @@
 		 * @param {KeyboardEvent} e
 		 * @return {boolean}
 		 */
-		 function isHelp(e) {
+		function isHelp(e) {
 			// 112: keyCode of "F1"
 			return e.keyCode === 112;
 		}
@@ -1220,16 +1192,6 @@
 					unloadMonitor.onIframeLoaded(newFrame);
 				}
 
-				if (!disableServiceWorker && outerIframeMessageChannel) {
-					outerIframeMessageChannel.port1.onmessage = event => {
-						switch (event.data.channel) {
-							case 'load-resource':
-							case 'load-localhost':
-								hostMessaging.postMessage(event.data.channel, event.data);
-								return;
-						}
-					};
-				}
 			});
 
 			// propagate vscode-context-menu-visible class

package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js

@@ -37,7 +37,7 @@ class ContributedCustomEditors extends Disposable {
                 this.add(( new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localize(8474, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(8485, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
                     selector: webviewEditorContribution.selector || [],
                     priority: getPriorityFromContribution(webviewEditorContribution, extension.description, "priority") ?? RegisteredEditorPriority.default,
                     diffEditorPriority: hasCustomEditorPriorityProposal ? getPriorityFromContribution(webviewEditorContribution, extension.description, "diffEditorPriority") : undefined,

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

@@ -6,7 +6,7 @@ import { globMatchesResource, RegisteredEditorPriority, priorityToRank } from '@
 
 const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = ( new RawContextKey("activeCustomEditorId", "", {
     type: "string",
-    description: ( localize(8475, "The viewType of the currently active custom editor."))
+    description: ( localize(8486, "The viewType of the currently active custom editor."))
 }));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( new RawContextKey("focusedCustomEditorIsEditable", false));
 var CustomEditorPriority;

package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js

@@ -25,20 +25,20 @@ const customEditorsContributionSchema = {
         [Fields.viewType]: {
             type: "string",
             markdownDescription: ( localize(
-                8477,
+                8488,
                 "Identifier for the custom editor. This must be unique across all custom editors, so we recommend including your extension id as part of `viewType`. The `viewType` is used when registering custom editors with `vscode.registerCustomEditorProvider` and in the `onCustomEditor:${id}` [activation event](https://code.visualstudio.com/api/references/activation-events)."
             ))
         },
         [Fields.displayName]: {
             type: "string",
             description: ( localize(
-                8478,
+                8489,
                 "Human readable name of the custom editor. This is displayed to users when selecting which editor to use."
             ))
         },
         [Fields.selector]: {
             type: "array",
-            description: ( localize(8479, "Set of globs that the custom editor is enabled for.")),
+            description: ( localize(8490, "Set of globs that the custom editor is enabled for.")),
             items: {
                 type: "object",
                 defaultSnippets: [{
@@ -50,7 +50,7 @@ const customEditorsContributionSchema = {
                 properties: {
                     filenamePattern: {
                         type: "string",
-                        description: ( localize(8480, "Glob that the custom editor is enabled for."))
+                        description: ( localize(8491, "Glob that the custom editor is enabled for."))
                     }
                 }
             }
@@ -58,15 +58,15 @@ const customEditorsContributionSchema = {
         [Fields.priority]: {
             type: "string",
             markdownDescription: ( localize(
-                8481,
+                8492,
                 "Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting."
             )),
             enum: [CustomEditorPriority.default, CustomEditorPriority.option],
             markdownEnumDescriptions: [( localize(
-                8482,
+                8493,
                 "The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource."
             )), ( localize(
-                8483,
+                8494,
                 "The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command."
             ))],
             default: CustomEditorPriority.default
@@ -74,30 +74,30 @@ const customEditorsContributionSchema = {
         [Fields.diffEditorPriority]: {
             type: "string",
             markdownDescription: ( localize(
-                8484,
+                8495,
                 "Controls if the custom editor is enabled automatically when the user opens a diff. When not specified, the value of `priority` is used."
             )),
             enum: [CustomEditorPriority.default, CustomEditorPriority.option],
             markdownEnumDescriptions: [( localize(
-                8485,
+                8496,
                 "The editor is automatically used when the user opens a diff, provided that no other default custom editors are registered for that resource."
             )), ( localize(
-                8486,
+                8497,
                 "The editor is not automatically used when the user opens a diff, but a user can switch to the editor using the `Reopen With` command."
             ))]
         },
         [Fields.mergeEditorPriority]: {
             type: "string",
             markdownDescription: ( localize(
-                8487,
+                8498,
                 "Controls if the custom editor is enabled automatically when the user opens a merge editor. When not specified, the value of `priority` is used."
             )),
             enum: [CustomEditorPriority.default, CustomEditorPriority.option],
             markdownEnumDescriptions: [( localize(
-                8488,
+                8499,
                 "The editor is automatically used when the user opens a merge editor, provided that no other default custom editors are registered for that resource."
             )), ( localize(
-                8489,
+                8500,
                 "The editor is not automatically used when the user opens a merge editor, but a user can switch to the editor using the `Reopen With` command."
             ))]
         }
@@ -107,7 +107,7 @@ const customEditorsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "customEditors",
     deps: [languagesExtPoint],
     jsonSchema: {
-        description: ( localize(8490, "Contributed custom editors.")),
+        description: ( localize(8501, "Contributed custom editors.")),
         type: "array",
         defaultSnippets: [{
             body: [{
@@ -148,7 +148,7 @@ class CustomEditorsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(8491, "View Type")), ( localize(8492, "Priority")), ( localize(8493, "Filename Pattern"))];
+        const headers = [( localize(8502, "View Type")), ( localize(8503, "Priority")), ( localize(8504, "Filename Pattern"))];
         const rows = ( customEditors.map(customEditor => {
             return [
                 customEditor.viewType,
@@ -167,7 +167,7 @@ class CustomEditorsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "customEditors",
-    label: ( localize(8494, "Custom Editors")),
+    label: ( localize(8505, "Custom Editors")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.js

@@ -206,8 +206,8 @@ let LanguageStatus = class LanguageStatus {
                 isOneBusy = isOneBusy || (!isPinned && status.busy);
             }
             const props = {
-                name: ( localize(10586, "Editor Language Status")),
-                ariaLabel: ( localize(10587, "Editor Language Status: {0}", ariaLabels.join(", next: "))),
+                name: ( localize(10597, "Editor Language Status")),
+                ariaLabel: ( localize(10598, "Editor Language Status: {0}", ariaLabels.join(", next: "))),
                 tooltip: this._combinedEntryTooltip,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? "$(loading~spin)" : text
@@ -325,7 +325,7 @@ let LanguageStatus = class LanguageStatus {
         const actionBar = ( new ActionBar(right, {
             hoverDelegate: nativeHoverDelegate
         }));
-        const actionLabel = isPinned ? ( localize(10588, "Remove from Status Bar")) : ( localize(10589, "Add to Status Bar"));
+        const actionLabel = isPinned ? ( localize(10599, "Remove from Status Bar")) : ( localize(10600, "Add to Status Bar"));
         actionBar.setAriaLabel(actionLabel);
         store.add(actionBar);
         let action;
@@ -393,11 +393,11 @@ let LanguageStatus = class LanguageStatus {
         const textValue = typeof status.label === "string" ? status.label : status.label.value;
         if (status.detail) {
             return {
-                label: ( localize(10590, "{0}, {1}", textValue, status.detail))
+                label: ( localize(10601, "{0}, {1}", textValue, status.detail))
             };
         } else {
             return {
-                label: ( localize(10591, "{0}", textValue))
+                label: ( localize(10602, "{0}", textValue))
             };
         }
     }
@@ -410,7 +410,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === "string" ? item.label : item.label.shortValue;
         return {
-            name: ( localize(10592, "{0} (Language Status)", item.name)),
+            name: ( localize(10603, "{0} (Language Status)", item.name)),
             text: computeText(textValue, item.busy),
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -428,7 +428,7 @@ class ResetAction extends Action2 {
     constructor() {
         super({
             id: "editor.inlayHints.Reset",
-            title: ( localize2(10593, "Reset Language Status Interaction Counter")),
+            title: ( localize2(10604, "Reset Language Status Interaction Counter")),
             category: Categories.View,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js

@@ -13,7 +13,7 @@ import { FoldingController } from '@codingame/monaco-vscode-api/vscode/vs/editor
 import { ColorDetector } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
 
 const openSettingsCommand = "workbench.action.openSettings";
-const configureSettingsLabel = ( localize(10594, "Configure"));
+const configureSettingsLabel = ( localize(10605, "Configure"));
 let LimitIndicatorContribution = class LimitIndicatorContribution extends Disposable {
     constructor(editorService, languageStatusService) {
         super();
@@ -38,9 +38,9 @@ LimitIndicatorContribution = ( __decorate([( __param(0, IEditorService)), ( __pa
 class ColorDecorationAccessor {
     constructor() {
         this.id = "decoratorsLimitInfo";
-        this.name = ( localize(10595, "Color Decorator Status"));
-        this.label = ( localize(10596, "Color decorators"));
-        this.source = ( localize(10597, "Color Decorators"));
+        this.name = ( localize(10606, "Color Decorator Status"));
+        this.label = ( localize(10607, "Color decorators"));
+        this.source = ( localize(10608, "Color Decorators"));
         this.settingsId = "editor.colorDecoratorsLimit";
     }
     getLimitReporter(editor) {
@@ -50,9 +50,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = "foldingLimitInfo";
-        this.name = ( localize(10598, "Folding Status"));
-        this.label = ( localize(10599, "Folding ranges"));
-        this.source = ( localize(10600, "Folding"));
+        this.name = ( localize(10609, "Folding Status"));
+        this.label = ( localize(10610, "Folding ranges"));
+        this.source = ( localize(10611, "Folding"));
         this.settingsId = "editor.foldingMaximumRegions";
     }
     getLimitReporter(editor) {
@@ -94,7 +94,7 @@ class LanguageStatusEntry {
                 name: this.accessor.name,
                 severity: Severity.Warning,
                 label: this.accessor.label,
-                detail: ( localize(10601, "only {0} shown for performance reasons", info.limited)),
+                detail: ( localize(10612, "only {0} shown for performance reasons", info.limited)),
                 command: {
                     id: openSettingsCommand,
                     arguments: [this.accessor.settingsId],

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

@@ -65,7 +65,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: "_open.mergeEditor",
-            title: ( localize2(11226, "Open Merge Editor"))
+            title: ( localize2(11251, "Open Merge Editor"))
         });
     }
     run(accessor, ...args) {
@@ -152,7 +152,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: "merge.mixedLayout",
-            title: ( localize2(11227, "Mixed Layout")),
+            title: ( localize2(11252, "Mixed Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo("mixed")),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -176,7 +176,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: "merge.columnLayout",
-            title: ( localize2(11228, "Column Layout")),
+            title: ( localize2(11253, "Column Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo("columns")),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -200,7 +200,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: "merge.showNonConflictingChanges",
-            title: ( localize2(11229, "Show Non-Conflicting Changes")),
+            title: ( localize2(11254, "Show Non-Conflicting Changes")),
             toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -224,7 +224,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: "merge.showBase",
-            title: ( localize2(11230, "Show Base")),
+            title: ( localize2(11255, "Show Base")),
             toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -247,7 +247,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: "merge.showBaseTop",
-            title: ( localize2(11231, "Show Base Top")),
+            title: ( localize2(11256, "Show Base Top")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -270,7 +270,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: "merge.showBaseCenter",
-            title: ( localize2(11232, "Show Base Center")),
+            title: ( localize2(11257, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -289,13 +289,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(11233, "Merge Editor"));
+const mergeEditorCategory = ( localize2(11258, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: "merge.openResult",
             icon: Codicon.goToFile,
-            title: ( localize2(11234, "Open File")),
+            title: ( localize2(11259, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -318,7 +318,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: "merge.goToNextUnhandledConflict",
             category: mergeEditorCategory,
-            title: ( localize2(11235, "Go to Next Unhandled Conflict")),
+            title: ( localize2(11260, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -340,7 +340,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: "merge.goToPreviousUnhandledConflict",
             category: mergeEditorCategory,
-            title: ( localize2(11236, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(11261, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -362,7 +362,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: "merge.toggleActiveConflictInput1",
             category: mergeEditorCategory,
-            title: ( localize2(11237, "Toggle Current Conflict from Left")),
+            title: ( localize2(11262, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -376,7 +376,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: "merge.toggleActiveConflictInput2",
             category: mergeEditorCategory,
-            title: ( localize2(11238, "Toggle Current Conflict from Right")),
+            title: ( localize2(11263, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -390,8 +390,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.compareInput1WithBase",
             category: mergeEditorCategory,
-            title: ( localize2(11239, "Compare Input 1 With Base")),
-            shortTitle: ( localize(11240, "Compare With Base")),
+            title: ( localize2(11264, "Compare Input 1 With Base")),
+            shortTitle: ( localize(11265, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -411,8 +411,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.compareInput2WithBase",
             category: mergeEditorCategory,
-            title: ( localize2(11241, "Compare Input 2 With Base")),
-            shortTitle: ( localize(11240, "Compare With Base")),
+            title: ( localize2(11266, "Compare Input 2 With Base")),
+            shortTitle: ( localize(11265, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -457,7 +457,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: "merge.openBaseEditor",
             category: mergeEditorCategory,
-            title: ( localize2(11242, "Open Base File")),
+            title: ( localize2(11267, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -472,7 +472,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: "merge.acceptAllInput1",
             category: mergeEditorCategory,
-            title: ( localize2(11243, "Accept All Incoming Changes from Left")),
+            title: ( localize2(11268, "Accept All Incoming Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -491,7 +491,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: "merge.acceptAllInput2",
             category: mergeEditorCategory,
-            title: ( localize2(11244, "Accept All Current Changes from Right")),
+            title: ( localize2(11269, "Accept All Current Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -510,8 +510,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.resetResultToBaseAndAutoMerge",
             category: mergeEditorCategory,
-            title: ( localize2(11245, "Reset Result")),
-            shortTitle: ( localize(11246, "Reset")),
+            title: ( localize2(11270, "Reset Result")),
+            shortTitle: ( localize(11271, "Reset")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -530,7 +530,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: "mergeEditor.resetCloseWithConflictsChoice",
             category: mergeEditorCategory,
-            title: ( localize2(11247, "Reset Choice for 'Close with Conflicts'")),
+            title: ( localize2(11272, "Reset Choice for 'Close with Conflicts'")),
             f1: true
         });
     }
@@ -543,7 +543,7 @@ class AcceptAllCombination extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptAllCombination",
             category: mergeEditorCategory,
-            title: ( localize2(11248, "Accept All Combination")),
+            title: ( localize2(11273, "Accept All Combination")),
             f1: true
         });
     }
@@ -572,7 +572,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptMerge",
             category: mergeEditorCategory,
-            title: ( localize2(11249, "Complete Merge")),
+            title: ( localize2(11274, "Complete Merge")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [{
@@ -597,12 +597,12 @@ class AcceptMerge extends MergeEditorAction2 {
                 confirmed
             } = await dialogService.confirm({
                 message: ( localize(
-                    11250,
+                    11275,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(11251, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(11252, "&&Complete with Conflicts"))
+                detail: ( localize(11276, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(11277, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {
@@ -622,7 +622,7 @@ class ToggleBetweenInputs extends MergeEditorAction2 {
         super({
             id: "mergeEditor.toggleBetweenInputs",
             category: mergeEditorCategory,
-            title: ( localize2(11253, "Toggle Between Merge Editor Inputs")),
+            title: ( localize2(11278, "Toggle Between Merge Editor Inputs")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [{