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

package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.d.ts

@@ -0,0 +1,21 @@
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IEditorResolverService } from "vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/common/environmentService.service";
+export declare class DynamicEditorConfigurations extends Disposable implements IWorkbenchContribution {
+    private readonly editorResolverService;
+    private readonly environmentService;
+    static readonly ID = "workbench.contrib.dynamicEditorConfigurations";
+    private static readonly AUTO_LOCK_DEFAULT_ENABLED;
+    private static readonly AUTO_LOCK_EXTRA_EDITORS;
+    private static readonly AUTO_LOCK_REMOVE_EDITORS;
+    private readonly configurationRegistry;
+    private autoLockConfigurationNode;
+    private defaultBinaryEditorConfigurationNode;
+    private editorAssociationsConfigurationNode;
+    private editorLargeFileConfirmationConfigurationNode;
+    constructor(editorResolverService: IEditorResolverService, extensionService: IExtensionService, environmentService: IWorkbenchEnvironmentService);
+    private registerListeners;
+    private updateDynamicEditorConfigurations;
+}

package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js

@@ -1,8 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
@@ -16,43 +17,43 @@ var DynamicEditorConfigurations_1;
 let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disposable {
     static { DynamicEditorConfigurations_1 = this; }
     static { this.ID = 'workbench.contrib.dynamicEditorConfigurations'; }
-    static { this.AUTO_LOCK_DEFAULT_ENABLED = ( (new Set([
+    static { this.AUTO_LOCK_DEFAULT_ENABLED = ( new Set([
         'terminalEditor',
         'mainThreadWebview-simpleBrowser.view',
         'mainThreadWebview-browserPreview'
-    ]))); }
+    ])); }
     static { this.AUTO_LOCK_EXTRA_EDITORS = [
         {
             id: 'workbench.input.interactive',
-            label: ( localize(9918, 'Interactive Window')),
+            label: ( localize(3069, 'Interactive Window')),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-markdown.preview',
-            label: ( localize(9919, "Markdown Preview")),
+            label: ( localize(3070, "Markdown Preview")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-simpleBrowser.view',
-            label: ( localize(9920, "Simple Browser")),
+            label: ( localize(3071, "Simple Browser")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-browserPreview',
-            label: ( localize(9921, "Live Preview")),
+            label: ( localize(3072, "Live Preview")),
             priority: RegisteredEditorPriority.builtin
         }
     ]; }
-    static { this.AUTO_LOCK_REMOVE_EDITORS = ( (new Set([
+    static { this.AUTO_LOCK_REMOVE_EDITORS = ( new Set([
         'vscode-interactive-input',
         'interactive',
         'vscode.markdown.preview.editor'
-    ]))); }
+    ])); }
     constructor(editorResolverService, extensionService, environmentService) {
         super();
         this.editorResolverService = editorResolverService;
         this.environmentService = environmentService;
-        this.configurationRegistry = ( (Registry.as(Extensions.Configuration)));
+        this.configurationRegistry = ( Registry.as(Extensions.Configuration));
         (async () => {
             await extensionService.whenInstalledExtensionsRegistered();
             this.updateDynamicEditorConfigurations();
@@ -63,19 +64,19 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
         this._register(Event.debounce(this.editorResolverService.onDidChangeEditorRegistrations, (_, e) => e)(() => this.updateDynamicEditorConfigurations()));
     }
     updateDynamicEditorConfigurations() {
-        const lockableEditors = [...this.editorResolverService.getEditors(), ...DynamicEditorConfigurations_1.AUTO_LOCK_EXTRA_EDITORS].filter(e => !( (DynamicEditorConfigurations_1.AUTO_LOCK_REMOVE_EDITORS.has(e.id))));
-        const binaryEditorCandidates = ( (this.editorResolverService.getEditors().filter(e => e.priority !== RegisteredEditorPriority.exclusive).map(e => e.id)));
+        const lockableEditors = [...this.editorResolverService.getEditors(), ...DynamicEditorConfigurations_1.AUTO_LOCK_EXTRA_EDITORS].filter(e => !( DynamicEditorConfigurations_1.AUTO_LOCK_REMOVE_EDITORS.has(e.id)));
+        const binaryEditorCandidates = ( this.editorResolverService.getEditors().filter(e => e.priority !== RegisteredEditorPriority.exclusive).map(e => e.id));
         const autoLockGroupConfiguration = Object.create(null);
         for (const editor of lockableEditors) {
             autoLockGroupConfiguration[editor.id] = {
                 type: 'boolean',
-                default: ( (DynamicEditorConfigurations_1.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id))),
+                default: ( DynamicEditorConfigurations_1.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id)),
                 description: editor.label
             };
         }
         const defaultAutoLockGroupConfiguration = Object.create(null);
         for (const editor of lockableEditors) {
-            defaultAutoLockGroupConfiguration[editor.id] = ( (DynamicEditorConfigurations_1.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id)));
+            defaultAutoLockGroupConfiguration[editor.id] = ( DynamicEditorConfigurations_1.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id));
         }
         const oldAutoLockConfigurationNode = this.autoLockConfigurationNode;
         this.autoLockConfigurationNode = {
@@ -84,7 +85,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 'workbench.editor.autoLockGroups': {
                     type: 'object',
                     description: ( localize(
-                        9922,
+                        3073,
                         "If an editor matching one of the listed types is opened as the first in an editor group and more than one group is open, the group is automatically locked. Locked groups will only be used for opening editors when explicitly chosen by a user gesture (for example drag and drop), but not by default. Consequently, the active editor in a locked group is less likely to be replaced accidentally with a different editor."
                     )),
                     properties: autoLockGroupConfiguration,
@@ -102,7 +103,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     default: '',
                     enum: [...binaryEditorCandidates, ''],
                     description: ( localize(
-                        9923,
+                        3074,
                         "The default editor for files detected as binary. If undefined, the user will be presented with a picker."
                     )),
                 }
@@ -115,7 +116,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 'workbench.editorAssociations': {
                     type: 'object',
                     markdownDescription: ( localize(
-                        9924,
+                        3075,
                         "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
                     )),
                     patternProperties: {
@@ -135,9 +136,9 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     type: 'number',
                     default: getLargeFileConfirmationLimit(this.environmentService.remoteAuthority) / ByteSize.MB,
                     minimum: 1,
-                    scope: 4 ,
+                    scope: ConfigurationScope.RESOURCE,
                     markdownDescription: ( localize(
-                        9925,
+                        3076,
                         "Controls the minimum size of a file in MB before asking for confirmation when opening in the editor. Note that this setting may not apply to all editor types and environments."
                     )),
                 }
@@ -159,10 +160,10 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
         });
     }
 };
