@codingame/monaco-vscode-view-common-service-override 23.1.0 → 23.2.0

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

@@ -14,13 +14,13 @@ import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxIsMergeEditor } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const MERGE_EDITOR_CATEGORY = ( localize2(8920, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(8939, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(8921, "Copy Merge Editor State as JSON")),
+            title: ( localize2(8940, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -32,8 +32,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(8922, 'Merge Editor')),
-                message: ( localize(8923, "No active merge editor"))
+                name: ( localize(8941, 'Merge Editor')),
+                message: ( localize(8942, "No active merge editor"))
             });
             return;
         }
@@ -52,8 +52,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(8922, 'Merge Editor')),
-            message: ( localize(8924, "Successfully copied merge editor state")),
+            name: ( localize(8941, 'Merge Editor')),
+            message: ( localize(8943, "Successfully copied merge editor state")),
         });
     }
 }
@@ -62,7 +62,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(8925, "Save Merge Editor State to Folder")),
+            title: ( localize2(8944, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -76,8 +76,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(8922, 'Merge Editor')),
-                message: ( localize(8923, "No active merge editor"))
+                name: ( localize(8941, 'Merge Editor')),
+                message: ( localize(8942, "No active merge editor"))
             });
             return;
         }
@@ -89,7 +89,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(8926, 'Select folder to save to'))
+            title: ( localize(8945, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -107,8 +107,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(8922, 'Merge Editor')),
-            message: ( localize(8927, "Successfully saved merge editor state to folder")),
+            name: ( localize(8941, 'Merge Editor')),
+            message: ( localize(8946, "Successfully saved merge editor state to folder")),
         });
     }
 }
@@ -117,7 +117,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(8928, "Load Merge Editor State from Folder")),
+            title: ( localize2(8947, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -136,7 +136,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(8926, 'Select folder to save to'))
+                title: ( localize(8945, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -16,7 +16,7 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibilityHelp.js';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(8929, "Merge Editor"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(8948, "Merge Editor"))), [
     ( new SyncDescriptor(MergeEditorInput))
 ]);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -27,8 +27,8 @@ import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibility
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(8930, "Uses the legacy diffing algorithm.")),
-                ( localize(8931, "Uses the advanced diffing algorithm.")),
+                ( localize(8949, "Uses the legacy diffing algorithm.")),
+                ( localize(8950, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {

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

@@ -19,22 +19,22 @@ class MergeEditorAccessibilityHelpProvider {
             return;
         }
         const content = [
-            ( localize(8932, "You are in a merge editor.")),
+            ( localize(8951, "You are in a merge editor.")),
             ( localize(
-            8933,
+            8952,
             "Navigate between merge conflicts using the commands Go to Next Unhandled Conflict{0} and Go to Previous Unhandled Conflict{1}.",
             '<keybinding:merge.goToNextUnhandledConflict>',
             '<keybinding:merge.goToPreviousUnhandledConflict>'
         )),
             ( localize(
-            8934,
+            8953,
             "Run the command Merge Editor: Accept All Incoming Changes from the Left{0} and Merge Editor: Accept All Current Changes from the Right{1}",
             '<keybinding:merge.acceptAllInput1>',
             '<keybinding:merge.acceptAllInput2>'
         )),
-            ( localize(8935, "Complete the Merge{0}.", '<keybinding:mergeEditor.acceptMerge>')),
+            ( localize(8954, "Complete the Merge{0}.", '<keybinding:mergeEditor.acceptMerge>')),
             ( localize(
-            8936,
+            8955,
             "Toggle between merge editor inputs, incoming and current changes {0}.",
             '<keybinding:mergeEditor.toggleBetweenInputs>'
         )),

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

@@ -12,19 +12,19 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 
-registerColor('mergeEditor.change.background', '#9bb95533', ( localize(8972, 'The background color for changes.')));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(8973, 'The background color for word changes.')));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(8974, 'The background color for changes in base.')));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(8975, 'The background color for word changes in base.')));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(8976, 'The border color of unhandled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(8977, 'The border color of unhandled focused conflicts.')));
-registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(8978, 'The border color of handled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(8979, 'The border color of handled focused conflicts.')));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(8980, 'The foreground color for changes in input 1.')));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(8981, 'The foreground color for changes in input 1.')));
-registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(8982, 'The background of the "Conflicting Lines" text.')));
+registerColor('mergeEditor.change.background', '#9bb95533', ( localize(8991, 'The background color for changes.')));
+registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(8992, 'The background color for word changes.')));
+registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(8993, 'The background color for changes in base.')));
+registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(8994, 'The background color for word changes in base.')));
+registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(8995, 'The border color of unhandled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(8996, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(8997, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(8998, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(8999, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(9000, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(9001, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(8983, 'The background color of decorations in input 1.')));
-registerColor('mergeEditor.conflict.input2.background', ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(8984, 'The background color of decorations in input 2.')));
+registerColor('mergeEditor.conflict.input1.background', ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(9002, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(9003, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -114,16 +114,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9003, 'Base'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9022, 'Base'))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    9004,
+                    9023,
                     'Comparing with {0}',
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(9005, 'Differences are highlighted with a background color.'));
+                const tooltip = ( localize(9024, 'Differences are highlighted with a background color.'));
                 node = h('span', { title: tooltip }, [label]).root;
             }
             reset(this.htmlElements.description, ...(node ? [node] : []));

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

