@codingame/monaco-vscode-view-common-service-override 4.5.1 → 5.0.0

package/package.json

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

package/viewCommon.js

@@ -33,10 +33,8 @@ import { BrowserAuxiliaryWindowService } from './vscode/src/vs/workbench/service
 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';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IEditorPaneService } from 'vscode/vscode/vs/workbench/services/editor/common/editorPaneService.service';
 import { EditorPaneService } from './vscode/src/vs/workbench/services/editor/browser/editorPaneService.js';
-import { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
 import { CustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService';
 import { ICustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService.service';
 import getServiceOverride$1 from '@codingame/monaco-vscode-bulk-edit-service-override';
@@ -58,9 +56,9 @@ import 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.contribution'
 import './vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js';
 import './vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js';
 import './vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js';
-import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.autosave.contribution';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/files.editorPane.contribution';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands.save';
+import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution._autosave';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution._editorPane';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands._save';
 import './vscode/src/vs/workbench/browser/actions/navigationActions.js';
 import './vscode/src/vs/workbench/browser/style.js';
 import './tools/editorAssets.js';
@@ -83,7 +81,6 @@ function getServiceOverride(_webviewIframeAlternateDomains) {
         [( IViewDescriptorService.toString())]: new SyncDescriptor(ViewDescriptorService, [], true),
         [( IActivityService.toString())]: new SyncDescriptor(ActivityService, [], true),
         [( IPaneCompositePartService.toString())]: new SyncDescriptor(PaneCompositePartService, [], true),
-        [( IHoverService.toString())]: new SyncDescriptor(HoverService, [], true),
         [( ICodeEditorService.toString())]: new SyncDescriptor(CodeEditorService, [], true),
         [( ITextEditorService.toString())]: new SyncDescriptor(TextEditorService, [], false),
         [( IEditorResolverService.toString())]: new SyncDescriptor(EditorResolverService, [], false),

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

@@ -20,7 +20,7 @@ function getGridNode(node, location) {
         return node;
     }
     if (!isGridBranchNode(node)) {
-        throw new Error('Invalid location');
+        throw ( new Error('Invalid location'));
     }
     const [index, ...rest] = location;
     return getGridNode(node.children[index], rest);
@@ -82,7 +82,7 @@ function getRelativeLocation(rootOrientation, location, direction) {
 function indexInParent(element) {
     const parentElement = element.parentElement;
     if (!parentElement) {
-        throw new Error('Invalid grid element');
+        throw ( new Error('Invalid grid element'));
     }
     let el = parentElement.firstElementChild;
     let index = 0;
@@ -95,7 +95,7 @@ function indexInParent(element) {
 function getGridLocation(element) {
     const parentElement = element.parentElement;
     if (!parentElement) {
-        throw new Error('Invalid grid element');
+        throw ( new Error('Invalid grid element'));
     }
     if (/\bmonaco-grid-view\b/.test(parentElement.className)) {
         return [];
@@ -154,7 +154,7 @@ class Grid extends Disposable {
     }
     addView(newView, size, referenceView, direction) {
         if (( this.views.has(newView))) {
-            throw new Error('Can\'t add same view twice');
+            throw ( new Error('Can\'t add same view twice'));
         }
         const orientation = getDirectionOrientation(direction);
         if (this.views.size === 1 && this.orientation !== orientation) {
@@ -184,7 +184,7 @@ class Grid extends Disposable {
     }
     addViewAt(newView, size, location) {
         if (( this.views.has(newView))) {
-            throw new Error('Can\'t add same view twice');
+            throw ( new Error('Can\'t add same view twice'));
         }
         let viewSize;
         if (typeof size === 'number') {
@@ -204,7 +204,7 @@ class Grid extends Disposable {
     }
     removeView(view, sizing) {
         if (this.views.size === 1) {
-            throw new Error('Can\'t remove last view');
+            throw ( new Error('Can\'t remove last view'));
         }
         const location = this.getViewLocation(view);
         let gridViewSizing;
@@ -283,7 +283,7 @@ class Grid extends Disposable {
     }
     maximizeView(view) {
         if (this.views.size < 2) {
-            throw new Error('At least two views are required to maximize a view');
+            throw ( new Error('At least two views are required to maximize a view'));
         }
         const location = this.getViewLocation(view);
         this.gridview.maximizeView(location);
@@ -311,7 +311,7 @@ class Grid extends Disposable {
     }
     getNeighborViews(view, direction, wrap = false) {
         if (!this.didLayout) {
-            throw new Error('Can\'t call getNeighborViews before first layout');
+            throw ( new Error('Can\'t call getNeighborViews before first layout'));
         }
         const location = this.getViewLocation(view);
         const root = this.getViews();
@@ -337,7 +337,7 @@ class Grid extends Disposable {
     getViewLocation(view) {
         const element = this.views.get(view);
         if (!element) {
-            throw new Error('View not found');
+            throw ( new Error('View not found'));
         }
         return getGridLocation(element);
     }
@@ -392,13 +392,13 @@ class SerializableGrid extends Grid {
     }
     static deserialize(json, deserializer, options = {}) {
         if (typeof json.orientation !== 'number') {
-            throw new Error('Invalid JSON: \'orientation\' property must be a number.');
+            throw ( new Error('Invalid JSON: \'orientation\' property must be a number.'));
         }
         else if (typeof json.width !== 'number') {
-            throw new Error('Invalid JSON: \'width\' property must be a number.');
+            throw ( new Error('Invalid JSON: \'width\' property must be a number.'));
         }
         else if (typeof json.height !== 'number') {
-            throw new Error('Invalid JSON: \'height\' property must be a number.');
+            throw ( new Error('Invalid JSON: \'height\' property must be a number.'));
         }
         const gridview = GridView.deserialize(json, deserializer, options);
         const result = ( new SerializableGrid(gridview, options));

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

@@ -39,7 +39,7 @@ function fromAbsoluteBoundarySashes(sashes, orientation) {
 }
 function validateIndex(index, numChildren) {
     if (Math.abs(index) > numChildren) {
-        throw new Error('Invalid index');
+        throw ( new Error('Invalid index'));
     }
     return rot(index, numChildren + 1);
 }
@@ -223,7 +223,7 @@ class BranchNode {
             return;
         }
         if (typeof ctx === 'undefined') {
-            throw new Error('Invalid state');
+            throw ( new Error('Invalid state'));
         }
         this._size = ctx.orthogonalSize;
         this._orthogonalSize = size;
@@ -536,7 +536,7 @@ class LeafNode {
             return;
         }
         if (typeof ctx === 'undefined') {
-            throw new Error('Invalid state');
+            throw ( new Error('Invalid state'));
         }
         this._size = size;
         this._orthogonalSize = ctx.orthogonalSize;
@@ -729,16 +729,16 @@ class GridView {
         const [rest, index] = tail2(location);
         const [pathToParent, parent] = this.getNode(rest);
         if (!(parent instanceof BranchNode)) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         const node = parent.children[index];
         if (!(node instanceof LeafNode)) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         parent.removeChild(index, sizing);
         node.dispose();
         if (parent.children.length === 0) {
-            throw new Error('Invalid grid state');
+            throw ( new Error('Invalid grid state'));
         }
         if (parent.children.length > 1) {
             this.trySet2x2();
@@ -793,7 +793,7 @@ class GridView {
         }
         const [, parent] = this.getNode(parentLocation);
         if (!(parent instanceof BranchNode)) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         parent.moveChild(from, to);
         this.trySet2x2();
@@ -805,22 +805,22 @@ class GridView {
         const [fromRest, fromIndex] = tail2(from);
         const [, fromParent] = this.getNode(fromRest);
         if (!(fromParent instanceof BranchNode)) {
-            throw new Error('Invalid from location');
+            throw ( new Error('Invalid from location'));
         }
         const fromSize = fromParent.getChildSize(fromIndex);
         const fromNode = fromParent.children[fromIndex];
         if (!(fromNode instanceof LeafNode)) {
-            throw new Error('Invalid from location');
+            throw ( new Error('Invalid from location'));
         }
         const [toRest, toIndex] = tail2(to);
         const [, toParent] = this.getNode(toRest);
         if (!(toParent instanceof BranchNode)) {
-            throw new Error('Invalid to location');
+            throw ( new Error('Invalid to location'));
         }
         const toSize = toParent.getChildSize(toIndex);
         const toNode = toParent.children[toIndex];
         if (!(toNode instanceof LeafNode)) {
-            throw new Error('Invalid to location');
+            throw ( new Error('Invalid to location'));
         }
         if (fromParent === toParent) {
             fromParent.swapChildren(fromIndex, toIndex);
@@ -840,7 +840,7 @@ class GridView {
         const [rest, index] = tail2(location);
         const [pathToParent, parent] = this.getNode(rest);
         if (!(parent instanceof BranchNode)) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         if (!size.width && !size.height) {
             return;
@@ -867,7 +867,7 @@ class GridView {
         const [rest, index] = tail2(location);
         const [, parent] = this.getNode(rest);
         if (!(parent instanceof BranchNode)) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         return parent.getChildCachedVisibleSize(index);
     }
@@ -877,7 +877,7 @@ class GridView {
         }
         const [ancestors, node] = this.getNode(location);
         if (!(node instanceof LeafNode)) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         for (let i = 0; i < ancestors.length; i++) {
             ancestors[i].resizeChild(location[i], Number.POSITIVE_INFINITY);
@@ -889,7 +889,7 @@ class GridView {
         }
         const [ancestors, node] = this.getNode(location);
         if (!(node instanceof LeafNode)) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         for (let i = 0; i < ancestors.length; i++) {
             if (!ancestors[i].isChildExpanded(location[i])) {
@@ -901,7 +901,7 @@ class GridView {
     maximizeView(location) {
         const [, nodeToMaximize] = this.getNode(location);
         if (!(nodeToMaximize instanceof LeafNode)) {
-            throw new Error('Location is not a LeafNode');
+            throw ( new Error('Location is not a LeafNode'));
         }
         if (this.maximizedNode === nodeToMaximize) {
             return;
@@ -951,7 +951,7 @@ class GridView {
     isViewMaximized(location) {
         const [, node] = this.getNode(location);
         if (!(node instanceof LeafNode)) {
-            throw new Error('Location is not a LeafNode');
+            throw ( new Error('Location is not a LeafNode'));
         }
         return node === this.maximizedNode;
     }
@@ -965,7 +965,7 @@ class GridView {
         }
         const [, node] = this.getNode(location);
         if (!(node instanceof BranchNode)) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         node.distributeViewSizes();
         this.trySet2x2();
@@ -974,7 +974,7 @@ class GridView {
         const [rest, index] = tail2(location);
         const [, parent] = this.getNode(rest);
         if (!(parent instanceof BranchNode)) {
-            throw new Error('Invalid from location');
+            throw ( new Error('Invalid from location'));
         }
         return parent.isChildVisible(index);
     }
@@ -986,7 +986,7 @@ class GridView {
         const [rest, index] = tail2(location);
         const [, parent] = this.getNode(rest);
         if (!(parent instanceof BranchNode)) {
-            throw new Error('Invalid from location');
+            throw ( new Error('Invalid from location'));
         }
         parent.setChildVisible(index, visible);
     }
@@ -996,16 +996,16 @@ class GridView {
     }
     static deserialize(json, deserializer, options = {}) {
         if (typeof json.orientation !== 'number') {
-            throw new Error('Invalid JSON: \'orientation\' property must be a number.');
+            throw ( new Error('Invalid JSON: \'orientation\' property must be a number.'));
         }
         else if (typeof json.width !== 'number') {
-            throw new Error('Invalid JSON: \'width\' property must be a number.');
+            throw ( new Error('Invalid JSON: \'width\' property must be a number.'));
         }
         else if (typeof json.height !== 'number') {
-            throw new Error('Invalid JSON: \'height\' property must be a number.');
+            throw ( new Error('Invalid JSON: \'height\' property must be a number.'));
         }
         else if (json.root?.type !== 'branch') {
-            throw new Error('Invalid JSON: \'root\' property must have \'type\' value of branch.');
+            throw ( new Error('Invalid JSON: \'root\' property must have \'type\' value of branch.'));
         }
         const orientation = json.orientation;
         const height = json.height;
@@ -1070,11 +1070,11 @@ class GridView {
             return [path, node];
         }
         if (!(node instanceof BranchNode)) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         const [index, ...rest] = location;
         if (index < 0 || index >= node.children.length) {
-            throw new Error('Invalid location');
+            throw ( new Error('Invalid location'));
         }
         const child = node.children[index];
         path.push(node);

package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js

@@ -1,8 +1,9 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 
-const open = ( localizeWithPath('vs/platform/languagePacks/common/localizedStrings', 'open', 'open'));
-const close = ( localizeWithPath('vs/platform/languagePacks/common/localizedStrings', 'close', 'close'));
-const find = ( localizeWithPath('vs/platform/languagePacks/common/localizedStrings', 'find', 'find'));
+const _moduleId = "vs/platform/languagePacks/common/localizedStrings";
+const open = ( localizeWithPath(_moduleId, 0, 'open'));
+const close = ( localizeWithPath(_moduleId, 1, 'close'));
+const find = ( localizeWithPath(_moduleId, 2, 'find'));
 var localizedStrings = {
     open: open,
     close: close,