-DynamicEditorConfigurations = DynamicEditorConfigurations_1 = ( (__decorate([
-    ( (__param(0, IEditorResolverService))),
-    ( (__param(1, IExtensionService))),
-    ( (__param(2, IWorkbenchEnvironmentService)))
-], DynamicEditorConfigurations)));
+DynamicEditorConfigurations = DynamicEditorConfigurations_1 = ( __decorate([
+    ( __param(0, IEditorResolverService)),
+    ( __param(1, IExtensionService)),
+    ( __param(2, IWorkbenchEnvironmentService))
+], DynamicEditorConfigurations));
 
 export { DynamicEditorConfigurations };

package/vscode/src/vs/workbench/browser/parts/paneCompositePartService.d.ts

@@ -0,0 +1,32 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IProgressIndicator } from "vscode/vscode/vs/platform/progress/common/progress";
+import { PaneCompositeDescriptor } from "@codingame/monaco-vscode-b8988f79-16c1-5bff-b0e7-699bab3431da-common/vscode/vs/workbench/browser/panecomposite";
+import { IPaneComposite } from "vscode/vscode/vs/workbench/common/panecomposite";
+import { ViewContainerLocation } from "vscode/vscode/vs/workbench/common/views";
+import { IPaneCompositePartService } from "vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+export declare class PaneCompositePartService extends Disposable implements IPaneCompositePartService {
+    readonly _serviceBrand: undefined;
+    readonly onDidPaneCompositeOpen: Event<{
+        composite: IPaneComposite;
+        viewContainerLocation: ViewContainerLocation;
+    }>;
+    readonly onDidPaneCompositeClose: Event<{
+        composite: IPaneComposite;
+        viewContainerLocation: ViewContainerLocation;
+    }>;
+    private readonly paneCompositeParts;
+    constructor(instantiationService: IInstantiationService);
+    openPaneComposite(id: string | undefined, viewContainerLocation: ViewContainerLocation, focus?: boolean): Promise<IPaneComposite | undefined>;
+    getActivePaneComposite(viewContainerLocation: ViewContainerLocation): IPaneComposite | undefined;
+    getPaneComposite(id: string, viewContainerLocation: ViewContainerLocation): PaneCompositeDescriptor | undefined;
+    getPaneComposites(viewContainerLocation: ViewContainerLocation): PaneCompositeDescriptor[];
+    getPinnedPaneCompositeIds(viewContainerLocation: ViewContainerLocation): string[];
+    getVisiblePaneCompositeIds(viewContainerLocation: ViewContainerLocation): string[];
+    getPaneCompositeIds(viewContainerLocation: ViewContainerLocation): string[];
+    getProgressIndicator(id: string, viewContainerLocation: ViewContainerLocation): IProgressIndicator | undefined;
+    hideActivePaneComposite(viewContainerLocation: ViewContainerLocation): void;
+    getLastActivePaneCompositeId(viewContainerLocation: ViewContainerLocation): string;
+    private getPartByLocation;
+}

