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

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

@@ -92,14 +92,14 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localize(11017, "Manual Resolution")),
-                    tooltip: ( localize(11018, "This conflict has been resolved manually."))
+                    text: ( localize(11319, "Manual Resolution")),
+                    tooltip: ( localize(11320, "This conflict has been resolved manually."))
                 });
             } else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localize(11019, "No Changes Accepted")),
+                    text: ( localize(11321, "No Changes Accepted")),
                     tooltip: ( localize(
-                        11020,
+                        11322,
                         "The current resolution of this conflict equals the common ancestor of both the right and left changes."
                     ))
                 });
@@ -120,33 +120,33 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localize(11021, "Remove {0}", model.input1.title)), async () => {
+                stateToggles.push(command(( localize(11323, "Remove {0}", model.input1.title)), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, state.withInputValue(1, false), true, tx);
                         model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
                     });
-                }, ( localize(11022, "Remove {0} from the result document.", model.input1.title))));
+                }, ( localize(11324, "Remove {0} from the result document.", model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localize(11021, "Remove {0}", model.input2.title)), async () => {
+                stateToggles.push(command(( localize(11323, "Remove {0}", model.input2.title)), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
                         model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
                     });
-                }, ( localize(11022, "Remove {0} from the result document.", model.input2.title))));
+                }, ( localize(11324, "Remove {0} from the result document.", model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both && state.firstInput === 2) {
                 stateToggles.reverse();
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localize(11023, "Reset to base")), async () => {
+                result.push(command(( localize(11325, "Reset to base")), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
                 }, ( localize(
-                    11024,
+                    11326,
                     "Reset this conflict to the common ancestor of both the right and left changes."
                 ))));
             }
