@codingame/monaco-vscode-view-common-service-override 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js

@@ -1,8 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/sidebarpart.css.js';
 import './sidebarActions.js';
+import { Parts, LayoutSettings, Position, ActivityBarPosition } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { ActiveViewletContext, SidebarFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
@@ -22,11 +24,15 @@ import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { SIDE_BAR_BORDER, SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/contextview';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import '../../../../base/browser/ui/grid/grid.js';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
 import { ActivitybarPart, ActivityBarCompositeBar } from '../activitybar/activitybarPart.js';
+import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { HoverPosition } from 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -34,6 +40,14 @@ import { Separator } from 'vscode/vscode/vs/base/common/actions';
 import { ToggleActivityBarVisibilityActionId } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { LayoutPriority } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+import 'vscode/vscode/vs/base/browser/dom';
+import 'vscode/vscode/vs/base/browser/ui/sash/sash';
+import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/color';
+import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/base/common/lifecycle';
+import '../../../../base/browser/ui/grid/gridview.css.js';
 
 var SidebarPart_1;
 const _moduleId = "vs/workbench/browser/parts/sidebar/sidebarPart";
@@ -53,31 +67,31 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         return Math.max(width, 300);
     }
     constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, configurationService, menuService) {
-        super("workbench.parts.sidebar" , { hasTitle: true, borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0 }, SidebarPart_1.activeViewletSettingsKey, ActiveViewletContext.bindTo(contextKeyService), SidebarFocusContext.bindTo(contextKeyService), 'sideBar', 'viewlet', SIDE_BAR_TITLE_FOREGROUND, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
+        super(Parts.SIDEBAR_PART, { hasTitle: true, borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0 }, SidebarPart_1.activeViewletSettingsKey, ActiveViewletContext.bindTo(contextKeyService), SidebarFocusContext.bindTo(contextKeyService), 'sideBar', 'viewlet', SIDE_BAR_TITLE_FOREGROUND, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.configurationService = configurationService;
         this.minimumWidth = 170;
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 0;
         this.maximumHeight = Number.POSITIVE_INFINITY;
-        this.priority = 1 ;
-        this.acitivityBarPart = this._register(instantiationService.createInstance(ActivitybarPart, this));
+        this.priority = LayoutPriority.Low;
+        this.activityBarPart = this._register(this.instantiationService.createInstance(ActivitybarPart, this));
         this.rememberActivityBarVisiblePosition();
         this._register(configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration("workbench.activityBar.location" )) {
+            if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
                 this.onDidChangeActivityBarLocation();
             }
         }));
         this.registerActions();
     }
     onDidChangeActivityBarLocation() {
-        this.acitivityBarPart.hide();
+        this.activityBarPart.hide();
         this.updateCompositeBar();
         const id = this.getActiveComposite()?.getId();
         if (id) {
             this.onTitleAreaUpdate(id);
         }
         if (this.shouldShowActivityBar()) {
-            this.acitivityBarPart.show();
+            this.activityBarPart.show();
         }
         this.rememberActivityBarVisiblePosition();
     }
@@ -87,7 +101,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         container.style.backgroundColor = this.getColor(SIDE_BAR_BACKGROUND) || '';
         container.style.color = this.getColor(SIDE_BAR_FOREGROUND) || '';
         const borderColor = this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder);
-        const isPositionLeft = this.layoutService.getSideBarPosition() === 0 ;
+        const isPositionLeft = this.layoutService.getSideBarPosition() === Position.LEFT;
         container.style.borderRightWidth = borderColor && isPositionLeft ? '1px' : '';
         container.style.borderRightStyle = borderColor && isPositionLeft ? 'solid' : '';
         container.style.borderRightColor = isPositionLeft ? borderColor || '' : '';
