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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "5.3.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "5.3.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "6.0.0"
   }
 }

package/viewCommon.js

@@ -29,7 +29,7 @@ import { IWebviewViewService } from 'vscode/vscode/vs/workbench/contrib/webviewV
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { ProgressService } from './vscode/src/vs/workbench/services/progress/browser/progressService.js';
 import { PaneCompositePartService } from './vscode/src/vs/workbench/browser/parts/paneCompositePartService.js';
-import { BrowserAuxiliaryWindowService } from './vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js';
+import { BrowserAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
 import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/viewsService';

package/vscode/src/vs/base/browser/ui/centered/centeredViewLayout.js

@@ -2,6 +2,7 @@ import { $ } from 'vscode/vscode/vs/base/browser/dom';
 import { SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 
 const defaultState = {
     targetWidth: 900,
@@ -125,7 +126,7 @@ class CenteredViewLayout {
             this.container.removeChild(this.view.element);
             this.splitView = ( new SplitView(this.container, {
                 inverseAltBehavior: true,
-                orientation: 1 ,
+                orientation: Orientation.HORIZONTAL,
                 styles: this.style
             }));
             this.splitView.orthogonalStartSash = this.boundarySashes.top;

package/vscode/src/vs/base/browser/ui/grid/grid.js

@@ -1,15 +1,25 @@
+import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
+export { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 import { tail2, equals } from 'vscode/vscode/vs/base/common/arrays';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import './gridview.css.js';
 import { orthogonal, GridView } from './gridview.js';
 import { Sizing as Sizing$1 } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+export { LayoutPriority } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 
+var Direction;
+( (function(Direction) {
+    Direction[Direction["Up"] = 0] = "Up";
+    Direction[Direction["Down"] = 1] = "Down";
+    Direction[Direction["Left"] = 2] = "Left";
+    Direction[Direction["Right"] = 3] = "Right";
+})(Direction || (Direction = {})));
 function oppositeDirection(direction) {
     switch (direction) {
-        case 0 : return 1 ;
-        case 1 : return 0 ;
-        case 2 : return 3 ;
-        case 3 : return 2 ;
+        case Direction.Up: return Direction.Down;
+        case Direction.Down: return Direction.Up;
+        case Direction.Left: return Direction.Right;
+        case Direction.Right: return Direction.Left;
     }
 }
 function isGridBranchNode(node) {
@@ -30,13 +40,13 @@ function intersects(one, other) {
 }
 function getBoxBoundary(box, direction) {
     const orientation = getDirectionOrientation(direction);
-    const offset = direction === 0  ? box.top :
-        direction === 3  ? box.left + box.width :
-            direction === 1  ? box.top + box.height :
+    const offset = direction === Direction.Up ? box.top :
+        direction === Direction.Right ? box.left + box.width :
+            direction === Direction.Down ? box.top + box.height :
                 box.left;
     const range = {
-        start: orientation === 1  ? box.top : box.left,
-        end: orientation === 1  ? box.top + box.height : box.left + box.width
+        start: orientation === Orientation.HORIZONTAL ? box.top : box.left,
+        end: orientation === Orientation.HORIZONTAL ? box.top + box.height : box.left + box.width
     };
     return { offset, range };
 }
@@ -62,20 +72,20 @@ function getLocationOrientation(rootOrientation, location) {
     return location.length % 2 === 0 ? orthogonal(rootOrientation) : rootOrientation;
 }
 function getDirectionOrientation(direction) {
-    return direction === 0  || direction === 1  ? 0  : 1 ;
+    return direction === Direction.Up || direction === Direction.Down ? Orientation.VERTICAL : Orientation.HORIZONTAL;
 }
 function getRelativeLocation(rootOrientation, location, direction) {
     const orientation = getLocationOrientation(rootOrientation, location);
     const directionOrientation = getDirectionOrientation(direction);
     if (orientation === directionOrientation) {
         let [rest, index] = tail2(location);
-        if (direction === 3  || direction === 1 ) {
+        if (direction === Direction.Right || direction === Direction.Down) {
             index += 1;
         }
         return [...rest, index];
     }
     else {
-        const index = ((direction === 3  || direction === 1) ) ? 1 : 0;
+        const index = (direction === Direction.Right || direction === Direction.Down) ? 1 : 0;
         return [...location, index];
     }
 }
@@ -244,7 +254,7 @@ class Grid extends Disposable {
             const orientation = getLocationOrientation(this.gridview.orientation, sourceLocation);
             const cachedViewSize = this.getViewCachedVisibleSize(view);
             const sizing = typeof cachedViewSize === 'undefined'
-                ? (orientation === 1  ? size.width : size.height)
+                ? (orientation === Orientation.HORIZONTAL ? size.width : size.height)
                 : Sizing.Invisible(cachedViewSize);
             this.removeView(view);
             this.addViewAt(view, sizing, location);
@@ -318,16 +328,16 @@ class Grid extends Disposable {
         const node = getGridNode(root, location);
         let boundary = getBoxBoundary(node.box, direction);
         if (wrap) {
-            if (direction === 0  && node.box.top === 0) {
+            if (direction === Direction.Up && node.box.top === 0) {
                 boundary = { offset: root.box.top + root.box.height, range: boundary.range };
             }
-            else if (direction === 3  && node.box.left + node.box.width === root.box.width) {
+            else if (direction === Direction.Right && node.box.left + node.box.width === root.box.width) {
                 boundary = { offset: 0, range: boundary.range };
             }
-            else if (direction === 1  && node.box.top + node.box.height === root.box.height) {
+            else if (direction === Direction.Down && node.box.top + node.box.height === root.box.height) {
                 boundary = { offset: 0, range: boundary.range };
             }
-            else if (direction === 2  && node.box.left === 0) {
+            else if (direction === Direction.Left && node.box.left === 0) {
                 boundary = { offset: root.box.left + root.box.width, range: boundary.range };
             }
         }
@@ -348,11 +358,11 @@ class Grid extends Disposable {
                 return false;
             }
             const direction = getLocationOrientation(this.orientation, location);
-            const size = direction === 1  ? node.view.preferredWidth : node.view.preferredHeight;
+            const size = direction === Orientation.HORIZONTAL ? node.view.preferredWidth : node.view.preferredHeight;
             if (typeof size !== 'number') {
                 return false;
             }
-            const viewSize = direction === 1  ? { width: Math.round(size) } : { height: Math.round(size) };
+            const viewSize = direction === Orientation.HORIZONTAL ? { width: Math.round(size) } : { height: Math.round(size) };
             this.gridview.resizeView(location, viewSize);
             return true;
         };
@@ -372,7 +382,7 @@ class SerializableGrid extends Grid {
         this.initialLayoutContext = true;
     }
     static serializeNode(node, orientation) {
-        const size = orientation === 0  ? node.box.width : node.box.height;
+        const size = orientation === Orientation.VERTICAL ? node.box.width : node.box.height;
         if (!isGridBranchNode(node)) {
             const serializedLeafNode = { type: 'leaf', data: node.view.toJSON(), size };
             if (typeof node.cachedVisibleSize === 'number') {
@@ -462,7 +472,7 @@ function createSerializedNode(nodeDescriptor) {
 function getDimensions(node, orientation) {
     if (node.type === 'branch') {
         const childrenDimensions = ( node.data.map(c => getDimensions(c, orthogonal(orientation))));
-        if (orientation === 0 ) {
+        if (orientation === Orientation.VERTICAL) {
             const width = node.size || (childrenDimensions.length === 0 ? undefined : Math.max(...( childrenDimensions.map(d => d.width || 0))));
             const height = childrenDimensions.length === 0 ? undefined : childrenDimensions.reduce((r, d) => r + (d.height || 0), 0);
             return { width, height };
@@ -474,8 +484,8 @@ function getDimensions(node, orientation) {
         }
     }
     else {
-        const width = orientation === 0  ? node.size : undefined;
-        const height = orientation === 0  ? undefined : node.size;
+        const width = orientation === Orientation.VERTICAL ? node.size : undefined;
+        const height = orientation === Orientation.VERTICAL ? undefined : node.size;
         return { width, height };
     }
 }
@@ -491,4 +501,4 @@ function createSerializedGrid(gridDescriptor) {
     };
 }
 
-export { Grid, SerializableGrid, Sizing, createSerializedGrid, getRelativeLocation, isGridBranchNode, orthogonal, sanitizeGridNodeDescriptor };
+export { Direction, Grid, SerializableGrid, Sizing, createSerializedGrid, getRelativeLocation, isGridBranchNode, orthogonal, sanitizeGridNodeDescriptor };

package/vscode/src/vs/base/browser/ui/grid/gridview.js

@@ -1,6 +1,8 @@
 import { $ } from 'vscode/vscode/vs/base/browser/dom';
-import { SplitView, Sizing } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
-export { Sizing } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
+export { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
+import { LayoutPriority, SplitView, Sizing } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+export { LayoutPriority, Sizing } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 import { equals, tail2 } from 'vscode/vscode/vs/base/common/arrays';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { Emitter, Event, Relay } from 'vscode/vscode/vs/base/common/event';
@@ -8,13 +10,12 @@ import { DisposableStore, Disposable, toDisposable } from 'vscode/vscode/vs/base
 import { rot } from 'vscode/vscode/vs/base/common/numbers';
 import { isUndefined } from 'vscode/vscode/vs/base/common/types';
 import './gridview.css.js';
-import 'vscode/vscode/vs/base/browser/ui/sash/sash';
 
 const defaultStyles = {
     separatorBorder: Color.transparent
 };
 function orthogonal(orientation) {
-    return orientation === 0  ? 1  : 0 ;
+    return orientation === Orientation.VERTICAL ? Orientation.HORIZONTAL : Orientation.VERTICAL;
 }
 class LayoutController {
     constructor(isLayoutEnabled) {
@@ -22,7 +23,7 @@ class LayoutController {
     }
 }
 function toAbsoluteBoundarySashes(sashes, orientation) {
-    if (orientation === 1 ) {
+    if (orientation === Orientation.HORIZONTAL) {
         return { left: sashes.start, right: sashes.end, top: sashes.orthogonalStart, bottom: sashes.orthogonalEnd };
     }
     else {
@@ -30,7 +31,7 @@ function toAbsoluteBoundarySashes(sashes, orientation) {
     }
 }
 function fromAbsoluteBoundarySashes(sashes, orientation) {
-    if (orientation === 1 ) {
+    if (orientation === Orientation.HORIZONTAL) {
         return { start: sashes.left, end: sashes.right, orthogonalStart: sashes.top, orthogonalEnd: sashes.bottom };
     }
     else {
@@ -50,16 +51,16 @@ class BranchNode {
     get absoluteOrthogonalOffset() { return this._absoluteOrthogonalOffset; }
     get styles() { return this._styles; }
     get width() {
-        return this.orientation === 1  ? this.size : this.orthogonalSize;
+        return this.orientation === Orientation.HORIZONTAL ? this.size : this.orthogonalSize;
     }
     get height() {
-        return this.orientation === 1  ? this.orthogonalSize : this.size;
+        return this.orientation === Orientation.HORIZONTAL ? this.orthogonalSize : this.size;
     }
     get top() {
-        return this.orientation === 1  ? this._absoluteOffset : this._absoluteOrthogonalOffset;
+        return this.orientation === Orientation.HORIZONTAL ? this._absoluteOffset : this._absoluteOrthogonalOffset;
     }
     get left() {
-        return this.orientation === 1  ? this._absoluteOrthogonalOffset : this._absoluteOffset;
+        return this.orientation === Orientation.HORIZONTAL ? this._absoluteOrthogonalOffset : this._absoluteOffset;
     }
     get minimumSize() {
         return this.children.length === 0 ? 0 : Math.max(...( this.children.map(
@@ -73,18 +74,18 @@ class BranchNode {
     }
     get priority() {
         if (this.children.length === 0) {
-            return 0 ;
+            return LayoutPriority.Normal;
         }
         const priorities = ( this.children.map(
-            c => typeof c.priority === 'undefined' ? 0  : c.priority
+            c => typeof c.priority === 'undefined' ? LayoutPriority.Normal : c.priority
         ));
-        if (( priorities.some(p => p === 2 ))) {
-            return 2 ;
+        if (( priorities.some(p => p === LayoutPriority.High))) {
+            return LayoutPriority.High;
         }
-        else if (( priorities.some(p => p === 1 ))) {
-            return 1 ;
+        else if (( priorities.some(p => p === LayoutPriority.Low))) {
+            return LayoutPriority.Low;
         }
-        return 0 ;
+        return LayoutPriority.Normal;
     }
     get proportionalLayout() {
         if (this.children.length === 0) {
@@ -99,16 +100,16 @@ class BranchNode {
         return this.splitview.maximumSize;
     }
     get minimumWidth() {
-        return this.orientation === 1  ? this.minimumOrthogonalSize : this.minimumSize;
+        return this.orientation === Orientation.HORIZONTAL ? this.minimumOrthogonalSize : this.minimumSize;
     }
     get minimumHeight() {
-        return this.orientation === 1  ? this.minimumSize : this.minimumOrthogonalSize;
+        return this.orientation === Orientation.HORIZONTAL ? this.minimumSize : this.minimumOrthogonalSize;
     }
     get maximumWidth() {
-        return this.orientation === 1  ? this.maximumOrthogonalSize : this.maximumSize;
+        return this.orientation === Orientation.HORIZONTAL ? this.maximumOrthogonalSize : this.maximumSize;
     }
     get maximumHeight() {
-        return this.orientation === 1  ? this.maximumSize : this.maximumOrthogonalSize;
+        return this.orientation === Orientation.HORIZONTAL ? this.maximumSize : this.maximumOrthogonalSize;
     }
     get boundarySashes() { return this._boundarySashes; }
     set boundarySashes(boundarySashes) {
@@ -381,7 +382,7 @@ class BranchNode {
         if (!(otherFirstChild instanceof LeafNode) || !(otherSecondChild instanceof LeafNode)) {
             return Disposable.None;
         }
-        if (this.orientation === 0 ) {
+        if (this.orientation === Orientation.VERTICAL) {
             secondChild.linkedWidthNode = otherFirstChild.linkedHeightNode = firstChild;
             firstChild.linkedWidthNode = otherSecondChild.linkedHeightNode = secondChild;
             otherSecondChild.linkedWidthNode = firstChild.linkedHeightNode = otherFirstChild;
@@ -473,22 +474,22 @@ class LeafNode {
         const onDidChange = createLatchedOnDidChangeViewEvent(view);
         this._onDidViewChange = ( Event.map(
             onDidChange,
-            e => e && (this.orientation === 0  ? e.width : e.height),
+            e => e && (this.orientation === Orientation.VERTICAL ? e.width : e.height),
             this.disposables
         ));
         this.onDidChange = Event.any(this._onDidViewChange, this._onDidSetLinkedNode.event, this._onDidLinkedWidthNodeChange.event, this._onDidLinkedHeightNodeChange.event);
     }
     get width() {
-        return this.orientation === 1  ? this.orthogonalSize : this.size;
+        return this.orientation === Orientation.HORIZONTAL ? this.orthogonalSize : this.size;
     }
     get height() {
-        return this.orientation === 1  ? this.size : this.orthogonalSize;
+        return this.orientation === Orientation.HORIZONTAL ? this.size : this.orthogonalSize;
     }
     get top() {
-        return this.orientation === 1  ? this.absoluteOffset : this.absoluteOrthogonalOffset;
+        return this.orientation === Orientation.HORIZONTAL ? this.absoluteOffset : this.absoluteOrthogonalOffset;
     }
     get left() {
-        return this.orientation === 1  ? this.absoluteOrthogonalOffset : this.absoluteOffset;
+        return this.orientation === Orientation.HORIZONTAL ? this.absoluteOrthogonalOffset : this.absoluteOffset;
     }
     get element() {
         return this.view.element;
@@ -506,10 +507,10 @@ class LeafNode {
         return this.linkedHeightNode ? Math.min(this.linkedHeightNode.view.maximumHeight, this.view.maximumHeight) : this.view.maximumHeight;
     }
     get minimumSize() {
-        return this.orientation === 1  ? this.minimumHeight : this.minimumWidth;
+        return this.orientation === Orientation.HORIZONTAL ? this.minimumHeight : this.minimumWidth;
     }
     get maximumSize() {
-        return this.orientation === 1  ? this.maximumHeight : this.maximumWidth;
+        return this.orientation === Orientation.HORIZONTAL ? this.maximumHeight : this.maximumWidth;
     }
     get priority() {
         return this.view.priority;
@@ -521,10 +522,10 @@ class LeafNode {
         return this.view.snap;
     }
     get minimumOrthogonalSize() {
-        return this.orientation === 1  ? this.minimumWidth : this.minimumHeight;
+        return this.orientation === Orientation.HORIZONTAL ? this.minimumWidth : this.minimumHeight;
     }
     get maximumOrthogonalSize() {
-        return this.orientation === 1  ? this.maximumWidth : this.maximumHeight;
+        return this.orientation === Orientation.HORIZONTAL ? this.maximumWidth : this.maximumHeight;
     }
     get boundarySashes() { return this._boundarySashes; }
     set boundarySashes(boundarySashes) {
@@ -652,7 +653,7 @@ class GridView {
         this.proportionalLayout = typeof options.proportionalLayout !== 'undefined' ? !!options.proportionalLayout : true;
         this.layoutController = ( new LayoutController(false));
         this.root = ( new BranchNode(
-            0 ,
+            Orientation.VERTICAL,
             this.layoutController,
             this.styles,
             this.proportionalLayout
@@ -664,7 +665,7 @@ class GridView {
     }
     layout(width, height, top = 0, left = 0) {
         this.layoutController.isLayoutEnabled = true;
-        const [size, orthogonalSize, offset, orthogonalOffset] = this.root.orientation === 1  ? [height, width, top, left] : [width, height, left, top];
+        const [size, orthogonalSize, offset, orthogonalOffset] = this.root.orientation === Orientation.HORIZONTAL ? [height, width, top, left] : [width, height, left, top];
         this.root.layout(size, 0, { orthogonalSize, absoluteOffset: offset, absoluteOrthogonalOffset: orthogonalOffset, absoluteSize: size, absoluteOrthogonalSize: orthogonalSize });
     }
     addView(view, size, location) {
@@ -845,7 +846,7 @@ class GridView {
         if (!size.width && !size.height) {
             return;
         }
-        const [parentSize, grandParentSize] = parent.orientation === 1  ? [size.width, size.height] : [size.height, size.width];
+        const [parentSize, grandParentSize] = parent.orientation === Orientation.HORIZONTAL ? [size.width, size.height] : [size.height, size.width];
         if (typeof grandParentSize === 'number' && pathToParent.length > 0) {
             const [, grandParent] = tail2(pathToParent);
             const [, parentIndex] = tail2(rest);

package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js

@@ -9,10 +9,10 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/browser/panecomposite';
-import { RawCustomTreeViewContextKey, TreeViewPane, CustomTreeView } from 'vscode/vscode/vs/workbench/browser/parts/views/treeView';
+import { TreeViewPane, CustomTreeView } from 'vscode/vscode/vs/workbench/browser/parts/views/treeView';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { Extensions, ResolvableTreeItem } from 'vscode/vscode/vs/workbench/common/views';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { VIEWLET_ID as VIEWLET_ID$3 } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { VIEWLET_ID as VIEWLET_ID$1 } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/remote/browser/remoteExplorer';
@@ -20,14 +20,6 @@ import { VIEWLET_ID as VIEWLET_ID$2 } from 'vscode/vscode/vs/workbench/contrib/s
 import { WebviewViewPane } from '../../contrib/webviewView/browser/webviewViewPane.js';
 import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
-import { WorkbenchListFocusContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService.service';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
-import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
-import { AsyncDataTree } from 'vscode/vscode/vs/base/browser/ui/tree/asyncDataTree';
-import { ITreeViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/treeViewsService.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -193,7 +185,7 @@ const viewDescriptor = {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
                 19,
-                "When the accessibility help dialog is invoked in this view, this content will be presented to the user as a markdown string. Keybindings will be resolved when provided in the format of <keybinding:commandId>. If there is no keybinding, that will be indicated with a link to configure one."
+                "When the accessibility help dialog is invoked in this view, this content will be presented to the user as a markdown string. Keybindings will be resolved when provided in the format of <keybinding:commandId>. If there is no keybinding, that will be indicated and this command will be included in a quickpick for easy configuration."
             ))
         }
     }
@@ -311,49 +303,6 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
         this.viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
         this.handleAndRegisterCustomViewContainers();
         this.handleAndRegisterCustomViews();
-        let showTreeHoverCancellation = ( (new CancellationTokenSource()));
-        KeybindingsRegistry.registerCommandAndKeybindingRule({
-            id: 'workbench.action.showTreeHover',
-            handler: async (accessor, ...args) => {
-                showTreeHoverCancellation.cancel();
-                showTreeHoverCancellation = ( (new CancellationTokenSource()));
-                const listService = accessor.get(IListService);
-                const treeViewsService = accessor.get(ITreeViewsService);
-                const hoverService = accessor.get(IHoverService);
-                const lastFocusedList = listService.lastFocusedList;
-                if (!(lastFocusedList instanceof AsyncDataTree)) {
-                    return;
-                }
-                const focus = lastFocusedList.getFocus();
-                if (!focus || (focus.length === 0)) {
-                    return;
-                }
-                const treeItem = focus[0];
-                if (treeItem instanceof ResolvableTreeItem) {
-                    await treeItem.resolve(showTreeHoverCancellation.token);
-                }
-                if (!treeItem.tooltip) {
-                    return;
-                }
-                const element = treeViewsService.getRenderedTreeElement(('handle' in treeItem) ? treeItem.handle : treeItem);
-                if (!element) {
-                    return;
-                }
-                hoverService.showHover({
-                    content: treeItem.tooltip,
-                    target: element,
-                    position: {
-                        hoverPosition: 2 ,
-                    },
-                    persistence: {
-                        hideOnHover: false
-                    }
-                }, true);
-            },
-            weight: 200 ,
-            primary: KeyChord(2048  | 41 , 2048  | 39 ),
-            when: ( (ContextKeyExpr.and(RawCustomTreeViewContextKey, WorkbenchListFocusContextKey)))
-        });
     }
     handleAndRegisterCustomViewContainers() {
         viewsContainersExtensionPoint.setHandler((extensions, { added, removed }) => {
@@ -367,8 +316,8 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
     }
     addCustomViewContainers(extensionPoints, existingViewContainers) {
         const viewContainersRegistry = ( (Registry.as(Extensions.ViewContainersRegistry)));
-        let activityBarOrder = CUSTOM_VIEWS_START_ORDER + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === 0 ).length;
-        let panelOrder = 5 + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === 1 ).length + 1;
+        let activityBarOrder = CUSTOM_VIEWS_START_ORDER + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === ViewContainerLocation.Sidebar).length;
+        let panelOrder = 5 + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === ViewContainerLocation.Panel).length + 1;
         for (const { value, collector, description } of extensionPoints) {
             Object.entries(value).forEach(([key, value]) => {
                 if (!this.isValidViewsContainer(value, collector)) {
@@ -376,10 +325,10 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                 }
                 switch (key) {
                     case 'activitybar':
-                        activityBarOrder = this.registerCustomViewContainers(value, description, activityBarOrder, existingViewContainers, 0 );
+                        activityBarOrder = this.registerCustomViewContainers(value, description, activityBarOrder, existingViewContainers, ViewContainerLocation.Sidebar);
                         break;
                     case 'panel':
-                        panelOrder = this.registerCustomViewContainers(value, description, panelOrder, existingViewContainers, 1 );
+                        panelOrder = this.registerCustomViewContainers(value, description, panelOrder, existingViewContainers, ViewContainerLocation.Panel);
                         break;
                 }
             });
@@ -823,6 +772,6 @@ class ViewsDataRenderer extends Disposable {
     },
     renderer: ( (new SyncDescriptor(ViewsDataRenderer))),
 });
-registerWorkbenchContribution2(ViewsExtensionHandler.ID, ViewsExtensionHandler, 1 );
+registerWorkbenchContribution2(ViewsExtensionHandler.ID, ViewsExtensionHandler, WorkbenchPhase.BlockStartup);
 
 export { viewsContainersContribution };