@@ -178,7 +178,7 @@ class ActionsSource {
             const otherInputNumber = inputNumber === 1 ? 2 : 1;
             if (state.kind !== ModifiedBaseRangeStateKind.unrecognized && !state.isInputIncluded(inputNumber)) {
                 if (!state.isInputIncluded(otherInputNumber) || !this.viewModel.shouldUseAppendInsteadOfAccept.read(reader)) {
-                    result.push(command(( localize(11025, "Accept {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11327, "Accept {0}", inputData.title)), async () => {
                         transaction(tx => {
                             model.setState(
                                 modifiedBaseRange,
@@ -188,9 +188,9 @@ class ActionsSource {
                             );
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11026, "Accept {0} in the result document.", inputData.title))));
+                    }, ( localize(11328, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        const commandName = modifiedBaseRange.isOrderRelevant ? ( localize(11027, "Accept Combination ({0} First)", inputData.title)) : ( localize(11028, "Accept Combination"));
+                        const commandName = modifiedBaseRange.isOrderRelevant ? ( localize(11329, "Accept Combination ({0} First)", inputData.title)) : ( localize(11330, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction(tx => {
                                 model.setState(
@@ -202,12 +202,12 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11029,
+                            11331,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 } else {
-                    result.push(command(( localize(11030, "Append {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11332, "Append {0}", inputData.title)), async () => {
                         transaction(tx => {
                             model.setState(
                                 modifiedBaseRange,
@@ -217,9 +217,9 @@ class ActionsSource {
                             );
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11031, "Append {0} to the result document.", inputData.title))));
+                    }, ( localize(11333, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localize(11032, "Accept Combination", inputData.title)), async () => {
+                        result.push(command(( localize(11334, "Accept Combination", inputData.title)), async () => {
                             transaction(tx => {
                                 model.setState(
                                     modifiedBaseRange,
@@ -230,17 +230,17 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11029,
+                            11331,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localize(11033, "Ignore")), async () => {
+                    result.push(command(( localize(11335, "Ignore")), async () => {
                         transaction(tx => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localize(11034, "Don't take this side of the conflict."))));
+                    }, ( localize(11336, "Don't take this side of the conflict."))));
                 }
             }
             return result;

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

@@ -38,7 +38,7 @@ class EditorGutter extends Disposable {
                 width: "100%"
             }
         }).root);
-        const o = this._register(( new DisposableResizeObserver(() => {
+        const o = this._register(( new DisposableResizeObserver("EditorGutter.domNodeSizeChange", () => {
             transaction(tx => {
                 this.domNodeSizeChanged.trigger(tx);
             });

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

@@ -122,16 +122,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11035, "Base"))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11337, "Base"))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    11036,
+                    11338,
                     "Comparing with {0}",
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(11037, "Differences are highlighted with a background color."));
+                const tooltip = ( localize(11339, "Differences are highlighted with a background color."));
                 node = h("span", {
                     title: tooltip
                 }, [label]).root;

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

@@ -178,7 +178,7 @@ 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(11038, "Input 1")) : vm.model.input2.title || ( localize(11039, "Input 2"));
+            const title = this.inputNumber === 1 ? vm.model.input1.title || ( localize(11340, "Input 1")) : vm.model.input2.title || ( localize(11341, "Input 2"));
             const description = this.inputNumber === 1 ? vm.model.input1.description : vm.model.input2.description;
             const detail = this.inputNumber === 1 ? vm.model.input1.detail : vm.model.input2.detail;
             reset(this.htmlElements.title, ...renderLabelWithIcons(title));
@@ -255,16 +255,16 @@ class ModifiedBaseRangeGutterItemModel {
         }
         const both = state.includesInput1 && state.includesInput2;
         return [
-            this.baseRange.input1Diffs.length > 0 ? action("mergeEditor.acceptInput1", ( localize(11040, "Accept {0}", this.model.input1.title)), state.toggle(1), state.includesInput1) : undefined,
-            this.baseRange.input2Diffs.length > 0 ? action("mergeEditor.acceptInput2", ( localize(11040, "Accept {0}", this.model.input2.title)), state.toggle(2), state.includesInput2) : undefined,
-            this.baseRange.isConflicting ? setFields(action("mergeEditor.acceptBoth", ( localize(11041, "Accept Both")), state.withInputValue(1, !both).withInputValue(2, !both), both), {
+            this.baseRange.input1Diffs.length > 0 ? action("mergeEditor.acceptInput1", ( localize(11342, "Accept {0}", this.model.input1.title)), state.toggle(1), state.includesInput1) : undefined,
+            this.baseRange.input2Diffs.length > 0 ? action("mergeEditor.acceptInput2", ( localize(11342, "Accept {0}", this.model.input2.title)), state.toggle(2), state.includesInput2) : undefined,
+            this.baseRange.isConflicting ? setFields(action("mergeEditor.acceptBoth", ( localize(11343, "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(11042, "Swap")), state.swap(), false), {
+            this.baseRange.isConflicting ? setFields(action("mergeEditor.swap", ( localize(11344, "Swap")), state.swap(), false), {
                 enabled: !state.kind && (!both || this.baseRange.isOrderRelevant)
             }) : undefined,
-            setFields(( new Action("mergeEditor.markAsHandled", ( localize(11043, "Mark as Handled")), undefined, true, () => {
+            setFields(( new Action("mergeEditor.markAsHandled", ( localize(11345, "Mark as Handled")), undefined, true, () => {
                 transaction(tx => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -311,22 +311,22 @@ class MergeConflictGutterItemView extends Disposable {
                 [InputState.excluded]: {
                     icon: undefined,
                     checked: false,
-                    title: ( localize(11044, "Accept"))
+                    title: ( localize(11346, "Accept"))
                 },
                 [InputState.unrecognized]: {
                     icon: Codicon.circleFilled,
                     checked: false,
-                    title: ( localize(11045, "Accept (result is dirty)"))
+                    title: ( localize(11347, "Accept (result is dirty)"))
                 },
                 [InputState.first]: {
                     icon: Codicon.check,
                     checked: true,
-                    title: ( localize(11046, "Undo accept"))
+                    title: ( localize(11348, "Undo accept"))
                 },
                 [InputState.second]: {
                     icon: Codicon.checkAll,
                     checked: true,
-                    title: ( localize(11047, "Undo accept (currently second)"))
+                    title: ( localize(11349, "Undo accept (currently second)"))
                 }
             };
             const state = iconMap[value];

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

@@ -139,7 +139,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11048, "Result"))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11350, "Result"))));
             reset(
                 this.htmlElements.description,
                 ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, {
@@ -158,7 +158,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             const count = model.unhandledConflictsCount.read(reader);
-            const text = count === 1 ? ( localize(11049, "{0} Conflict Remaining", count)) : ( localize(11050, "{0} Conflicts Remaining ", count));
+            const text = count === 1 ? ( localize(11351, "{0} Conflict Remaining", count)) : ( localize(11352, "{0} Conflicts Remaining ", count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -169,7 +169,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.model.telemetry.reportConflictCounterClicked();
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).read(undefined));
                 },
-                tooltip: count > 0 ? ( localize(11051, "Go to next conflict")) : ( localize(11052, "All conflicts handled, the merge can be completed now."))
+                tooltip: count > 0 ? ( localize(11353, "Go to next conflict")) : ( localize(11354, "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

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

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

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

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

@@ -26,11 +26,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(11771, "Keyboard Layout"));
+        const name = ( localize(12073, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(11772, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(12074, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -42,7 +42,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(11772, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(12074, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -50,7 +50,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                     command: KEYBOARD_LAYOUT_OPEN_PICKER
                 });
             } else {
-                const text = ( localize(11772, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(12074, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -68,17 +68,17 @@ registerWorkbenchContribution2(
     WorkbenchPhase.BlockStartup
 );
 const DEFAULT_CONTENT = [`// ${( localize(
-    11773,
+    12075,
     "Defines the keyboard layout used in VS Code in the browser environment."
 ))}`, `// ${( localize(
-    11774,
+    12076,
     "Open VS Code and run \"Developer: Inspect Key Mappings (JSON)\" from Command Palette."
 ))}`, ``, `// Once you have the keyboard layout info, please paste it below.`, "\n"].join("\n");
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(11775, "Change Keyboard Layout")),
+            title: ( localize2(12077, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -113,21 +113,21 @@ registerAction2(class extends Action2 {
             const platform = isMacintosh ? "Mac" : isWindows ? "Win" : "Linux";
             picks.unshift({
                 type: "separator",
-                label: ( localize(11776, "Keyboard Layouts ({0})", platform))
+                label: ( localize(12078, "Keyboard Layouts ({0})", platform))
             });
         }
         const configureKeyboardLayout = {
-            label: ( localize(11777, "Configure Keyboard Layout"))
+            label: ( localize(12079, "Configure Keyboard Layout"))
         };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(11778, "Auto Detect")),
+            label: ( localize(12080, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localize(11779, "Select Keyboard Layout")),
+            placeHolder: ( localize(12081, "Select Keyboard Layout")),
             matchOnDescription: true
         });
         if (!pick) {
@@ -153,7 +153,7 @@ registerAction2(class extends Action2 {
                     }
                 });
             }, error => {
-                throw ( new Error(( localize(11780, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(12082, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

@@ -21,7 +21,7 @@ registerWorkbenchContribution2(
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                12341,
+                12646,
                 "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."
             ))
         },
@@ -31,7 +31,7 @@ registerWorkbenchContribution2(
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                12342,
+                12647,
                 "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

@@ -122,8 +122,8 @@ let SyncScroll = class SyncScroll extends Disposable {
     toggleStatusbarItem(active) {
         if (active) {
             if (!this.statusBarEntry.value) {
-                const text = ( localize(12559, "Scrolling Locked"));
-                const tooltip = ( localize(12560, "Lock Scrolling Enabled"));
+                const text = ( localize(12847, "Scrolling Locked"));
+                const tooltip = ( localize(12848, "Lock Scrolling Enabled"));
                 this.statusBarEntry.value = this.statusbarService.addEntry({
                     name: text,
                     text,
@@ -148,13 +148,13 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.toggleLockedScrolling",
                     title: {
-                        ...( localize2(12561, "Toggle Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(12562, "Locked Scrolling"))
+                        ...( localize2(12849, "Toggle Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(12850, "Locked Scrolling"))
                     },
                     category: Categories.View,
                     f1: true,
                     metadata: {
-                        description: ( localize(12563, "Synchronize Scrolling Editors"))
+                        description: ( localize(12851, "Synchronize Scrolling Editors"))
                     }
                 });
             }
@@ -167,8 +167,8 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.holdLockedScrolling",
                     title: {
-                        ...( localize2(12564, "Hold Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(12565, "Locked Scrolling"))
+                        ...( localize2(12852, "Hold Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(12853, "Locked Scrolling"))
                     },
                     category: Categories.View
                 });

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

@@ -22,11 +22,11 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(14943, "Whether a type hierarchy provider is available"))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(14944, "Whether type hierarchy peek is currently showing"))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(15248, "Whether a type hierarchy provider is available"))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(15249, "Whether type hierarchy peek is currently showing"))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey("typeHierarchyDirection", undefined, {
     type: "string",
-    description: ( localize(14945, "whether type hierarchy shows super types or subtypes"))
+    description: ( localize(15250, "whether type hierarchy shows super types or subtypes"))
 }));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes ? candidate : TypeHierarchyDirection.Subtypes;
@@ -121,14 +121,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._sessionDisposables.add(model);
                 this._widget.showModel(model);
             } else {
-                this._widget.showMessage(( localize(14946, "No results")));
+                this._widget.showMessage(( localize(15251, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(14947, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(15252, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -179,7 +179,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showTypeHierarchy",
-            title: ( localize2(14948, "Peek Type Hierarchy")),
+            title: ( localize2(15253, "Peek Type Hierarchy")),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: "navigation",
@@ -198,7 +198,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSupertypes",
-            title: ( localize2(14949, "Show Supertypes")),
+            title: ( localize2(15254, "Show Supertypes")),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
@@ -220,7 +220,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSubtypes",
-            title: ( localize2(14950, "Show Subtypes")),
+            title: ( localize2(15255, "Show Subtypes")),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
@@ -242,7 +242,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.refocusTypeHierarchy",
-            title: ( localize2(14951, "Refocus Type Hierarchy")),
+            title: ( localize2(15256, "Refocus Type Hierarchy")),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -258,7 +258,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.closeTypeHierarchy",
-            title: ( localize(14952, "Close")),
+            title: ( localize(15257, "Close")),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

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

@@ -326,12 +326,12 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(14953, "Supertypes of '{0}'", element.model.root.name)) : ( localize(14954, "Subtypes of '{0}'", element.model.root.name));
+        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15258, "Supertypes of '{0}'", element.model.root.name)) : ( localize(15259, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset["state"] = State.Loading;
-        this.setTitle(( localize(14955, "Loading...")));
+        this.setTitle(( localize(15260, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -349,7 +349,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         const root = this._tree.getNode(model).children[0];
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
-            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(14956, "No supertypes of '{0}'", model.root.name)) : ( localize(14957, "No subtypes of '{0}'", model.root.name)));
+            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15261, "No supertypes of '{0}'", model.root.name)) : ( localize(15262, "No subtypes of '{0}'", model.root.name)));
         } else {
             this._parent.dataset["state"] = State.Data;
             if (!viewState || this._tree.getFocus().length === 0) {

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

@@ -123,13 +123,13 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(14958, "Type Hierarchy");
+        return localize(15263, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(14959, "supertypes of {0}", element.item.name);
+            return localize(15264, "supertypes of {0}", element.item.name);
         } else {
-            return localize(14960, "subtypes of {0}", element.item.name);
+            return localize(15265, "subtypes of {0}", element.item.name);
         }
     }
 }

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

@@ -1,4 +1,3 @@
-import { Dimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
 import { IMouseWheelEvent } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent";
 import { CodeWindow } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/window";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
@@ -41,6 +40,7 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
     readonly providedViewType?: string;
     origin: string;
     private _overlayLayout;
+    private _anchorState;
     constructor(initInfo: WebviewInitInfo, _layoutService: IWorkbenchLayoutService, _webviewService: IWebviewService, _baseContextKeyService: IContextKeyService);
     get isFocused(): boolean;
     private _isDisposed;
@@ -48,9 +48,10 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
     readonly onDidDispose: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     dispose(): void;
     get container(): HTMLElement;
+    private get overlayLayout();
     claim(owner: unknown, targetWindow: CodeWindow, scopedContextKeyService: IContextKeyService | undefined): void;
     release(owner: unknown): void;
-    layoutWebviewOverElement(anchorElement: HTMLElement, dimension?: Dimension, clippingContainer?: HTMLElement): void;
+    setAnchorElement(anchorElement: HTMLElement, clippingContainer?: HTMLElement): void;
     private _show;
     setHtml(html: string): void;
     setTitle(title: string): void;

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

@@ -80,13 +80,16 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         if (this._isDisposed) {
             throw ( new Error(`OverlayWebview has been disposed`));
         }
+        return this.overlayLayout.content;
+    }
+    get overlayLayout() {
         if (!this._overlayLayout) {
             this._overlayLayout = ( new OverlayLayoutElement());
             this._overlayLayout.content.style.visibility = "hidden";
             const root = this._layoutService.getContainer(this.window);
             root.appendChild(this._overlayLayout.root);
         }
-        return this._overlayLayout.content;
+        return this._overlayLayout;
     }
     claim(owner, targetWindow, scopedContextKeyService) {
         if (this._isDisposed) {
@@ -103,6 +106,11 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         this._owner = owner;
         this._windowId = targetWindow.vscodeWindowId;
         this._show(targetWindow);
+        if (this._anchorState) {
+            this.overlayLayout.setAnchorElement(this._anchorState.anchorElement, {
+                clippingContainer: this._anchorState.clippingContainer
+            });
+        }
         if (oldOwner !== owner) {
             const contextKeyService = (scopedContextKeyService || this._baseContextKeyService);
             this._scopedContextKeyService.clear();
@@ -134,13 +142,13 @@ let OverlayWebview = class OverlayWebview extends Disposable {
             this._webviewEvents.clear();
         }
     }
-    layoutWebviewOverElement(anchorElement, dimension, clippingContainer) {
-        if (!this._overlayLayout || !this._overlayLayout.content.parentElement) {
-            return;
-        }
-        this._overlayLayout?.layoutOverAnchorElement(anchorElement, {
-            clippingContainer,
-            fallbackDimension: dimension
+    setAnchorElement(anchorElement, clippingContainer) {
+        this._anchorState = {
+            anchorElement,
+            clippingContainer
+        };
+        this.overlayLayout.setAnchorElement(anchorElement, {
+            clippingContainer
         });
     }
     _show(targetWindow) {