@codingame/monaco-vscode-view-common-service-override 11.1.2 → 12.0.0

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { findLast } from 'vscode/vscode/vs/base/common/arraysFind';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { observableValue, transaction } from 'vscode/vscode/vs/base/common/observableInternal/base';
@@ -9,10 +10,11 @@ import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived
 import 'vscode/vscode/vs/base/common/cancellation';
 import { derivedObservableWithWritableCache } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { LineRange } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 
 let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
@@ -27,7 +29,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
         this.configurationService = configurationService;
         this.notificationService = notificationService;
         this.manuallySetActiveModifiedBaseRange = observableValue(this, { range: undefined, counter: 0 });
-        this.attachedHistory = this._register(( (new AttachedHistory(this.model.resultTextModel))));
+        this.attachedHistory = this._register(( new AttachedHistory(this.model.resultTextModel)));
         this.shouldUseAppendInsteadOfAccept = observableConfigValue('mergeEditor.shouldUseAppendInsteadOfAccept', false, this.configurationService);
         this.counter = 0;
         this.lastFocusedEditor = derivedObservableWithWritableCache(this, (reader, lastValue) => {
@@ -56,7 +58,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
                 return undefined;
             }
             const selections = sourceEditor.selection.read(reader) || [];
-            const rangesInBase = ( (selections.map((selection) => {
+            const rangesInBase = ( selections.map((selection) => {
                 if (sourceEditor === this.inputCodeEditorView1) {
                     return this.model.translateInputRangeToBase(1, selection);
                 }
@@ -72,7 +74,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
                 else {
                     return selection;
                 }
-            })));
+            }));
             return {
                 rangesInBase,
                 sourceEditor
@@ -106,10 +108,10 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
             const baseRangeStates = [];
             for (const change of e.changes) {
                 const rangeInBase = this.model.translateResultRangeToBase(Range.lift(change.range));
-                const baseRanges = this.model.findModifiedBaseRangesInRange(( (new LineRange(
+                const baseRanges = this.model.findModifiedBaseRangesInRange(( new LineRange(
                     rangeInBase.startLineNumber,
                     rangeInBase.endLineNumber - rangeInBase.startLineNumber
-                ))));
+                )));
                 if (baseRanges.length === 1) {
                     const isHandled = this.model.isHandled(baseRanges[0]).get();
                     if (!isHandled) {
@@ -186,7 +188,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
                 lineNumber: startLineNumber,
                 column: editor.editor.getModel().getLineFirstNonWhitespaceColumn(startLineNumber),
             });
-            editor.editor.revealLinesNearTop(startLineNumber, endLineNumberExclusive, 0 );
+            editor.editor.revealLinesNearTop(startLineNumber, endLineNumberExclusive, ScrollType.Smooth);
         }
     }
     goToNextModifiedBaseRange(predicate) {
@@ -206,7 +208,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(11486, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(7262, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {
@@ -221,10 +223,10 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
         });
     }
 };
-MergeEditorViewModel = ( (__decorate([
-    ( (__param(6, IConfigurationService))),
-    ( (__param(7, INotificationService)))
-], MergeEditorViewModel)));
+MergeEditorViewModel = ( __decorate([
+    ( __param(6, IConfigurationService)),
+    ( __param(7, INotificationService))
+], MergeEditorViewModel));
 class AttachedHistory extends Disposable {
     constructor(model) {
         super();

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

@@ -0,0 +1,29 @@
+import { DisposableStore } from "vscode/vscode/vs/base/common/lifecycle";
+import { IReader } from "vscode/vscode/vs/base/common/observable";
+import { ICodeEditor, IViewZoneChangeAccessor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+import { MergeEditorViewModel } from "./viewModel.js";
+export declare class ViewZoneComputer {
+    private readonly input1Editor;
+    private readonly input2Editor;
+    private readonly resultEditor;
+    private readonly conflictActionsFactoryInput1;
+    private readonly conflictActionsFactoryInput2;
+    private readonly conflictActionsFactoryResult;
+    constructor(input1Editor: ICodeEditor, input2Editor: ICodeEditor, resultEditor: ICodeEditor);
+    computeViewZones(reader: IReader, viewModel: MergeEditorViewModel, options: {
+        shouldAlignResult: boolean;
+        shouldAlignBase: boolean;
+        codeLensesVisible: boolean;
+        showNonConflictingChanges: boolean;
+    }): MergeEditorViewZones;
+}
+export declare class MergeEditorViewZones {
+    readonly input1ViewZones: readonly MergeEditorViewZone[];
+    readonly input2ViewZones: readonly MergeEditorViewZone[];
+    readonly baseViewZones: readonly MergeEditorViewZone[];
+    readonly resultViewZones: readonly MergeEditorViewZone[];
+    constructor(input1ViewZones: readonly MergeEditorViewZone[], input2ViewZones: readonly MergeEditorViewZone[], baseViewZones: readonly MergeEditorViewZone[], resultViewZones: readonly MergeEditorViewZone[]);
+}
+export declare abstract class MergeEditorViewZone {
+    abstract create(viewZoneChangeAccessor: IViewZoneChangeAccessor, viewZoneIdsToCleanUp: string[], disposableStore: DisposableStore): void;
+}

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

@@ -1,8 +1,9 @@
+
 import { $ } from 'vscode/vscode/vs/base/browser/dom';
 import { CompareResult } from 'vscode/vscode/vs/base/common/arrays';
-import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { join } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
-import { ConflictActionsFactory, ActionsSource } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
+import { LineRange } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { join } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { ConflictActionsFactory, ActionsSource } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
 import { getAlignments } from './lineAlignment.js';
 
 class ViewZoneComputer {

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.d.ts

@@ -0,0 +1,11 @@
+import { IStatusbarService } from "vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IKeyboardLayoutService } from "vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+export declare class KeyboardLayoutPickerContribution extends Disposable implements IWorkbenchContribution {
+    private readonly keyboardLayoutService;
+    private readonly statusbarService;
+    static readonly ID = "workbench.contrib.keyboardLayoutPicker";
+    private readonly pickerElement;
+    constructor(keyboardLayoutService: IKeyboardLayoutService, statusbarService: IStatusbarService);
+}

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

@@ -1,11 +1,13 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { parseKeyboardLayoutDescription, areKeyboardLayoutsEqual, getKeyboardLayoutId } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
+import { parseKeyboardLayoutDescription, areKeyboardLayoutsEqual, getKeyboardLayoutId } from '@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
 import { IKeyboardLayoutService } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout.service';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { KEYBOARD_LAYOUT_OPEN_PICKER } from 'vscode/vscode/vs/workbench/contrib/preferences/common/preferences';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { KEYBOARD_LAYOUT_OPEN_PICKER } from '@codingame/monaco-vscode-0f5ced28-abde-558b-8652-db8e7d4d64aa-common/vscode/vs/workbench/contrib/preferences/common/preferences';
 import { isMacintosh, isWindows } from 'vscode/vscode/vs/base/common/platform';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -21,24 +23,24 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         super();
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
-        this.pickerElement = this._register(( (new MutableDisposable())));
-        const name = ( localize(4454, "Keyboard Layout"));
+        this.pickerElement = this._register(( new MutableDisposable()));
+        const name = ( localize(7915, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(4455, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(7916, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
                 ariaLabel: text,
                 command: KEYBOARD_LAYOUT_OPEN_PICKER
-            }, 'status.workbench.keyboardLayout', 1 );
+            }, 'status.workbench.keyboardLayout', StatusbarAlignment.RIGHT);
         }
         this._register(this.keyboardLayoutService.onDidChangeKeyboardLayout(() => {
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(4455, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(7916, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -47,29 +49,29 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(4455, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(7916, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
                     ariaLabel: text,
                     command: KEYBOARD_LAYOUT_OPEN_PICKER
-                }, 'status.workbench.keyboardLayout', 1 );
+                }, 'status.workbench.keyboardLayout', StatusbarAlignment.RIGHT);
             }
         }));
     }
 };
-KeyboardLayoutPickerContribution = ( (__decorate([
-    ( (__param(0, IKeyboardLayoutService))),
-    ( (__param(1, IStatusbarService)))
-], KeyboardLayoutPickerContribution)));
-registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, 1 );
+KeyboardLayoutPickerContribution = ( __decorate([
+    ( __param(0, IKeyboardLayoutService)),
+    ( __param(1, IStatusbarService))
+], KeyboardLayoutPickerContribution));
+registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, WorkbenchPhase.BlockStartup);
 const DEFAULT_CONTENT = [
     `// ${( localize(
-        4456,
+        7917,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        4457,
+        7918,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -80,7 +82,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(4458, "Change Keyboard Layout")),
+            title: ( localize2(7919, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -95,7 +97,7 @@ registerAction2(class extends Action2 {
         const currentLayout = keyboardLayoutService.getCurrentKeyboardLayout();
         const layoutConfig = configurationService.getValue('keyboard.layout');
         const isAutoDetect = layoutConfig === 'autodetect';
-        const picks = ( (layouts.map(layout => {
+        const picks = ( layouts.map(layout => {
             const picked = !isAutoDetect && areKeyboardLayoutsEqual(currentLayout, layout);
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             return {
@@ -105,22 +107,22 @@ registerAction2(class extends Action2 {
                 description: layoutInfo.description + (picked ? ' (Current layout)' : ''),
                 picked: !isAutoDetect && areKeyboardLayoutsEqual(currentLayout, layout)
             };
-        }))).sort((a, b) => {
+        })).sort((a, b) => {
             return a.label < b.label ? -1 : (a.label > b.label ? 1 : 0);
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localize(4459, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(7920, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(4460, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(7921, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(4461, "Auto Detect")),
+            label: ( localize(7922, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(4462, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(7923, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -142,9 +144,7 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw ( (new Error(
-                    localize(4463, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
-                )));
+                throw ( new Error(( localize(7924, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

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

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

@@ -1,14 +1,16 @@
+
 import { localize } from 'vscode/vscode/vs/nls';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { SashSettingsController } from './sash.js';
 import { isIOS } from 'vscode/vscode/vs/base/common/platform';
 
-( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SashSettingsController, 3 );
-( (Registry.as(Extensions$1.Configuration)))
+( Registry.as(Extensions.Workbench))
+    .registerWorkbenchContribution(SashSettingsController, LifecyclePhase.Restored);
+( Registry.as(Extensions$1.Configuration))
     .registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {
@@ -18,7 +20,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                4452,
+                8403,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -28,7 +30,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                4453,
+                8404,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },

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

@@ -0,0 +1,15 @@
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { ILayoutService } from "vscode/vscode/vs/platform/layout/browser/layoutService.service";
+export declare const minSize = 1;
+export declare const maxSize = 20;
+export declare class SashSettingsController implements IWorkbenchContribution, IDisposable {
+    private readonly configurationService;
+    private readonly layoutService;
+    private readonly disposables;
+    constructor(configurationService: IConfigurationService, layoutService: ILayoutService);
+    private onDidChangeSize;
+    private onDidChangeHoverDelay;
+    dispose(): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 import { setGlobalSashSize, setGlobalHoverDelay } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 import { Event } from 'vscode/vscode/vs/base/common/event';

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/media/typeHierarchy.css.js

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".monaco-workbench .type-hierarchy .message,.monaco-workbench .type-hierarchy .results{display:none}.monaco-workbench .type-hierarchy[data-state=data] .results{display:inherit;height:100%}.monaco-workbench .type-hierarchy[data-state=message] .message{align-items:center;display:flex;height:100%;justify-content:center}.monaco-workbench .type-hierarchy .editor,.monaco-workbench .type-hierarchy .tree{height:100%}.monaco-editor .type-hierarchy .tree{background-color:var(--vscode-peekViewResult-background);color:var(--vscode-peekViewResult-fileForeground)}.monaco-editor .type-hierarchy .tree .monaco-list:focus .monaco-list-rows>.monaco-list-row.selected:not(.highlighted){background-color:var(--vscode-peekViewResult-selectionBackground);color:var(--vscode-peekViewResult-selectionForeground)!important}.monaco-workbench .type-hierarchy .tree .typehierarchy-element{align-items:center;display:flex;flex:1;flex-flow:row nowrap}.monaco-workbench .type-hierarchy .tree .typehierarchy-element .monaco-icon-label{padding-left:4px}.monaco-editor .type-hierarchy .type-decoration{background-color:var(--vscode-peekViewEditor-matchHighlightBackground);border:2px solid var(--vscode-peekViewEditor-matchHighlightBorder);box-sizing:border-box}.monaco-editor .type-hierarchy .editor .monaco-editor .inputarea.ime-input,.monaco-editor .type-hierarchy .editor .monaco-editor .monaco-editor-background{background-color:var(--vscode-peekViewEditor-background)}.monaco-editor .type-hierarchy .editor .monaco-editor .margin{background-color:var(--vscode-peekViewEditorGutter-background)}";
 n(css,{});

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

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

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

@@ -1,10 +1,12 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Event } from 'vscode/vscode/vs/base/common/event';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerEditorContribution, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution, EditorContributionInstantiation, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { PeekContext } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
@@ -13,22 +15,24 @@ import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/commo
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
-import { TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+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(4238, 'Whether a type hierarchy provider is available')))));
-const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(4239, 'Whether type hierarchy peek is currently showing')))));
-const _ctxTypeHierarchyDirection = ( (new RawContextKey(
+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 _ctxTypeHierarchyDirection = ( new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(4240, 'whether type hierarchy shows super types or subtypes')) }
-)));
+    { type: 'string', description: ( localize(10396, 'whether type hierarchy shows super types or subtypes')) }
+));
 function sanitizedDirection(candidate) {
-    return candidate === "subtypes"  || candidate === "supertypes"
+    return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
         ? candidate
-        : "subtypes" ;
+        : TypeHierarchyDirection.Subtypes;
 }
 let TypeHierarchyController = class TypeHierarchyController {
     static { TypeHierarchyController_1 = this; }
@@ -43,13 +47,13 @@ let TypeHierarchyController = class TypeHierarchyController {
         this._storageService = _storageService;
         this._editorService = _editorService;
         this._instantiationService = _instantiationService;
-        this._disposables = ( (new DisposableStore()));
-        this._sessionDisposables = ( (new DisposableStore()));
+        this._disposables = ( new DisposableStore());
+        this._sessionDisposables = ( new DisposableStore());
         this._ctxHasProvider = _ctxHasTypeHierarchyProvider.bindTo(this._contextKeyService);
         this._ctxIsVisible = _ctxTypeHierarchyVisible.bindTo(this._contextKeyService);
         this._ctxDirection = _ctxTypeHierarchyDirection.bindTo(this._contextKeyService);
         this._disposables.add(Event.any(_editor.onDidChangeModel, _editor.onDidChangeModelLanguage, TypeHierarchyProviderRegistry.onDidChange)(() => {
-            this._ctxHasProvider.set(_editor.hasModel() && ( (TypeHierarchyProviderRegistry.has(_editor.getModel()))));
+            this._ctxHasProvider.set(_editor.hasModel() && ( TypeHierarchyProviderRegistry.has(_editor.getModel())));
         }));
         this._disposables.add(this._sessionDisposables);
     }
@@ -63,12 +67,12 @@ let TypeHierarchyController = class TypeHierarchyController {
         }
         const document = this._editor.getModel();
         const position = this._editor.getPosition();
-        if (!( (TypeHierarchyProviderRegistry.has(document)))) {
+        if (!( TypeHierarchyProviderRegistry.has(document))) {
             return;
         }
-        const cts = ( (new CancellationTokenSource()));
+        const cts = ( new CancellationTokenSource());
         const model = TypeHierarchyModel.create(document, position, cts.token);
-        const direction = sanitizedDirection(this._storageService.get(TypeHierarchyController_1._storageDirectionKey, 0 , "subtypes" ));
+        const direction = sanitizedDirection(this._storageService.get(TypeHierarchyController_1._storageDirectionKey, StorageScope.PROFILE, TypeHierarchyDirection.Subtypes));
         this._showTypeHierarchyWidget(position, direction, model, cts);
     }
     _showTypeHierarchyWidget(position, direction, model, cts) {
@@ -79,7 +83,7 @@ let TypeHierarchyController = class TypeHierarchyController {
         this._widget.showLoading();
         this._sessionDisposables.add(this._widget.onDidClose(() => {
             this.endTypeHierarchy();
-            this._storageService.store(TypeHierarchyController_1._storageDirectionKey, this._widget.direction, 0 , 0 );
+            this._storageService.store(TypeHierarchyController_1._storageDirectionKey, this._widget.direction, StorageScope.PROFILE, StorageTarget.USER);
         }));
         this._sessionDisposables.add({ dispose() { cts.dispose(true); } });
         this._sessionDisposables.add(this._widget);
@@ -92,14 +96,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(4241, "No results")));
+                this._widget.showMessage(( localize(10397, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4242, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(10398, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -117,15 +121,15 @@ let TypeHierarchyController = class TypeHierarchyController {
         }
         const newModel = model.fork(typeItem.item);
         this._sessionDisposables.clear();
-        TypeHierarchyController_1.get(newEditor)?._showTypeHierarchyWidget(Range.lift(newModel.root.selectionRange).getStartPosition(), this._widget.direction, Promise.resolve(newModel), ( (new CancellationTokenSource())));
+        TypeHierarchyController_1.get(newEditor)?._showTypeHierarchyWidget(Range.lift(newModel.root.selectionRange).getStartPosition(), this._widget.direction, Promise.resolve(newModel), ( new CancellationTokenSource()));
     }
     showSupertypes() {
-        this._widget?.updateDirection("supertypes" );
-        this._ctxDirection.set("supertypes" );
+        this._widget?.updateDirection(TypeHierarchyDirection.Supertypes);
+        this._ctxDirection.set(TypeHierarchyDirection.Supertypes);
     }
     showSubtypes() {
-        this._widget?.updateDirection("subtypes" );
-        this._ctxDirection.set("subtypes" );
+        this._widget?.updateDirection(TypeHierarchyDirection.Subtypes);
+        this._ctxDirection.set(TypeHierarchyDirection.Subtypes);
     }
     endTypeHierarchy() {
         this._sessionDisposables.clear();
@@ -133,25 +137,25 @@ let TypeHierarchyController = class TypeHierarchyController {
         this._editor.focus();
     }
 };
-TypeHierarchyController = TypeHierarchyController_1 = ( (__decorate([
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, IStorageService))),
-    ( (__param(3, ICodeEditorService))),
-    ( (__param(4, IInstantiationService)))
-], TypeHierarchyController)));
-registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController, 0 );
+TypeHierarchyController = TypeHierarchyController_1 = ( __decorate([
+    ( __param(1, IContextKeyService)),
+    ( __param(2, IStorageService)),
+    ( __param(3, ICodeEditorService)),
+    ( __param(4, IInstantiationService))
+], TypeHierarchyController));
+registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController, EditorContributionInstantiation.Eager);
 registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(4243, 'Peek Type Hierarchy')),
+            title: ( localize2(10399, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
                 order: 1000,
-                when: ( (ContextKeyExpr.and(_ctxHasTypeHierarchyProvider, PeekContext.notInPeekEditor))),
+                when: ( ContextKeyExpr.and(_ctxHasTypeHierarchyProvider, PeekContext.notInPeekEditor)),
             },
-            precondition: ( (ContextKeyExpr.and(_ctxHasTypeHierarchyProvider, PeekContext.notInPeekEditor))),
+            precondition: ( ContextKeyExpr.and(_ctxHasTypeHierarchyProvider, PeekContext.notInPeekEditor)),
             f1: true
         });
     }
@@ -163,19 +167,16 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(4244, 'Show Supertypes')),
+            title: ( localize2(10400, 'Show Supertypes')),
             icon: Codicon.typeHierarchySuper,
-            precondition: ( (ContextKeyExpr.and(
-                _ctxTypeHierarchyVisible,
-                 (_ctxTypeHierarchyDirection.isEqualTo("subtypes" ))
-            ))),
+            precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 512  + 38 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
             },
             menu: {
                 id: TypeHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxTypeHierarchyDirection.isEqualTo("subtypes" ))),
+                when: ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)),
                 order: 1,
             }
         });
@@ -188,19 +189,16 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSubtypes',
-            title: ( localize2(4245, 'Show Subtypes')),
+            title: ( localize2(10401, 'Show Subtypes')),
             icon: Codicon.typeHierarchySub,
-            precondition: ( (ContextKeyExpr.and(
-                _ctxTypeHierarchyVisible,
-                 (_ctxTypeHierarchyDirection.isEqualTo("supertypes" ))
-            ))),
+            precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 512  + 38 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
             },
             menu: {
                 id: TypeHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxTypeHierarchyDirection.isEqualTo("supertypes" ))),
+                when: ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)),
                 order: 1,
             }
         });
@@ -213,11 +211,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusTypeHierarchy',
-            title: ( localize2(4246, 'Refocus Type Hierarchy')),
+            title: ( localize2(10402, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 3
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyCode.Enter
             }
         });
     }
@@ -229,12 +227,12 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(4247, 'Close')),
+            title: ( localize(10403, 'Close')),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
-                weight: 200  + 10,
-                primary: 9 ,
+                weight: KeybindingWeight.WorkbenchContrib + 10,
+                primary: KeyCode.Escape,
                 when: ContextKeyExpr.not('config.editor.stablePeek')
             },
             menu: {