@codingame/monaco-vscode-view-common-service-override 9.0.2 → 10.0.0

package/override/vs/workbench/browser/parts/editor/textEditor.weak.js

@@ -1,7 +1,7 @@
 let AbstractTextEditor = class {};
 class FakeAbstractTextEditor {
   static [Symbol.hasInstance](instance) {
-      return AbstractTextEditor != null && instance instanceof AbstractTextEditor
+    return AbstractTextEditor != null && instance instanceof AbstractTextEditor
   }
 }
 function setAbstractTextEditor(_AbstractTextEditor) {

package/package.json

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

package/viewCommon.js

@@ -37,6 +37,8 @@ import { IEditorPaneService } from 'vscode/vscode/vs/workbench/services/editor/c
 import { EditorPaneService } from './vscode/src/vs/workbench/services/editor/browser/editorPaneService.js';
 import { CustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService';
 import { ICustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService.service';
+import { ActionViewItemService } from './vscode/src/vs/platform/actions/browser/actionViewItemService.js';
+import { IActionViewItemService } from 'vscode/vscode/vs/platform/actions/browser/actionViewItemService.service';
 import getServiceOverride$1 from '@codingame/monaco-vscode-bulk-edit-service-override';
 import { changeUrlDomain } from './tools/url.js';
 import { registerAssets } from 'vscode/assets';
@@ -95,7 +97,8 @@ function getServiceOverride(_webviewIframeAlternateDomains) {
         [( IProgressService.toString())]: new SyncDescriptor(ProgressService, [], true),
         [( IAuxiliaryWindowService.toString())]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true),
         [( IEditorPaneService.toString())]: new SyncDescriptor(EditorPaneService, [], true),
-        [( ICustomEditorLabelService.toString())]: new SyncDescriptor(CustomEditorLabelService, [], true)
+        [( ICustomEditorLabelService.toString())]: new SyncDescriptor(CustomEditorLabelService, [], true),
+        [( IActionViewItemService.toString())]: new SyncDescriptor(ActionViewItemService, [], true)
     };
 }
 

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

@@ -2,7 +2,6 @@ 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,
@@ -126,7 +125,7 @@ class CenteredViewLayout {
             this.view.element.remove();
             this.splitView = ( new SplitView(this.container, {
                 inverseAltBehavior: true,
-                orientation: Orientation.HORIZONTAL,
+                orientation: 1 ,
                 styles: this.style
             }));
             this.splitView.orthogonalStartSash = this.boundarySashes.top;

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

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

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

@@ -1,8 +1,6 @@
 import { $ } from 'vscode/vscode/vs/base/browser/dom';
-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 { SplitView, Sizing } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+export { 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';
@@ -10,12 +8,13 @@ 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 === Orientation.VERTICAL ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+    return orientation === 0  ? 1  : 0 ;
 }
 class LayoutController {
     constructor(isLayoutEnabled) {
@@ -23,7 +22,7 @@ class LayoutController {
     }
 }
 function toAbsoluteBoundarySashes(sashes, orientation) {
-    if (orientation === Orientation.HORIZONTAL) {
+    if (orientation === 1 ) {
         return { left: sashes.start, right: sashes.end, top: sashes.orthogonalStart, bottom: sashes.orthogonalEnd };
     }
     else {
@@ -31,7 +30,7 @@ function toAbsoluteBoundarySashes(sashes, orientation) {
     }
 }
 function fromAbsoluteBoundarySashes(sashes, orientation) {
-    if (orientation === Orientation.HORIZONTAL) {
+    if (orientation === 1 ) {
         return { start: sashes.left, end: sashes.right, orthogonalStart: sashes.top, orthogonalEnd: sashes.bottom };
     }
     else {
@@ -51,16 +50,16 @@ class BranchNode {
     get absoluteOrthogonalOffset() { return this._absoluteOrthogonalOffset; }
     get styles() { return this._styles; }
     get width() {
-        return this.orientation === Orientation.HORIZONTAL ? this.size : this.orthogonalSize;
+        return this.orientation === 1  ? this.size : this.orthogonalSize;
     }
     get height() {
-        return this.orientation === Orientation.HORIZONTAL ? this.orthogonalSize : this.size;
+        return this.orientation === 1  ? this.orthogonalSize : this.size;
     }
     get top() {
-        return this.orientation === Orientation.HORIZONTAL ? this._absoluteOffset : this._absoluteOrthogonalOffset;
+        return this.orientation === 1  ? this._absoluteOffset : this._absoluteOrthogonalOffset;
     }
     get left() {
-        return this.orientation === Orientation.HORIZONTAL ? this._absoluteOrthogonalOffset : this._absoluteOffset;
+        return this.orientation === 1  ? this._absoluteOrthogonalOffset : this._absoluteOffset;
     }
     get minimumSize() {
         return this.children.length === 0 ? 0 : Math.max(...( this.children.map(
@@ -74,18 +73,18 @@ class BranchNode {
     }
     get priority() {
         if (this.children.length === 0) {
-            return LayoutPriority.Normal;
+            return 0 ;
         }
         const priorities = ( this.children.map(
-            c => typeof c.priority === 'undefined' ? LayoutPriority.Normal : c.priority
+            c => typeof c.priority === 'undefined' ? 0  : c.priority
         ));
-        if (( priorities.some(p => p === LayoutPriority.High))) {
-            return LayoutPriority.High;
+        if (( priorities.some(p => p === 2 ))) {
+            return 2 ;
         }
-        else if (( priorities.some(p => p === LayoutPriority.Low))) {
-            return LayoutPriority.Low;
+        else if (( priorities.some(p => p === 1 ))) {
+            return 1 ;
         }
-        return LayoutPriority.Normal;
+        return 0 ;
     }
     get proportionalLayout() {
         if (this.children.length === 0) {
@@ -100,16 +99,16 @@ class BranchNode {
         return this.splitview.maximumSize;
     }
     get minimumWidth() {
-        return this.orientation === Orientation.HORIZONTAL ? this.minimumOrthogonalSize : this.minimumSize;
+        return this.orientation === 1  ? this.minimumOrthogonalSize : this.minimumSize;
     }
     get minimumHeight() {
-        return this.orientation === Orientation.HORIZONTAL ? this.minimumSize : this.minimumOrthogonalSize;
+        return this.orientation === 1  ? this.minimumSize : this.minimumOrthogonalSize;
     }
     get maximumWidth() {
-        return this.orientation === Orientation.HORIZONTAL ? this.maximumOrthogonalSize : this.maximumSize;
+        return this.orientation === 1  ? this.maximumOrthogonalSize : this.maximumSize;
     }
     get maximumHeight() {
-        return this.orientation === Orientation.HORIZONTAL ? this.maximumSize : this.maximumOrthogonalSize;
+        return this.orientation === 1  ? this.maximumSize : this.maximumOrthogonalSize;
     }
     get boundarySashes() { return this._boundarySashes; }
     set boundarySashes(boundarySashes) {
@@ -382,7 +381,7 @@ class BranchNode {
         if (!(otherFirstChild instanceof LeafNode) || !(otherSecondChild instanceof LeafNode)) {
             return Disposable.None;
         }
-        if (this.orientation === Orientation.VERTICAL) {
+        if (this.orientation === 0 ) {
             secondChild.linkedWidthNode = otherFirstChild.linkedHeightNode = firstChild;
             firstChild.linkedWidthNode = otherSecondChild.linkedHeightNode = secondChild;
             otherSecondChild.linkedWidthNode = firstChild.linkedHeightNode = otherFirstChild;
@@ -474,22 +473,22 @@ class LeafNode {
         const onDidChange = createLatchedOnDidChangeViewEvent(view);
         this._onDidViewChange = ( Event.map(
             onDidChange,
-            e => e && (this.orientation === Orientation.VERTICAL ? e.width : e.height),
+            e => e && (this.orientation === 0  ? 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 === Orientation.HORIZONTAL ? this.orthogonalSize : this.size;
+        return this.orientation === 1  ? this.orthogonalSize : this.size;
     }
     get height() {
-        return this.orientation === Orientation.HORIZONTAL ? this.size : this.orthogonalSize;
+        return this.orientation === 1  ? this.size : this.orthogonalSize;
     }
     get top() {
-        return this.orientation === Orientation.HORIZONTAL ? this.absoluteOffset : this.absoluteOrthogonalOffset;
+        return this.orientation === 1  ? this.absoluteOffset : this.absoluteOrthogonalOffset;
     }
     get left() {
-        return this.orientation === Orientation.HORIZONTAL ? this.absoluteOrthogonalOffset : this.absoluteOffset;
+        return this.orientation === 1  ? this.absoluteOrthogonalOffset : this.absoluteOffset;
     }
     get element() {
         return this.view.element;
@@ -507,10 +506,10 @@ class LeafNode {
         return this.linkedHeightNode ? Math.min(this.linkedHeightNode.view.maximumHeight, this.view.maximumHeight) : this.view.maximumHeight;
     }
     get minimumSize() {
-        return this.orientation === Orientation.HORIZONTAL ? this.minimumHeight : this.minimumWidth;
+        return this.orientation === 1  ? this.minimumHeight : this.minimumWidth;
     }
     get maximumSize() {
-        return this.orientation === Orientation.HORIZONTAL ? this.maximumHeight : this.maximumWidth;
+        return this.orientation === 1  ? this.maximumHeight : this.maximumWidth;
     }
     get priority() {
         return this.view.priority;
@@ -522,10 +521,10 @@ class LeafNode {
         return this.view.snap;
     }
     get minimumOrthogonalSize() {
-        return this.orientation === Orientation.HORIZONTAL ? this.minimumWidth : this.minimumHeight;
+        return this.orientation === 1  ? this.minimumWidth : this.minimumHeight;
     }
     get maximumOrthogonalSize() {
-        return this.orientation === Orientation.HORIZONTAL ? this.maximumWidth : this.maximumHeight;
+        return this.orientation === 1  ? this.maximumWidth : this.maximumHeight;
     }
     get boundarySashes() { return this._boundarySashes; }
     set boundarySashes(boundarySashes) {
@@ -653,7 +652,7 @@ class GridView {
         this.proportionalLayout = typeof options.proportionalLayout !== 'undefined' ? !!options.proportionalLayout : true;
         this.layoutController = ( new LayoutController(false));
         this.root = ( new BranchNode(
-            Orientation.VERTICAL,
+            0 ,
             this.layoutController,
             this.styles,
             this.proportionalLayout
@@ -665,7 +664,7 @@ class GridView {
     }
     layout(width, height, top = 0, left = 0) {
         this.layoutController.isLayoutEnabled = true;
-        const [size, orthogonalSize, offset, orthogonalOffset] = this.root.orientation === Orientation.HORIZONTAL ? [height, width, top, left] : [width, height, left, top];
+        const [size, orthogonalSize, offset, orthogonalOffset] = this.root.orientation === 1  ? [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) {
@@ -846,7 +845,7 @@ class GridView {
         if (!size.width && !size.height) {
             return;
         }
-        const [parentSize, grandParentSize] = parent.orientation === Orientation.HORIZONTAL ? [size.width, size.height] : [size.height, size.width];
+        const [parentSize, grandParentSize] = parent.orientation === 1  ? [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/platform/actions/browser/actionViewItemService.js

@@ -0,0 +1,38 @@
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+
+class ActionViewItemService {
+    constructor() {
+        this._providers = ( new Map());
+        this._onDidChange = ( new Emitter());
+        this.onDidChange = this._onDidChange.event;
+    }
+    dispose() {
+        this._onDidChange.dispose();
+    }
+    register(menu, commandId, provider, event) {
+        const id = this._makeKey(menu, commandId);
+        if (( this._providers.has(id))) {
+            throw ( new Error(
+                `A provider for the command ${commandId} and menu ${menu} is already registered.`
+            ));
+        }
+        this._providers.set(id, provider);
+        const listener = event?.(() => {
+            this._onDidChange.fire(menu);
+        });
+        return toDisposable(() => {
+            listener?.dispose();
+            this._providers.delete(id);
+        });
+    }
+    lookUp(menu, commandId) {
+        return this._providers.get(this._makeKey(menu, commandId));
+    }
+    _makeKey(menu, commandId) {
+        return menu.id + commandId;
+    }
+}
+
+export { ActionViewItemService };