@@ -97,13 +111,13 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         container.style.outlineColor = this.getColor(SIDE_BAR_DRAG_AND_DROP_BACKGROUND) ?? '';
     }
     layout(width, height, top, left) {
-        if (!this.layoutService.isVisible("workbench.parts.sidebar" )) {
+        if (!this.layoutService.isVisible(Parts.SIDEBAR_PART)) {
             return;
         }
         super.layout(width, height, top, left);
     }
     getTitleAreaDropDownAnchorAlignment() {
-        return this.layoutService.getSideBarPosition() === 0  ? 0  : 1 ;
+        return this.layoutService.getSideBarPosition() === Position.LEFT ? AnchorAlignment.LEFT : AnchorAlignment.RIGHT;
     }
     createCompositeBar() {
         return this.instantiationService.createInstance(ActivityBarCompositeBar, this.getCompositeBarOptions(), this.partId, this, false);
@@ -115,10 +129,10 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             placeholderViewContainersKey: ActivitybarPart.placeholderViewContainersKey,
             viewContainersWorkspaceStateKey: ActivitybarPart.viewContainersWorkspaceStateKey,
             icon: true,
-            orientation: 0 ,
+            orientation: ActionsOrientation.HORIZONTAL,
             recomputeSizes: true,
             activityHoverOptions: {
-                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? 3  : 2 ,
+                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? HoverPosition.ABOVE : HoverPosition.BELOW,
             },
             fillExtraContextMenuActions: actions => {
                 const viewsSubmenuAction = this.getViewsSubmenuAction();
@@ -144,58 +158,58 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         };
     }
     shouldShowCompositeBar() {
-        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
-        return activityBarPosition === "top"  || activityBarPosition === "bottom" ;
+        const activityBarPosition = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
+        return activityBarPosition === ActivityBarPosition.TOP || activityBarPosition === ActivityBarPosition.BOTTOM;
     }
     shouldShowActivityBar() {
         if (this.shouldShowCompositeBar()) {
             return false;
         }
-        return this.configurationService.getValue("workbench.activityBar.location" ) !== "hidden" ;
+        return this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.HIDDEN;
     }
     getCompositeBarPosition() {
-        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
+        const activityBarPosition = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
         switch (activityBarPosition) {
-            case "top" : return CompositeBarPosition.TOP;
-            case "bottom" : return CompositeBarPosition.BOTTOM;
-            case "hidden" :
-            case "default" :
+            case ActivityBarPosition.TOP: return CompositeBarPosition.TOP;
+            case ActivityBarPosition.BOTTOM: return CompositeBarPosition.BOTTOM;
+            case ActivityBarPosition.HIDDEN:
+            case ActivityBarPosition.DEFAULT:
             default: return CompositeBarPosition.TITLE;
         }
     }
     rememberActivityBarVisiblePosition() {
-        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
-        if (activityBarPosition !== "hidden" ) {
-            this.storageService.store("workbench.activityBar.location" , activityBarPosition, 0 , 0 );
+        const activityBarPosition = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
+        if (activityBarPosition !== ActivityBarPosition.HIDDEN) {
+            this.storageService.store(LayoutSettings.ACTIVITY_BAR_LOCATION, activityBarPosition, StorageScope.PROFILE, StorageTarget.USER);
         }
     }
     getRememberedActivityBarVisiblePosition() {
-        const activityBarPosition = this.storageService.get("workbench.activityBar.location" , 0 );
+        const activityBarPosition = this.storageService.get(LayoutSettings.ACTIVITY_BAR_LOCATION, StorageScope.PROFILE);
         switch (activityBarPosition) {
-            case "top" : return "top" ;
-            case "bottom" : return "bottom" ;
-            default: return "default" ;
+            case ActivityBarPosition.TOP: return ActivityBarPosition.TOP;
+            case ActivityBarPosition.BOTTOM: return ActivityBarPosition.BOTTOM;
+            default: return ActivityBarPosition.DEFAULT;
         }
     }
     getPinnedPaneCompositeIds() {
-        return this.shouldShowCompositeBar() ? super.getPinnedPaneCompositeIds() : this.acitivityBarPart.getPinnedPaneCompositeIds();
+        return this.shouldShowCompositeBar() ? super.getPinnedPaneCompositeIds() : this.activityBarPart.getPinnedPaneCompositeIds();
     }
     getVisiblePaneCompositeIds() {
-        return this.shouldShowCompositeBar() ? super.getVisiblePaneCompositeIds() : this.acitivityBarPart.getVisiblePaneCompositeIds();
+        return this.shouldShowCompositeBar() ? super.getVisiblePaneCompositeIds() : this.activityBarPart.getVisiblePaneCompositeIds();
     }
     async focusActivityBar() {
-        if (this.configurationService.getValue("workbench.activityBar.location" ) === "hidden" ) {
-            await this.configurationService.updateValue("workbench.activityBar.location" , this.getRememberedActivityBarVisiblePosition());
+        if (this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) === ActivityBarPosition.HIDDEN) {
+            await this.configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, this.getRememberedActivityBarVisiblePosition());
             this.onDidChangeActivityBarLocation();
         }
         if (this.shouldShowCompositeBar()) {
-            this.focusComositeBar();
+            this.focusCompositeBar();
         }
         else {
-            if (!this.layoutService.isVisible("workbench.parts.activitybar" )) {
-                this.layoutService.setPartHidden(false, "workbench.parts.activitybar" );
+            if (!this.layoutService.isVisible(Parts.ACTIVITYBAR_PART)) {
+                this.layoutService.setPartHidden(false, Parts.ACTIVITYBAR_PART);
             }
-            this.acitivityBarPart.show(true);
+            this.activityBarPart.show(true);
         }
     }
     registerActions() {
@@ -208,14 +222,14 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
                 });
             }
             run() {
-                const value = that.configurationService.getValue("workbench.activityBar.location" ) === "hidden"  ? that.getRememberedActivityBarVisiblePosition() : "hidden" ;
-                return that.configurationService.updateValue("workbench.activityBar.location" , value);
+                const value = that.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) === ActivityBarPosition.HIDDEN ? that.getRememberedActivityBarVisiblePosition() : ActivityBarPosition.HIDDEN;
+                return that.configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, value);
             }
         }));
     }
     toJSON() {
         return {
-            type: "workbench.parts.sidebar"
+            type: Parts.SIDEBAR_PART
         };
     }
 };

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

