@codingame/monaco-vscode-view-common-service-override 10.1.4 → 11.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "10.1.4",
+  "version": "11.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,9 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.4",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "10.1.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.1",
+    "@codingame/monaco-vscode-explorer-outline-timeline-view-common-views-workbench-common": "11.0.1",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "11.0.1",
+    "@codingame/monaco-vscode-view-common-views-workbench-common": "11.0.1"
   }
 }

package/viewCommon.js

@@ -2,11 +2,11 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { ViewDescriptorService } from './vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
-import { ActivityService } from './vscode/src/vs/workbench/services/activity/browser/activityService.js';
+import { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
 import { EditorResolverService } from './vscode/src/vs/workbench/services/editor/browser/editorResolverService.js';
-import { BreadcrumbsService } from 'vscode/vscode/vs/workbench/browser/parts/editor/breadcrumbs';
+import { BreadcrumbsService } from '@codingame/monaco-vscode-explorer-outline-timeline-view-common-views-workbench-common/vscode/vs/workbench/browser/parts/editor/breadcrumbs';
 import { IBreadcrumbsService } from 'vscode/vscode/vs/workbench/browser/parts/editor/breadcrumbs.service';
 import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { ContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextViewService';
@@ -63,9 +63,9 @@ import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution._aut
 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 'vscode/vscode/vs/workbench/browser/style';
 import './tools/editorAssets.js';
-import './vscode/src/vs/workbench/browser/parts/editor/editorParts.js';
+import '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/workbench/browser/parts/editor/editorParts';
 
 let webviewIframeAlternateDomains;
 registerAssets({

package/vscode/src/vs/platform/actions/browser/actionViewItemService.js

@@ -1,5 +1,6 @@
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
 class ActionViewItemService {
@@ -11,11 +12,11 @@ class ActionViewItemService {
     dispose() {
         this._onDidChange.dispose();
     }
-    register(menu, commandId, provider, event) {
-        const id = this._makeKey(menu, commandId);
+    register(menu, commandOrSubmenuId, provider, event) {
+        const id = this._makeKey(menu, commandOrSubmenuId);
         if (( this._providers.has(id))) {
             throw ( new Error(
-                `A provider for the command ${commandId} and menu ${menu} is already registered.`
+                `A provider for the command ${commandOrSubmenuId} and menu ${menu} is already registered.`
             ));
         }
         this._providers.set(id, provider);
@@ -27,11 +28,11 @@ class ActionViewItemService {
             this._providers.delete(id);
         });
     }
-    lookUp(menu, commandId) {
-        return this._providers.get(this._makeKey(menu, commandId));
+    lookUp(menu, commandOrMenuId) {
+        return this._providers.get(this._makeKey(menu, commandOrMenuId));
     }
-    _makeKey(menu, commandId) {
-        return menu.id + commandId;
+    _makeKey(menu, commandOrMenuId) {
+        return `${menu.id}/${(commandOrMenuId instanceof MenuId ? commandOrMenuId.id : commandOrMenuId)}`;
     }
 }