@@ -155,8 +155,8 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             }
             this.editor.setModel(this.inputNumber === 1 ? vm.model.input1.textModel : vm.model.input2.textModel);
             const title = this.inputNumber === 1
-                ? vm.model.input1.title || ( localize(9006, 'Input 1'))
-                : vm.model.input2.title || ( localize(9007, 'Input 2'));
+                ? vm.model.input1.title || ( localize(9025, 'Input 1'))
+                : vm.model.input2.title || ( localize(9026, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -238,19 +238,19 @@ class ModifiedBaseRangeGutterItemModel {
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localize(9008, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(9027, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(9008, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(9027, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(9009, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(9028, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
                 : undefined,
             ( new Separator()),
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.swap', ( localize(9010, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(9029, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( new Action('mergeEditor.markAsHandled', ( localize(9011, 'Mark as Handled')), undefined, true, () => {
+            setFields(( new Action('mergeEditor.markAsHandled', ( localize(9030, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -293,10 +293,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(9012, "Accept")) },
-                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(9013, "Accept (result is dirty)")) },
-                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(9014, "Undo accept")) },
-                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(9015, "Undo accept (currently second)")) },
+                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(9031, "Accept")) },
+                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(9032, "Accept (result is dirty)")) },
+                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(9033, "Undo accept")) },
+                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(9034, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

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

@@ -131,7 +131,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9016, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9035, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
         const remainingConflictsActionBar = this._register(( new ActionBar(this.htmlElements.detail)));
@@ -146,8 +146,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localize(9017, '{0} Conflict Remaining', count))
-                : ( localize(9018, '{0} Conflicts Remaining ', count));
+                ? ( localize(9036, '{0} Conflict Remaining', count))
+                : ( localize(9037, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -159,8 +159,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).read(undefined));
                 },
                 tooltip: count > 0