@@ -1,16 +1,19 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { CallHierarchyProviderRegistry, CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
+import { CallHierarchyDirection, CallHierarchyProviderRegistry, CallHierarchyModel } from 'vscode/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';
@@ -29,9 +32,9 @@ const _ctxCallHierarchyDirection = ( (new RawContextKey(
     { type: 'string', description: ( localizeWithPath(_moduleId, 2, '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; }
@@ -73,7 +76,7 @@ let CallHierarchyController = class CallHierarchyController {
         }
         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() {
@@ -101,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);
@@ -125,12 +128,12 @@ let CallHierarchyController = class CallHierarchyController {
         });
     }
     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();
@@ -144,7 +147,7 @@ CallHierarchyController = CallHierarchyController_1 = ( (__decorate([
     ( (__param(3, ICodeEditorService))),
     ( (__param(4, IInstantiationService)))
 ], CallHierarchyController)));
-registerEditorContribution(CallHierarchyController.Id, CallHierarchyController, 0 );
+registerEditorContribution(CallHierarchyController.Id, CallHierarchyController, EditorContributionInstantiation.Eager);
 registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
@@ -162,8 +165,8 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
             },
             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))),
             f1: true
@@ -181,15 +184,15 @@ registerAction2(class extends EditorAction2 {
             icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localizeWithPath(_moduleId, 7, 'Icon for incoming calls in the call hierarchy view.'))),
             precondition: ( (ContextKeyExpr.and(
                 _ctxCallHierarchyVisible,
-                 (_ctxCallHierarchyDirection.isEqualTo("outgoingCalls" ))
+                 (_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,
             }
         });
@@ -206,15 +209,15 @@ registerAction2(class extends EditorAction2 {
             icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localizeWithPath(_moduleId, 9, 'Icon for outgoing calls in the call hierarchy view.'))),
             precondition: ( (ContextKeyExpr.and(
                 _ctxCallHierarchyVisible,
-                 (_ctxCallHierarchyDirection.isEqualTo("incomingCalls" ))
+                 (_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
             }
         });
@@ -230,8 +233,8 @@ registerAction2(class extends EditorAction2 {
             title: ( localize2WithPath(_moduleId, 10, 'Refocus Call Hierarchy')),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 3
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyCode.Enter
             }
         });
     }
@@ -247,8 +250,8 @@ registerAction2(class extends EditorAction2 {
             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.js

@@ -2,9 +2,11 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/callHierarchy.css.js';
 import { PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, peekViewResultsBackground, peekViewEditorMatchHighlight, IPeekViewService } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { CallHierarchyDirection } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { Sorter, AccessibilityProvider, IdentityProvider, VirtualDelegate, CallRenderer, DataSource } from './callHierarchyTree.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { SplitView, Sizing } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 import { Dimension, isKeyboardEvent } from 'vscode/vscode/vs/base/browser/dom';
@@ -13,9 +15,10 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { EmbeddedCodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { TrackedRangeStickiness, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { themeColorFromId } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { TreeMouseEventTarget } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
@@ -23,15 +26,22 @@ 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';
 import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 
 var CallHierarchyTreePeekWidget_1;
 const _moduleId = "vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek";
+var State;
+( ((function(State) {
+    State["Loading"] = "loading";
+    State["Message"] = "message";
+    State["Data"] = "data";
+})(State || (State = {}))));
 class LayoutInfo {
     static store(info, storageService) {
-        storageService.store('callHierarchyPeekLayout', JSON.stringify(info), 0 , 1 );
+        storageService.store('callHierarchyPeekLayout', JSON.stringify(info), StorageScope.PROFILE, StorageTarget.MACHINE);
     }
     static retrieve(storageService) {
-        const value = storageService.get('callHierarchyPeekLayout', 0 , '{}');
+        const value = storageService.get('callHierarchyPeekLayout', StorageScope.PROFILE, '{}');
         const defaultInfo = { ratio: 0.7, height: 17 };
         try {
             return { ...defaultInfo, ...JSON.parse(value) };
@@ -115,7 +125,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         const container = document.createElement('div');
         container.classList.add('results');
         parent.appendChild(container);
-        this._splitView = ( (new SplitView(container, { orientation: 1  })));
+        this._splitView = ( (new SplitView(container, { orientation: Orientation.HORIZONTAL })));
         const editorContainer = document.createElement('div');
         editorContainer.classList.add('editor');
         container.appendChild(editorContainer);
@@ -223,7 +233,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         this._previewDisposable.clear();
         const options = {
             description: 'call-hierarchy-decoration',
-            stickiness: 1 ,
+            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
             className: 'call-decoration',
             overviewRuler: {
                 color: themeColorFromId(peekViewEditorMatchHighlight),
@@ -231,7 +241,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
             },
         };
         let previewUri;
-        if (this._direction === "outgoingCalls" ) {
+        if (this._direction === CallHierarchyDirection.CallsFrom) {
             previewUri = element.parent ? element.parent.item.uri : element.model.root.uri;
         }
         else {
@@ -252,23 +262,23 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
             }
         }
         if (fullRange) {
-            this._editor.revealRangeInCenter(fullRange, 1 );
+            this._editor.revealRangeInCenter(fullRange, ScrollType.Immediate);
             const decorationsCollection = this._editor.createDecorationsCollection(decorations);
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === "outgoingCalls"
+        const title = this._direction === CallHierarchyDirection.CallsFrom
             ? ( localizeWithPath(_moduleId, 0, "Calls from '{0}'", element.model.root.name))
             : ( localizeWithPath(_moduleId, 1, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
-        this._parent.dataset['state'] = "loading" ;
+        this._parent.dataset['state'] = State.Loading;
         this.setTitle(( localizeWithPath(_moduleId, 2, "Loading...")));
         this._show();
     }
     showMessage(message) {
-        this._parent.dataset['state'] = "message" ;
+        this._parent.dataset['state'] = State.Message;
         this.setTitle('');
         this.setMetaTitle('');
         this._message.innerText = message;
@@ -282,12 +292,12 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         const root = this._tree.getNode(model).children[0];
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
-            this.showMessage(this._direction === "outgoingCalls"
+            this.showMessage(this._direction === CallHierarchyDirection.CallsFrom
                 ? ( localizeWithPath(_moduleId, 3, "No calls from '{0}'", model.root.name))
                 : ( localizeWithPath(_moduleId, 4, "No callers of '{0}'", model.root.name)));
         }
         else {
-            this._parent.dataset['state'] = "data" ;
+            this._parent.dataset['state'] = State.Data;
             if (!viewState || this._tree.getFocus().length === 0) {
                 this._tree.setFocus([root.children[0].element]);
             }
@@ -311,7 +321,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
     }
     _show() {
         if (!this._isShowing) {
-            this.editor.revealLineInCenterIfOutsideViewport(this._where.lineNumber, 0 );
+            this.editor.revealLineInCenterIfOutsideViewport(this._where.lineNumber, ScrollType.Smooth);
             super.show(Range.fromPositions(this._where), this._layoutInfo.height);
         }
     }

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

@@ -1,8 +1,8 @@
-import { CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
+import { CallHierarchyModel, CallHierarchyDirection } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
-import { SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
+import { SymbolTag, SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
 import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -38,7 +38,7 @@ class DataSource {
             );
         }
         const { model, item } = element;
-        if (this.getDirection() === "outgoingCalls" ) {
+        if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
             return (
                  ((await model.resolveOutgoingCalls(item, CancellationToken.None)).map(call => {
                     return (
@@ -107,7 +107,7 @@ class CallRenderer {
     }
     renderElement(node, _index, template) {
         const { element, filterData } = node;
-        const deprecated = element.item.tags?.includes(1 );
+        const deprecated = element.item.tags?.includes(SymbolTag.Deprecated);
         template.icon.className = '';
         template.icon.classList.add('inline', ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.item.kind)));
         template.label.setLabel(element.item.name, element.item.detail, { labelEscapeNewLines: true, matches: createMatches(filterData), strikethrough: deprecated });
@@ -132,7 +132,7 @@ class AccessibilityProvider {
         return ( localizeWithPath(_moduleId, 0, "Call Hierarchy"));
     }
     getAriaLabel(element) {
-        if (this.getDirection() === "outgoingCalls" ) {
+        if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
             return ( localizeWithPath(_moduleId, 1, "calls from {0}", element.item.name));
         }
         else {

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

@@ -1,7 +1,8 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { CustomEditorInputSerializer, ComplexCustomWorkingCopyEditorHandler } from './customEditorInputFactory.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -15,4 +16,4 @@ import './customEditors.js';
 ]);
 ( Registry.as(EditorExtensions.EditorFactory))
     .registerEditorSerializer(CustomEditorInputSerializer.ID, CustomEditorInputSerializer);
-registerWorkbenchContribution2(ComplexCustomWorkingCopyEditorHandler.ID, ComplexCustomWorkingCopyEditorHandler, 1 );
+registerWorkbenchContribution2(ComplexCustomWorkingCopyEditorHandler.ID, ComplexCustomWorkingCopyEditorHandler, WorkbenchPhase.BlockStartup);

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js

@@ -7,6 +7,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { ICustomEditorService } from 'vscode/vscode/vs/workbench/contrib/customEditor/common/customEditor.service';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { WebviewContentPurpose } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { WebviewEditorInputSerializer, reviveWebviewExtensionDescription, restoreWebviewOptions, restoreWebviewContentOptions } from '../../webviewPanel/browser/webviewEditorInputSerializer.js';
 import { IWebviewWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
@@ -63,7 +64,7 @@ function reviveWebview(webviewService, data) {
         origin: data.origin,
         title: undefined,
         options: {
-            purpose: "customEditor" ,
+            purpose: WebviewContentPurpose.CustomEditor,
             enableFindWidget: data.webviewOptions.enableFindWidget,
             retainContextWhenHidden: data.webviewOptions.retainContextWhenHidden,
         },