@codingame/monaco-vscode-view-common-service-override 13.0.0 → 13.1.1

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(7168, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(7186, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(7169, "Copy Merge Editor State as JSON")),
+            title: ( localize2(7187, "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(7170, 'Merge Editor')),
-                message: ( localize(7171, "No active merge editor"))
+                name: ( localize(7188, 'Merge Editor')),
+                message: ( localize(7189, "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(7170, 'Merge Editor')),
-            message: ( localize(7172, "Successfully copied merge editor state")),
+            name: ( localize(7188, 'Merge Editor')),
+            message: ( localize(7190, "Successfully copied merge editor state")),
         });
     }
 }
@@ -62,7 +62,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(7173, "Save Merge Editor State to Folder")),
+            title: ( localize2(7191, "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(7170, 'Merge Editor')),
-                message: ( localize(7171, "No active merge editor"))
+                name: ( localize(7188, 'Merge Editor')),
+                message: ( localize(7189, "No active merge editor"))
             });
             return;
         }
@@ -89,7 +89,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(7174, 'Select folder to save to'))
+            title: ( localize(7192, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -107,8 +107,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(7170, 'Merge Editor')),
-            message: ( localize(7175, "Successfully saved merge editor state to folder")),
+            name: ( localize(7188, 'Merge Editor')),
+            message: ( localize(7193, "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(7176, "Load Merge Editor State from Folder")),
+            title: ( localize2(7194, "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(7174, 'Select folder to save to'))
+                title: ( localize(7192, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -14,7 +14,7 @@ import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverCon
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(7177, "Merge Editor"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(7195, "Merge Editor"))), [
     ( new SyncDescriptor(MergeEditorInput))
 ]);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -25,8 +25,8 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(7178, "Uses the legacy diffing algorithm.")),
-                ( localize(7179, "Uses the advanced diffing algorithm.")),
+                ( localize(7196, "Uses the legacy diffing algorithm.")),
+                ( localize(7197, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {

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(7212, 'The background color for changes.')));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(7213, 'The background color for word changes.')));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(7214, 'The background color for changes in base.')));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(7215, 'The background color for word changes in base.')));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(7216, 'The border color of unhandled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(7217, 'The border color of unhandled focused conflicts.')));
-registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(7218, 'The border color of handled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(7219, 'The border color of handled focused conflicts.')));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(7220, 'The foreground color for changes in input 1.')));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(7221, 'The foreground color for changes in input 1.')));
-registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(7222, 'The background of the "Conflicting Lines" text.')));
+registerColor('mergeEditor.change.background', '#9bb95533', ( localize(7230, 'The background color for changes.')));
+registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(7231, 'The background color for word changes.')));
+registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(7232, 'The background color for changes in base.')));
+registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(7233, 'The background color for word changes in base.')));
+registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(7234, 'The border color of unhandled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(7235, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(7236, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(7237, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(7238, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(7239, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(7240, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(7223, 'The background color of decorations in input 1.')));
-registerColor('mergeEditor.conflict.input2.background', ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(7224, 'The background color of decorations in input 2.')));
+registerColor('mergeEditor.conflict.input1.background', ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(7241, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(7242, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -118,16 +118,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(7243, 'Base'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(7261, 'Base'))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    7244,
+                    7262,
                     'Comparing with {0}',
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(7245, 'Differences are highlighted with a background color.'));
+                const tooltip = ( localize(7263, '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

@@ -157,8 +157,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(7246, 'Input 1'))
-                : vm.model.input2.title || ( localize(7247, 'Input 2'));
+                ? vm.model.input1.title || ( localize(7264, 'Input 1'))
+                : vm.model.input2.title || ( localize(7265, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -240,19 +240,19 @@ class ModifiedBaseRangeGutterItemModel {
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localize(7248, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(7266, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(7248, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(7266, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(7249, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(7267, '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(7250, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(7268, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( new Action('mergeEditor.markAsHandled', ( localize(7251, 'Mark as Handled')), undefined, true, () => {
+            setFields(( new Action('mergeEditor.markAsHandled', ( localize(7269, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -295,10 +295,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(7252, "Accept")) },
-                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(7253, "Accept (result is dirty)")) },
-                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(7254, "Undo accept")) },
-                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(7255, "Undo accept (currently second)")) },
+                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(7270, "Accept")) },
+                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(7271, "Accept (result is dirty)")) },
+                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(7272, "Undo accept")) },
+                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(7273, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

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

@@ -133,7 +133,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(7256, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(7274, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
         const remainingConflictsActionBar = this._register(( new ActionBar(this.htmlElements.detail)));
@@ -148,8 +148,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localize(7257, '{0} Conflict Remaining', count))
-                : ( localize(7258, '{0} Conflicts Remaining ', count));
+                ? ( localize(7275, '{0} Conflict Remaining', count))
+                : ( localize(7276, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -161,8 +161,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).get());
                 },
                 tooltip: count > 0
-                    ? ( localize(7259, 'Go to next conflict'))
-                    : ( localize(7260, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(7277, 'Go to next conflict'))
+                    : ( localize(7278, '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.js

@@ -126,7 +126,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(7261, "Text Merge Editor");
+        return localize(7279, "Text Merge Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;

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

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

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(7915, "Keyboard Layout"));
+        const name = ( localize(7933, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(7916, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(7934, "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(7916, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(7934, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -49,7 +49,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(7916, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(7934, "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(
-        7917,
+        7935,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        7918,
+        7936,
         '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(7919, "Change Keyboard Layout")),
+            title: ( localize2(7937, "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(7920, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(7938, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(7921, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(7939, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(7922, "Auto Detect")),
+            label: ( localize(7940, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(7923, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(7941, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +144,7 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw ( new Error(( localize(7924, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(7942, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

@@ -20,7 +20,7 @@ import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platfo
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                8403,
+                8421,
                 "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."
             ))
         },
@@ -30,7 +30,7 @@ import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platfo
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                8404,
+                8422,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },

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(10394, 'Whether a type hierarchy provider is available'))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(10395, 'Whether type hierarchy peek is currently showing'))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(10412, 'Whether a type hierarchy provider is available'))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(10413, 'Whether type hierarchy peek is currently showing'))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(10396, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(10414, '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(10397, "No results")));
+                this._widget.showMessage(( localize(10415, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(10398, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(10416, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -148,7 +148,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(10399, 'Peek Type Hierarchy')),
+            title: ( localize2(10417, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -167,7 +167,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(10400, 'Show Supertypes')),
+            title: ( localize2(10418, '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(10401, 'Show Subtypes')),
+            title: ( localize2(10419, '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(10402, 'Refocus Type Hierarchy')),
+            title: ( localize2(10420, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -227,7 +227,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(10403, 'Close')),
+            title: ( localize(10421, 'Close')),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

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

@@ -262,13 +262,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === TypeHierarchyDirection.Supertypes
-            ? ( localize(10404, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(10405, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(10422, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(10423, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(10406, "Loading...")));
+        this.setTitle(( localize(10424, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -287,8 +287,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(10407, "No supertypes of '{0}'", model.root.name))
-                : ( localize(10408, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(10425, "No supertypes of '{0}'", model.root.name))
+                : ( localize(10426, "No subtypes of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

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

@@ -105,14 +105,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(10409, "Type Hierarchy");
+        return localize(10427, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(10410, "supertypes of {0}", element.item.name);
+            return localize(10428, "supertypes of {0}", element.item.name);
         }
         else {
-            return localize(10411, "subtypes of {0}", element.item.name);
+            return localize(10429, "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-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
 export declare class OverlayWebview extends Disposable implements IOverlayWebview {
     private readonly _layoutService;

package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.js

@@ -7,7 +7,7 @@ import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monac
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED } from '@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
 
 let OverlayWebview = class OverlayWebview extends Disposable {

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

@@ -1,8 +1,8 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IWorkbenchColorTheme } from "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
-import { IWorkbenchThemeService } from "@codingame/monaco-vscode-3dd5b442-bfbc-5b1d-8f4a-7567530c75f5-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service";
-import { WebviewStyles } from "@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWorkbenchThemeService } from "@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service";
+import { WebviewStyles } from "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview";
 interface WebviewThemeData {
     readonly activeTheme: string;
     readonly themeLabel: string;

package/vscode/src/vs/workbench/contrib/webview/browser/themeing.js

@@ -17,7 +17,7 @@ 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';
 import { ColorScheme } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/theme';
-import { IWorkbenchThemeService } from '@codingame/monaco-vscode-3dd5b442-bfbc-5b1d-8f4a-7567530c75f5-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
+import { IWorkbenchThemeService } from '@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
 
 let WebviewThemeDataProvider = class WebviewThemeDataProvider extends Disposable {
     constructor(_themeService, _configurationService) {

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

@@ -16,7 +16,7 @@ import { IRemoteAuthorityResolverService } from "@codingame/monaco-vscode-api/vs
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { ITunnelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnel.service";
 import { WebviewThemeDataProvider } from "./themeing.js";
-import { IWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent } from "@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent } from "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { WebviewFindDelegate, WebviewFindWidget } from "./webviewFindWidget.js";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { CodeWindow } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/window";

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -25,7 +25,7 @@ import { ITunnelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { WebviewPortMappingManager } from '../../../../platform/webview/common/webviewPortMapping.js';
 import { parentOriginHash } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/iframe';
 import { loadLocalResource, WebviewResourceResponse } from './resourceLoading.js';
-import { areWebviewContentOptionsEqual } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { areWebviewContentOptionsEqual } from '@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview';
 import { WebviewFindWidget } from './webviewFindWidget.js';
 import { decodeAuthority, webviewRootResourceAuthority, webviewGenericCspSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/common/webview';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
@@ -159,7 +159,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(10709, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(10727, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {

package/vscode/src/vs/workbench/contrib/webview/browser/webviewFindWidget.js

@@ -5,7 +5,7 @@ import { IContextViewService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { SimpleFindWidget } from '@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
-import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview';
 
 let WebviewFindWidget = class WebviewFindWidget extends SimpleFindWidget {
     async _getResultCount(dataChanged) {

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { WebviewThemeDataProvider } from "./themeing.js";
-import { IOverlayWebview, IWebview, IWebviewElement, WebviewInitInfo } from "@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IOverlayWebview, IWebview, IWebviewElement, WebviewInitInfo } from "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
 export declare class WebviewService extends Disposable implements IWebviewService {
     protected readonly _instantiationService: IInstantiationService;