package/vscode/src/vs/workbench/browser/parts/paneCompositePartService.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 { Event } from 'vscode/vscode/vs/base/common/event';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { AuxiliaryBarPart } from '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
-import { PanelPart } from '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/workbench/browser/parts/panel/panelPart';
-import { SidebarPart } from '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
-import { ViewContainerLocations } from 'vscode/vscode/vs/workbench/common/views';
+import { AuxiliaryBarPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
+import { PanelPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/panel/panelPart';
+import { SidebarPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
+import { ViewContainerLocation, ViewContainerLocations } from 'vscode/vscode/vs/workbench/common/views';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 
 let PaneCompositePartService = class PaneCompositePartService extends Disposable {
@@ -15,9 +17,9 @@ let PaneCompositePartService = class PaneCompositePartService extends Disposable
         const panelPart = instantiationService.createInstance(PanelPart);
         const sideBarPart = instantiationService.createInstance(SidebarPart);
         const auxiliaryBarPart = instantiationService.createInstance(AuxiliaryBarPart);
-        this.paneCompositeParts.set(1 , panelPart);
-        this.paneCompositeParts.set(0 , sideBarPart);
-        this.paneCompositeParts.set(2 , auxiliaryBarPart);
+        this.paneCompositeParts.set(ViewContainerLocation.Panel, panelPart);
+        this.paneCompositeParts.set(ViewContainerLocation.Sidebar, sideBarPart);
+        this.paneCompositeParts.set(ViewContainerLocation.AuxiliaryBar, auxiliaryBarPart);
         const eventDisposables = this._register(( new DisposableStore()));
         this.onDidPaneCompositeOpen = Event.any(...( ViewContainerLocations.map(loc => ( Event.map(
             this.paneCompositeParts.get(loc).onDidPaneCompositeOpen,

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

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

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

@@ -1,16 +1,20 @@
-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 { CallHierarchyProviderRegistry, CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
+import { CallHierarchyDirection, CallHierarchyProviderRegistry, CallHierarchyModel } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { CallHierarchyTreePeekWidget } from './callHierarchyPeek.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { registerEditorContribution, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution, EditorContributionInstantiation, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { PeekContext } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
@@ -20,17 +24,17 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 
 var CallHierarchyController_1;
-const _ctxHasCallHierarchyProvider = ( (new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4226, 'Whether a call hierarchy provider is available')))));
-const _ctxCallHierarchyVisible = ( (new RawContextKey('callHierarchyVisible', false, ( localize(4227, 'Whether call hierarchy peek is currently showing')))));
-const _ctxCallHierarchyDirection = ( (new RawContextKey(
+const _ctxHasCallHierarchyProvider = ( new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4111, 'Whether a call hierarchy provider is available'))));
+const _ctxCallHierarchyVisible = ( new RawContextKey('callHierarchyVisible', false, ( localize(4112, 'Whether call hierarchy peek is currently showing'))));
+const _ctxCallHierarchyDirection = ( new RawContextKey(
     'callHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(4228, 'Whether call hierarchy shows incoming or outgoing calls')) }
-)));
+    { type: 'string', description: ( localize(4113, 'Whether call hierarchy shows incoming or outgoing calls')) }
+));
 function sanitizedDirection(candidate) {
-    return candidate === "outgoingCalls"  || candidate === "incomingCalls"
+    return candidate === CallHierarchyDirection.CallsFrom || candidate === CallHierarchyDirection.CallsTo
         ? candidate
-        : "incomingCalls" ;
+        : CallHierarchyDirection.CallsTo;
 }
 let CallHierarchyController = class CallHierarchyController {
     static { CallHierarchyController_1 = this; }
@@ -45,13 +49,13 @@ let CallHierarchyController = class CallHierarchyController {
         this._storageService = _storageService;
         this._editorService = _editorService;
         this._instantiationService = _instantiationService;
-        this._dispoables = ( (new DisposableStore()));
-        this._sessionDisposables = ( (new DisposableStore()));
+        this._dispoables = ( new DisposableStore());
+        this._sessionDisposables = ( new DisposableStore());
         this._ctxIsVisible = _ctxCallHierarchyVisible.bindTo(this._contextKeyService);
         this._ctxHasProvider = _ctxHasCallHierarchyProvider.bindTo(this._contextKeyService);
         this._ctxDirection = _ctxCallHierarchyDirection.bindTo(this._contextKeyService);
         this._dispoables.add(Event.any(_editor.onDidChangeModel, _editor.onDidChangeModelLanguage, CallHierarchyProviderRegistry.onDidChange)(() => {
-            this._ctxHasProvider.set(_editor.hasModel() && ( (CallHierarchyProviderRegistry.has(_editor.getModel()))));
+            this._ctxHasProvider.set(_editor.hasModel() && ( CallHierarchyProviderRegistry.has(_editor.getModel())));
         }));
         this._dispoables.add(this._sessionDisposables);
     }
@@ -67,12 +71,12 @@ let CallHierarchyController = class CallHierarchyController {
         }
         const document = this._editor.getModel();
         const position = this._editor.getPosition();
-        if (!( (CallHierarchyProviderRegistry.has(document)))) {
+        if (!( CallHierarchyProviderRegistry.has(document))) {
             return;
         }
-        const cts = ( (new CancellationTokenSource()));
+        const cts = ( new CancellationTokenSource());
         const model = CallHierarchyModel.create(document, position, cts.token);
-        const direction = sanitizedDirection(this._storageService.get(CallHierarchyController_1._StorageDirection, 0 , "incomingCalls" ));
+        const direction = sanitizedDirection(this._storageService.get(CallHierarchyController_1._StorageDirection, StorageScope.PROFILE, CallHierarchyDirection.CallsTo));
         this._showCallHierarchyWidget(position, direction, model, cts);
     }
     async startCallHierarchyFromCallHierarchy() {
@@ -90,7 +94,7 @@ let CallHierarchyController = class CallHierarchyController {
         }
         const newModel = model.fork(call.item);
         this._sessionDisposables.clear();
-        CallHierarchyController_1.get(newEditor)?._showCallHierarchyWidget(Range.lift(newModel.root.selectionRange).getStartPosition(), this._widget.direction, Promise.resolve(newModel), ( (new CancellationTokenSource())));
+        CallHierarchyController_1.get(newEditor)?._showCallHierarchyWidget(Range.lift(newModel.root.selectionRange).getStartPosition(), this._widget.direction, Promise.resolve(newModel), ( new CancellationTokenSource()));
     }
     _showCallHierarchyWidget(position, direction, model, cts) {
         this._ctxIsVisible.set(true);
@@ -100,7 +104,7 @@ let CallHierarchyController = class CallHierarchyController {
         this._widget.showLoading();
         this._sessionDisposables.add(this._widget.onDidClose(() => {
             this.endCallHierarchy();
-            this._storageService.store(CallHierarchyController_1._StorageDirection, this._widget.direction, 0 , 0 );
+            this._storageService.store(CallHierarchyController_1._StorageDirection, this._widget.direction, StorageScope.PROFILE, StorageTarget.USER);
         }));
         this._sessionDisposables.add({ dispose() { cts.dispose(true); } });
         this._sessionDisposables.add(this._widget);
@@ -113,23 +117,23 @@ let CallHierarchyController = class CallHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(4229, "No results")));
+                this._widget.showMessage(( localize(4114, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endCallHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4230, "Failed to show call hierarchy")));
+            this._widget.showMessage(( localize(4115, "Failed to show call hierarchy")));
         });
     }
     showOutgoingCalls() {
-        this._widget?.updateDirection("outgoingCalls" );
-        this._ctxDirection.set("outgoingCalls" );
+        this._widget?.updateDirection(CallHierarchyDirection.CallsFrom);
+        this._ctxDirection.set(CallHierarchyDirection.CallsFrom);
     }
     showIncomingCalls() {
-        this._widget?.updateDirection("incomingCalls" );
-        this._ctxDirection.set("incomingCalls" );
+        this._widget?.updateDirection(CallHierarchyDirection.CallsTo);
+        this._ctxDirection.set(CallHierarchyDirection.CallsTo);
     }
     endCallHierarchy() {
         this._sessionDisposables.clear();
@@ -137,34 +141,30 @@ let CallHierarchyController = class CallHierarchyController {
         this._editor.focus();
     }
 };
-CallHierarchyController = CallHierarchyController_1 = ( (__decorate([
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, IStorageService))),
-    ( (__param(3, ICodeEditorService))),
-    ( (__param(4, IInstantiationService)))
-], CallHierarchyController)));
-registerEditorContribution(CallHierarchyController.Id, CallHierarchyController, 0 );
+CallHierarchyController = CallHierarchyController_1 = ( __decorate([
+    ( __param(1, IContextKeyService)),
+    ( __param(2, IStorageService)),
+    ( __param(3, ICodeEditorService)),
+    ( __param(4, IInstantiationService))
+], CallHierarchyController));
+registerEditorContribution(CallHierarchyController.Id, CallHierarchyController, EditorContributionInstantiation.Eager);
 registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showCallHierarchy',
