@codingame/monaco-vscode-views-service-override 3.0.0 → 3.1.0

package/index.d.ts

@@ -4,13 +4,13 @@ export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/br
 export { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';
 export { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
 export { PanelPart } from './vscode/src/vs/workbench/browser/parts/panel/panelPart.js';
-export { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
-export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
-export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-export { IView, SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+export { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 export { IResolvedTextEditorModel } from 'vscode/vscode/vs/editor/common/services/resolverService';
+export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+export { IView, SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 export { CustomViewOption, EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
 export { IViewContainerDescriptor, IViewDescriptor, ViewContainer, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,16 +18,16 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "3.0.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "3.0.0",
-    "@codingame/monaco-vscode-keybindings-service-override": "3.0.0",
-    "@codingame/monaco-vscode-files-service-override": "3.0.0",
-    "@codingame/monaco-vscode-extensions-service-override": "3.0.0",
-    "@codingame/monaco-vscode-environment-service-override": "3.0.0",
-    "@codingame/monaco-vscode-layout-service-override": "3.0.0",
-    "@codingame/monaco-vscode-host-service-override": "3.0.0",
-    "@codingame/monaco-vscode-base-service-override": "3.0.0"
+    "@codingame/monaco-vscode-bulk-edit-service-override": "3.1.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "3.1.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "3.1.0",
+    "@codingame/monaco-vscode-files-service-override": "3.1.0",
+    "@codingame/monaco-vscode-extensions-service-override": "3.1.0",
+    "@codingame/monaco-vscode-environment-service-override": "3.1.0",
+    "@codingame/monaco-vscode-layout-service-override": "3.1.0",
+    "@codingame/monaco-vscode-host-service-override": "3.1.0",
+    "@codingame/monaco-vscode-base-service-override": "3.1.0"
   }
 }

package/tools/editorAssets.js

@@ -0,0 +1,4 @@
+import pngAssets from 'vscode/vscode/vs/workbench/contrib/debug/browser/media/all.png';
+import { registerAssets } from 'vscode/assets';
+
+registerAssets(pngAssets);

package/views.js

@@ -12,30 +12,9 @@ import { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/br
 export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
 export { ActivitybarPart } from 'vscode/vscode/vs/workbench/browser/parts/activitybar/activitybarPart';
-import { ExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/explorerService';
-import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
 import { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';
 export { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/fileActions.contribution';
-import 'vscode/vscode/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
-import 'vscode/vscode/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution';
-import 'vscode/vscode/vs/workbench/browser/actions/listCommands';
-import 'vscode/vscode/vs/workbench/browser/parts/views/media/views.css';
-import 'vscode/vscode/vs/workbench/api/browser/viewsExtensionPoint';
-import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution';
-import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
-import 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditor.contribution';
-import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution';
-import 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution';
-import 'vscode/vscode/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution';
-import 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution';
-import 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.contribution';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution';
-import 'vscode/vscode/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution';
-import 'vscode/vscode/vs/workbench/contrib/sash/browser/sash.contribution';
-import 'vscode/vscode/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
@@ -95,6 +74,27 @@ import getServiceOverride$3 from '@codingame/monaco-vscode-keybindings-service-o
 import { changeUrlDomain } from './tools/url.js';
 import { onRenderWorkbench } from 'vscode/lifecycle';
 import { registerAssets } from 'vscode/assets';
+import 'vscode/vscode/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
+import 'vscode/vscode/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution';
+import 'vscode/vscode/vs/workbench/browser/actions/listCommands';
+import 'vscode/vscode/vs/workbench/browser/parts/views/media/views.css';
+import 'vscode/vscode/vs/workbench/api/browser/viewsExtensionPoint';
+import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution';
+import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
+import 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditor.contribution';
+import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution';
+import 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution';
+import 'vscode/vscode/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution';
+import 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution';
+import 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.contribution';
+import 'vscode/vscode/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution';
+import 'vscode/vscode/vs/workbench/contrib/sash/browser/sash.contribution';
+import 'vscode/vscode/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';
+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/actions/navigationActions';
+import './tools/editorAssets.js';
 export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
@@ -454,11 +454,15 @@ onRenderWorkbench(async (accessor) => {
     const restoreDefaultViewsPromise = (async () => {
         if (initialLayoutState.views.defaults != null && initialLayoutState.views.defaults.length > 0) {
             mark('code/willOpenDefaultViews');
+            const locationsRestored = [];
             const tryOpenView = (view) => {
                 const location = viewDescriptorService.getViewLocationById(view.id);
                 if (location !== null) {
                     const container = viewDescriptorService.getViewContainerByViewId(view.id);
                     if (container != null) {
+                        if (view.order >= (locationsRestored[location]?.order ?? 0)) {
+                            locationsRestored[location] = { id: container.id, order: view.order };
+                        }
                         const containerModel = viewDescriptorService.getViewContainerModel(container);
                         containerModel.setCollapsed(view.id, false);
                         containerModel.setVisible(view.id, true);
@@ -485,6 +489,15 @@ onRenderWorkbench(async (accessor) => {
                     }
                 }
             }
+            if (locationsRestored[0 ] != null) {
+                initialLayoutState.views.containerToRestore.sideBar = locationsRestored[0 ].id;
+            }
+            if (locationsRestored[1 ] != null) {
+                initialLayoutState.views.containerToRestore.panel = locationsRestored[1 ].id;
+            }
+            if (locationsRestored[2 ] != null) {
+                initialLayoutState.views.containerToRestore.auxiliaryBar = locationsRestored[2 ].id;
+            }
             mark('code/didOpenDefaultViews');
         }
     })();
@@ -557,7 +570,6 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
         [( IActivityService.toString())]: new SyncDescriptor(ActivityService, [], true),
         [( IPaneCompositePartService.toString())]: new SyncDescriptor(PaneCompositePartService, [], true),
         [( IHoverService.toString())]: new SyncDescriptor(HoverService, [], true),
-        [( IExplorerService.toString())]: new SyncDescriptor(ExplorerService, [], true),
         [( ICodeEditorService.toString())]: new SyncDescriptor(CodeEditorService, [], true),
         [( ITextEditorService.toString())]: new SyncDescriptor(TextEditorService, [], false),
         [( IEditorGroupsService.toString())]: new SyncDescriptor(MonacoEditorParts, [], false),