@codingame/monaco-vscode-view-common-service-override 21.3.1 → 21.3.3

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(8649, 'Input 1'))
-                : vm.model.input2.title || ( localize(8650, 'Input 2'));
+                ? vm.model.input1.title || ( localize(8655, 'Input 1'))
+                : vm.model.input2.title || ( localize(8656, '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(8651, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(8657, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(8651, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(8657, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(8652, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(8658, '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(8653, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(8659, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( new Action('mergeEditor.markAsHandled', ( localize(8654, 'Mark as Handled')), undefined, true, () => {
+            setFields(( new Action('mergeEditor.markAsHandled', ( localize(8660, '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(8655, "Accept")) },
-                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(8656, "Accept (result is dirty)")) },
-                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(8657, "Undo accept")) },
-                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(8658, "Undo accept (currently second)")) },
+                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(8661, "Accept")) },
+                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(8662, "Accept (result is dirty)")) },
+                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(8663, "Undo accept")) },
+                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(8664, "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(8659, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(8665, '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(8660, '{0} Conflict Remaining', count))
-                : ( localize(8661, '{0} Conflicts Remaining ', count));
+                ? ( localize(8666, '{0} Conflict Remaining', count))
+                : ( localize(8667, '{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).get());
                 },
                 tooltip: count > 0
-                    ? ( localize(8662, 'Go to next conflict'))
-                    : ( localize(8663, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(8668, 'Go to next conflict'))
+                    : ( localize(8669, '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

@@ -118,7 +118,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(8664, "Text Merge Editor");
+        return localize(8670, "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(8665, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(8671, "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(9351, "Keyboard Layout"));
+        const name = ( localize(9357, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(9352, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(9358, "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(9352, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9358, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -49,7 +49,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(9352, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9358, "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(
-        9353,
+        9359,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        9354,
+        9360,
         '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(9355, "Change Keyboard Layout")),
+            title: ( localize2(9361, "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(9356, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(9362, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(9357, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(9363, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(9358, "Auto Detect")),
+            label: ( localize(9364, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9359, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9365, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +144,7 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw ( new Error(( localize(9360, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(9366, "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(
-                9883,
+                9889,
                 "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(
-                9884,
+                9890,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },

package/vscode/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.contribution.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,6 @@
+
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { SyncScroll } from './scrollLocking.js';
+
+registerWorkbenchContribution2(SyncScroll.ID, SyncScroll, WorkbenchPhase.Eventually
+);

package/vscode/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.d.ts

@@ -0,0 +1,26 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IStatusbarService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service";
+export declare class SyncScroll extends Disposable implements IWorkbenchContribution {
+    private readonly editorService;
+    private readonly statusbarService;
+    static readonly ID = "workbench.contrib.syncScrolling";
+    private readonly paneInitialScrollTop;
+    private readonly syncScrollDispoasbles;
+    private readonly paneDisposables;
+    private readonly statusBarEntry;
+    private isActive;
+    constructor(editorService: IEditorService, statusbarService: IStatusbarService);
+    private registerActiveListeners;
+    private activate;
+    toggle(): void;
+    private _reentrancyBarrier;
+    private trackVisiblePanes;
+    private onDidEditorPaneScroll;
+    private getAllVisiblePanes;
+    private deactivate;
+    private toggleStatusbarItem;
+    private registerActions;
+    dispose(): void;
+}

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

@@ -0,0 +1,195 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
+import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { SideBySideEditor } from '@codingame/monaco-vscode-bc6d9a89-1625-5010-b57e-ff44151144fe-common/vscode/vs/workbench/browser/parts/editor/sideBySideEditor';
+import { isEditorPaneWithScrolling } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { ReentrancyBarrier } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/base/common/controlFlow';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { StatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
+import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
+
+let SyncScroll = class SyncScroll extends Disposable {
+    static { this.ID = 'workbench.contrib.syncScrolling'; }
+    constructor(editorService, statusbarService) {
+        super();
+        this.editorService = editorService;
+        this.statusbarService = statusbarService;
+        this.paneInitialScrollTop = ( new Map());
+        this.syncScrollDispoasbles = this._register(( new DisposableStore()));
+        this.paneDisposables = ( new DisposableStore());
+        this.statusBarEntry = this._register(( new MutableDisposable()));
+        this.isActive = false;
+        this._reentrancyBarrier = ( new ReentrancyBarrier());
+        this.registerActions();
+    }
+    registerActiveListeners() {
+        this.syncScrollDispoasbles.add(this.editorService.onDidVisibleEditorsChange(() => this.trackVisiblePanes()));
+    }
+    activate() {
+        this.registerActiveListeners();
+        this.trackVisiblePanes();
+    }
+    toggle() {
+        if (this.isActive) {
+            this.deactivate();
+        }
+        else {
+            this.activate();
+        }
+        this.isActive = !this.isActive;
+        this.toggleStatusbarItem(this.isActive);
+    }
+    trackVisiblePanes() {
+        this.paneDisposables.clear();
+        this.paneInitialScrollTop.clear();
+        for (const pane of this.getAllVisiblePanes()) {
+            if (!isEditorPaneWithScrolling(pane)) {
+                continue;
+            }
+            this.paneInitialScrollTop.set(pane, pane.getScrollPosition());
+            this.paneDisposables.add(pane.onDidChangeScroll(() => this._reentrancyBarrier.runExclusivelyOrSkip(() => {
+                this.onDidEditorPaneScroll(pane);
+            })));
+        }
+    }
+    onDidEditorPaneScroll(scrolledPane) {
+        const scrolledPaneInitialOffset = this.paneInitialScrollTop.get(scrolledPane);
+        if (scrolledPaneInitialOffset === undefined) {
+            throw ( new Error('Scrolled pane not tracked'));
+        }
+        if (!isEditorPaneWithScrolling(scrolledPane)) {
+            throw ( new Error('Scrolled pane does not support scrolling'));
+        }
+        const scrolledPaneCurrentPosition = scrolledPane.getScrollPosition();
+        const scrolledFromInitial = {
+            scrollTop: scrolledPaneCurrentPosition.scrollTop - scrolledPaneInitialOffset.scrollTop,
+            scrollLeft: scrolledPaneCurrentPosition.scrollLeft !== undefined && scrolledPaneInitialOffset.scrollLeft !== undefined ? scrolledPaneCurrentPosition.scrollLeft - scrolledPaneInitialOffset.scrollLeft : undefined,
+        };
+        for (const pane of this.getAllVisiblePanes()) {
+            if (pane === scrolledPane) {
+                continue;
+            }
+            if (!isEditorPaneWithScrolling(pane)) {
+                continue;
+            }
+            const initialOffset = this.paneInitialScrollTop.get(pane);
+            if (initialOffset === undefined) {
+                throw ( new Error('Could not find initial offset for pane'));
+            }
+            const currentPanePosition = pane.getScrollPosition();
+            const newPaneScrollPosition = {
+                scrollTop: initialOffset.scrollTop + scrolledFromInitial.scrollTop,
+                scrollLeft: initialOffset.scrollLeft !== undefined && scrolledFromInitial.scrollLeft !== undefined ? initialOffset.scrollLeft + scrolledFromInitial.scrollLeft : undefined,
+            };
+            if (currentPanePosition.scrollTop === newPaneScrollPosition.scrollTop && currentPanePosition.scrollLeft === newPaneScrollPosition.scrollLeft) {
+                continue;
+            }
+            pane.setScrollPosition(newPaneScrollPosition);
+        }
+    }
+    getAllVisiblePanes() {
+        const panes = [];
+        for (const pane of this.editorService.visibleEditorPanes) {
+            if (pane instanceof SideBySideEditor) {
+                const primaryPane = pane.getPrimaryEditorPane();
+                const secondaryPane = pane.getSecondaryEditorPane();
+                if (primaryPane) {
+                    panes.push(primaryPane);
+                }
+                if (secondaryPane) {
+                    panes.push(secondaryPane);
+                }
+                continue;
+            }
+            panes.push(pane);
+        }
+        return panes;
+    }
+    deactivate() {
+        this.paneDisposables.clear();
+        this.syncScrollDispoasbles.clear();
+        this.paneInitialScrollTop.clear();
+    }
+    toggleStatusbarItem(active) {
+        if (active) {
+            if (!this.statusBarEntry.value) {
+                const text = ( localize(10101, 'Scrolling Locked'));
+                const tooltip = ( localize(10102, 'Lock Scrolling Enabled'));
+                this.statusBarEntry.value = this.statusbarService.addEntry({
+                    name: text,
+                    text,
+                    tooltip,
+                    ariaLabel: text,
+                    command: {
+                        id: 'workbench.action.toggleLockedScrolling',
+                        title: ''
+                    },
+                    kind: 'prominent',
+                    showInAllWindows: true
+                }, 'status.scrollLockingEnabled', StatusbarAlignment.RIGHT, 102);
+            }
+        }
+        else {
+            this.statusBarEntry.clear();
+        }
+    }
+    registerActions() {
+        const $this = this;
+        this._register(registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: 'workbench.action.toggleLockedScrolling',
+                    title: {
+                        ...( localize2(10103, "Toggle Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10104, "Locked Scrolling")),
+                    },
+                    category: Categories.View,
+                    f1: true,
+                    metadata: {
+                        description: ( localize(10105, "Synchronize Scrolling Editors")),
+                    }
+                });
+            }
+            run() {
+                $this.toggle();
+            }
+        }));
+        this._register(registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: 'workbench.action.holdLockedScrolling',
+                    title: {
+                        ...( localize2(10106, "Hold Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10107, "Locked Scrolling")),
+                    },
+                    category: Categories.View,
+                });
+            }
+            run(accessor) {
+                const keybindingService = accessor.get(IKeybindingService);
+                $this.toggle();
+                const holdMode = keybindingService.enableKeybindingHoldMode('workbench.action.holdLockedScrolling');
+                if (!holdMode) {
+                    return;
+                }
+                holdMode.finally(() => {
+                    $this.toggle();
+                });
+            }
+        }));
+    }
+    dispose() {
+        this.deactivate();
+        super.dispose();
+    }
+};
+SyncScroll = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, IStatusbarService))
+], SyncScroll));
+
+export { SyncScroll };

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(12184, 'Whether a type hierarchy provider is available'))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(12185, 'Whether type hierarchy peek is currently showing'))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(12197, 'Whether a type hierarchy provider is available'))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(12198, 'Whether type hierarchy peek is currently showing'))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(12186, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(12199, '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(12187, "No results")));
+                this._widget.showMessage(( localize(12200, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(12188, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(12201, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -148,7 +148,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(12189, 'Peek Type Hierarchy')),
+            title: ( localize2(12202, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -167,7 +167,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(12190, 'Show Supertypes')),
+            title: ( localize2(12203, '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(12191, 'Show Subtypes')),
+            title: ( localize2(12204, '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(12192, 'Refocus Type Hierarchy')),
+            title: ( localize2(12205, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -227,7 +227,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(12193, 'Close')),
+            title: ( localize(12206, '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(12194, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(12195, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(12207, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(12208, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(12196, "Loading...")));
+        this.setTitle(( localize(12209, "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(12197, "No supertypes of '{0}'", model.root.name))
-                : ( localize(12198, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(12210, "No supertypes of '{0}'", model.root.name))
+                : ( localize(12211, "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(12199, "Type Hierarchy");
+        return localize(12212, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(12200, "supertypes of {0}", element.item.name);
+            return localize(12213, "supertypes of {0}", element.item.name);
         }
         else {
-            return localize(12201, "subtypes of {0}", element.item.name);
+            return localize(12214, "subtypes of {0}", element.item.name);
         }
     }
 }

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

@@ -158,7 +158,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(12501, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(12514, "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/webviewPanel/browser/webviewCommands.js

@@ -15,7 +15,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 const webviewActiveContextKeyExpr = ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', WebviewEditor.ID)), ( EditorContextKeys.focus.toNegated() )));
 class ShowWebViewEditorFindWidgetAction extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.showFind'; }
-    static { this.LABEL = ( localize(12502, "Show find")); }
+    static { this.LABEL = ( localize(12515, "Show find")); }
     constructor() {
         super({
             id: ShowWebViewEditorFindWidgetAction.ID,
@@ -36,7 +36,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
 }
 class HideWebViewEditorFindCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.hideFind'; }
-    static { this.LABEL = ( localize(12503, "Stop find")); }
+    static { this.LABEL = ( localize(12516, "Stop find")); }
     constructor() {
         super({
             id: HideWebViewEditorFindCommand.ID,
@@ -57,7 +57,7 @@ class HideWebViewEditorFindCommand extends Action2 {
 }
 class WebViewEditorFindNextCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findNext'; }
-    static { this.LABEL = ( localize(12504, 'Find next')); }
+    static { this.LABEL = ( localize(12517, 'Find next')); }
     constructor() {
         super({
             id: WebViewEditorFindNextCommand.ID,
@@ -78,7 +78,7 @@ class WebViewEditorFindNextCommand extends Action2 {
 }
 class WebViewEditorFindPreviousCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
-    static { this.LABEL = ( localize(12505, 'Find previous')); }
+    static { this.LABEL = ( localize(12518, 'Find previous')); }
     constructor() {
         super({
             id: WebViewEditorFindPreviousCommand.ID,
@@ -99,7 +99,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
 }
 class ReloadWebviewAction extends Action2 {
     static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
-    static { this.LABEL = ( localize2(12506, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(12519, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

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

@@ -18,7 +18,7 @@ import '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vsc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
-(( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(12508, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
+(( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(12521, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
     static { this.ID = 'workbench.contrib.webviewPanel'; }
     constructor(editorService, editorGroupService) {