-            title: ( localize2(4231, 'Peek Call Hierarchy')),
+            title: ( localize2(4116, 'Peek Call Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
                 order: 1000,
-                when: ( (ContextKeyExpr.and(
-                    _ctxHasCallHierarchyProvider,
-                    PeekContext.notInPeekEditor,
-                     (EditorContextKeys.isInEmbeddedEditor.toNegated())
-                ))),
+                when: ( ContextKeyExpr.and(_ctxHasCallHierarchyProvider, PeekContext.notInPeekEditor, ( EditorContextKeys.isInEmbeddedEditor.toNegated()))),
             },
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
-                weight: 200 ,
-                primary: 1024  + 512  + 38
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH
             },
-            precondition: ( (ContextKeyExpr.and(_ctxHasCallHierarchyProvider, PeekContext.notInPeekEditor))),
+            precondition: ( ContextKeyExpr.and(_ctxHasCallHierarchyProvider, PeekContext.notInPeekEditor)),
             f1: true
         });
     }
@@ -176,19 +176,16 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showIncomingCalls',
-            title: ( localize2(4232, 'Show Incoming Calls')),
-            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4233, 'Icon for incoming calls in the call hierarchy view.'))),
-            precondition: ( (ContextKeyExpr.and(
-                _ctxCallHierarchyVisible,
-                 (_ctxCallHierarchyDirection.isEqualTo("outgoingCalls" ))
-            ))),
+            title: ( localize2(4117, 'Show Incoming Calls')),
+            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4118, 'Icon for incoming calls in the call hierarchy view.'))),
+            precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom)))),
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 512  + 38 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
             },
             menu: {
                 id: CallHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxCallHierarchyDirection.isEqualTo("outgoingCalls" ))),