-                    ? ( localize(9019, 'Go to next conflict'))
-                    : ( localize(9020, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(9038, 'Go to next conflict'))
+                    : ( localize(9039, 'All conflicts handled, the merge can be completed now.')),
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.d.ts

@@ -16,7 +16,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { AbstractTextEditor } from "@codingame/monaco-vscode-a6a3e03d-2b1a-5e17-b904-ed5d40c14550-common/vscode/vs/workbench/browser/parts/editor/textEditor";
+import { AbstractTextEditor } from "@codingame/monaco-vscode-0b011daf-0f15-57de-bd5b-8953592c556c-common/vscode/vs/workbench/browser/parts/editor/textEditor";
 import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
 import { IMergeEditorInputModel } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel";

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

@@ -23,7 +23,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { AbstractTextEditor } from '@codingame/monaco-vscode-a6a3e03d-2b1a-5e17-b904-ed5d40c14550-common/vscode/vs/workbench/browser/parts/editor/textEditor';
+import { AbstractTextEditor } from '@codingame/monaco-vscode-0b011daf-0f15-57de-bd5b-8953592c556c-common/vscode/vs/workbench/browser/parts/editor/textEditor';
 import { DEFAULT_EDITOR_ASSOCIATION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { applyTextEditorOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorOptions';
 import { readTransientState, writeTransientState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
@@ -118,7 +118,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(9021, "Text Merge Editor");
+        return localize(9040, "Text Merge Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;

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

@@ -222,7 +222,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(9022, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(9041, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

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

@@ -3,7 +3,7 @@ import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { CompareResult } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { MergeEditorLineRange } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { join } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
-import { ConflictActionsFactory, ActionsSource } from '@codingame/monaco-vscode-2a04f0cd-b806-5886-909e-418183d32279-common/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
+import { ConflictActionsFactory, ActionsSource } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
 import { getAlignments } from './lineAlignment.js';
 
 class ViewZoneComputer {

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -24,11 +24,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(9690, "Keyboard Layout"));
+        const name = ( localize(9709, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(9691, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(9710, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -40,7 +40,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(9691, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9710, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -49,7 +49,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(9691, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9710, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -67,11 +67,11 @@ KeyboardLayoutPickerContribution = ( __decorate([
 registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, WorkbenchPhase.BlockStartup);
 const DEFAULT_CONTENT = [
     `// ${( localize(
-        9692,
+        9711,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        9693,
+        9712,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -82,7 +82,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(9694, "Change Keyboard Layout")),
+            title: ( localize2(9713, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -112,17 +112,17 @@ registerAction2(class extends Action2 {
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localize(9695, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(9714, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(9696, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(9715, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(9697, "Auto Detect")),
+            label: ( localize(9716, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9698, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9717, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +144,7 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw ( new Error(( localize(9699, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(9718, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

@@ -18,7 +18,7 @@ registerWorkbenchContribution2(SashSettingsController.ID, SashSettingsController
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                10250,
+                10269,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -28,7 +28,7 @@ registerWorkbenchContribution2(SashSettingsController.ID, SashSettingsController
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                10251,
+                10270,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },

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

@@ -117,8 +117,8 @@ let SyncScroll = class SyncScroll extends Disposable {
     toggleStatusbarItem(active) {
         if (active) {
             if (!this.statusBarEntry.value) {
-                const text = ( localize(10467, 'Scrolling Locked'));
-                const tooltip = ( localize(10468, 'Lock Scrolling Enabled'));
+                const text = ( localize(10486, 'Scrolling Locked'));
+                const tooltip = ( localize(10487, 'Lock Scrolling Enabled'));
                 this.statusBarEntry.value = this.statusbarService.addEntry({
                     name: text,
                     text,
@@ -144,13 +144,13 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: 'workbench.action.toggleLockedScrolling',
                     title: {
-                        ...( localize2(10469, "Toggle Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(10470, "Locked Scrolling")),
+                        ...( localize2(10488, "Toggle Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10489, "Locked Scrolling")),
                     },
                     category: Categories.View,
                     f1: true,
                     metadata: {
-                        description: ( localize(10471, "Synchronize Scrolling Editors")),
+                        description: ( localize(10490, "Synchronize Scrolling Editors")),
                     }
                 });
             }
@@ -163,8 +163,8 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: 'workbench.action.holdLockedScrolling',
                     title: {
-                        ...( localize2(10472, "Hold Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(10473, "Locked Scrolling")),
+                        ...( localize2(10491, "Hold Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10492, "Locked Scrolling")),
                     },
                     category: Categories.View,
                 });

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

@@ -22,12 +22,12 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(12629, 'Whether a type hierarchy provider is available'))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(12630, 'Whether type hierarchy peek is currently showing'))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(12648, 'Whether a type hierarchy provider is available'))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(12649, 'Whether type hierarchy peek is currently showing'))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(12631, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(12650, 'whether type hierarchy shows super types or subtypes')) }
 ));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
@@ -96,14 +96,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(12632, "No results")));
+                this._widget.showMessage(( localize(12651, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(12633, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(12652, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -148,7 +148,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(12634, 'Peek Type Hierarchy')),
+            title: ( localize2(12653, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -167,7 +167,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(12635, 'Show Supertypes')),
+            title: ( localize2(12654, 'Show Supertypes')),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
@@ -189,7 +189,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSubtypes',
-            title: ( localize2(12636, 'Show Subtypes')),
+            title: ( localize2(12655, 'Show Subtypes')),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
@@ -211,7 +211,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusTypeHierarchy',
-            title: ( localize2(12637, 'Refocus Type Hierarchy')),
+            title: ( localize2(12656, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -227,7 +227,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(12638, 'Close')),
+            title: ( localize(12657, 'Close')),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js

@@ -265,13 +265,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === TypeHierarchyDirection.Supertypes
-            ? ( localize(12639, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(12640, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(12658, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(12659, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(12641, "Loading...")));
+        this.setTitle(( localize(12660, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -290,8 +290,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === TypeHierarchyDirection.Supertypes
-                ? ( localize(12642, "No supertypes of '{0}'", model.root.name))
-                : ( localize(12643, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(12661, "No supertypes of '{0}'", model.root.name))
+                : ( localize(12662, "No subtypes of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js

@@ -106,14 +106,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(12644, "Type Hierarchy");
+        return localize(12663, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(12645, "supertypes of {0}", element.item.name);
+            return localize(12664, "supertypes of {0}", element.item.name);
         }
         else {
-            return localize(12646, "subtypes of {0}", element.item.name);
+            return localize(12665, "subtypes of {0}", element.item.name);
         }
     }
 }

package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.d.ts

@@ -6,7 +6,7 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
-import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from "@codingame/monaco-vscode-2a04f0cd-b806-5886-909e-418183d32279-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
 /**
  * Webview that is absolutely positioned over another element and that can creates and destroys an underlying webview as needed.