+                when: ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom)),
                 order: 1,
             }
         });
@@ -201,19 +198,16 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showOutgoingCalls',
-            title: ( localize2(4234, 'Show Outgoing Calls')),
-            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4235, 'Icon for outgoing calls in the call hierarchy view.'))),
-            precondition: ( (ContextKeyExpr.and(
-                _ctxCallHierarchyVisible,
-                 (_ctxCallHierarchyDirection.isEqualTo("incomingCalls" ))
-            ))),
+            title: ( localize2(4119, 'Show Outgoing Calls')),
+            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4120, 'Icon for outgoing calls in the call hierarchy view.'))),
+            precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo)))),
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 512  + 38 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
             },
             menu: {
                 id: CallHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxCallHierarchyDirection.isEqualTo("incomingCalls" ))),
+                when: ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo)),
                 order: 1
             }
         });
@@ -226,11 +220,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusCallHierarchy',
-            title: ( localize2(4236, 'Refocus Call Hierarchy')),
+            title: ( localize2(4121, 'Refocus Call Hierarchy')),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 3
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyCode.Enter
             }
         });
     }
@@ -242,12 +236,12 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeCallHierarchy',
-            title: ( localize(4237, 'Close')),
+            title: ( localize(4122, 'Close')),
             icon: Codicon.close,
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
-                weight: 200  + 10,
-                primary: 9 ,
+                weight: KeybindingWeight.WorkbenchContrib + 10,
+                primary: KeyCode.Escape,
                 when: ContextKeyExpr.not('config.editor.stablePeek')
             },
             menu: {

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.d.ts

@@ -0,0 +1,50 @@
+import * as peekView from "vscode/vscode/vs/editor/contrib/peekView/browser/peekView";
+import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { CallHierarchyDirection, CallHierarchyModel } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy";
+import * as callHTree from "./callHierarchyTree.js";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+import { ITextModelService } from "vscode/vscode/vs/editor/common/services/resolverService";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { IPosition } from "vscode/vscode/vs/editor/common/core/position";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { MenuId } from "vscode/vscode/vs/platform/actions/common/actions";
+import { IMenuService } from "vscode/vscode/vs/platform/actions/common/actions.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+export declare class CallHierarchyTreePeekWidget extends peekView.PeekViewWidget {
+    private readonly _where;
+    private _direction;
+    private readonly _peekViewService;
+    private readonly _editorService;
+    private readonly _textModelService;
+    private readonly _storageService;
+    private readonly _menuService;
+    private readonly _contextKeyService;
+    private readonly _instantiationService;
+    static readonly TitleMenu: MenuId;
+    private _parent;
+    private _message;
+    private _splitView;
+    private _tree;
+    private _treeViewStates;
+    private _editor;
+    private _dim;
+    private _layoutInfo;
+    private readonly _previewDisposable;
+    constructor(editor: ICodeEditor, _where: IPosition, _direction: CallHierarchyDirection, themeService: IThemeService, _peekViewService: peekView.IPeekViewService, _editorService: IEditorService, _textModelService: ITextModelService, _storageService: IStorageService, _menuService: IMenuService, _contextKeyService: IContextKeyService, _instantiationService: IInstantiationService);
+    dispose(): void;
+    get direction(): CallHierarchyDirection;
+    private _applyTheme;
+    protected _fillHead(container: HTMLElement): void;
+    protected _fillBody(parent: HTMLElement): void;
+    private _updatePreview;
+    showLoading(): void;
+    showMessage(message: string): void;
+    showModel(model: CallHierarchyModel): Promise<void>;
+    getModel(): CallHierarchyModel | undefined;
+    getFocused(): callHTree.Call | undefined;
+    updateDirection(newDirection: CallHierarchyDirection): Promise<void>;
+    private _show;
+    protected _onWidth(width: number): void;
+    protected _doLayoutBody(height: number, width: number): void;
+}