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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/index.d.ts +4 -4
  2. package/package.json +11 -11
  3. package/tools/editorAssets.js +4 -0
  4. package/views.js +34 -22
package/index.d.ts CHANGED
@@ -4,13 +4,13 @@ export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/br
4
4
  export { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';
5
5
  export { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
6
6
  export { PanelPart } from './vscode/src/vs/workbench/browser/parts/panel/panelPart.js';
7
- export { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
8
- export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
9
- export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
10
- export { IView, SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
11
7
  export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
8
+ export { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
12
9
  export { IResolvedTextEditorModel } from 'vscode/vscode/vs/editor/common/services/resolverService';
10
+ export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
13
11
  export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
12
+ export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
13
+ export { IView, SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
14
14
  export { CustomViewOption, EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
15
15
  export { IViewContainerDescriptor, IViewDescriptor, ViewContainer, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
16
16
  export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-views-service-override",
3
- "version": "3.0.0",
3
+ "version": "3.1.1",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -18,16 +18,16 @@
18
18
  "module": "index.js",
19
19
  "types": "index.d.ts",
20
20
  "dependencies": {
21
- "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
21
+ "vscode": "npm:@codingame/monaco-vscode-api@3.1.1",
22
22
  "vscode-marked": "npm:marked@=3.0.2",
23
- "@codingame/monaco-vscode-bulk-edit-service-override": "3.0.0",
24
- "@codingame/monaco-vscode-quickaccess-service-override": "3.0.0",
25
- "@codingame/monaco-vscode-keybindings-service-override": "3.0.0",
26
- "@codingame/monaco-vscode-files-service-override": "3.0.0",
27
- "@codingame/monaco-vscode-extensions-service-override": "3.0.0",
28
- "@codingame/monaco-vscode-environment-service-override": "3.0.0",
29
- "@codingame/monaco-vscode-layout-service-override": "3.0.0",
30
- "@codingame/monaco-vscode-host-service-override": "3.0.0",
31
- "@codingame/monaco-vscode-base-service-override": "3.0.0"
23
+ "@codingame/monaco-vscode-bulk-edit-service-override": "3.1.1",
24
+ "@codingame/monaco-vscode-quickaccess-service-override": "3.1.1",
25
+ "@codingame/monaco-vscode-keybindings-service-override": "3.1.1",
26
+ "@codingame/monaco-vscode-files-service-override": "3.1.1",
27
+ "@codingame/monaco-vscode-extensions-service-override": "3.1.1",
28
+ "@codingame/monaco-vscode-environment-service-override": "3.1.1",
29
+ "@codingame/monaco-vscode-layout-service-override": "3.1.1",
30
+ "@codingame/monaco-vscode-host-service-override": "3.1.1",
31
+ "@codingame/monaco-vscode-base-service-override": "3.1.1"
32
32
  }
33
33
  }
package/tools/editorAssets.js ADDED
@@ -0,0 +1,4 @@
1
+ import pngAssets from 'vscode/vscode/vs/workbench/contrib/debug/browser/media/all.png';
2
+ import { registerAssets } from 'vscode/assets';
3
+
4
+ registerAssets(pngAssets);
package/views.js CHANGED
@@ -12,30 +12,9 @@ import { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/br
12
12
  export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
13
13
  import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
14
14
  export { ActivitybarPart } from 'vscode/vscode/vs/workbench/browser/parts/activitybar/activitybarPart';
15
- import { ExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/explorerService';
16
- import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
17
15
  import { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';
18
16
  export { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';
19
17
  import { URI } from 'vscode/vscode/vs/base/common/uri';
20
- import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands';
21
- import 'vscode/vscode/vs/workbench/contrib/files/browser/fileActions.contribution';
22
- import 'vscode/vscode/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
23
- import 'vscode/vscode/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution';
24
- import 'vscode/vscode/vs/workbench/browser/actions/listCommands';
25
- import 'vscode/vscode/vs/workbench/browser/parts/views/media/views.css';
26
- import 'vscode/vscode/vs/workbench/api/browser/viewsExtensionPoint';
27
- import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution';
28
- import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
29
- import 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditor.contribution';
30
- import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution';
31
- import 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution';
32
- import 'vscode/vscode/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution';
33
- import 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution';
34
- import 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.contribution';
35
- import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution';
36
- import 'vscode/vscode/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution';
37
- import 'vscode/vscode/vs/workbench/contrib/sash/browser/sash.contribution';
38
- import 'vscode/vscode/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';
39
18
  import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
40
19
  export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
41
20
  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
95
74
  import { changeUrlDomain } from './tools/url.js';
96
75
  import { onRenderWorkbench } from 'vscode/lifecycle';
97
76
  import { registerAssets } from 'vscode/assets';
77
+ import 'vscode/vscode/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
78
+ import 'vscode/vscode/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution';
79
+ import 'vscode/vscode/vs/workbench/browser/actions/listCommands';
80
+ import 'vscode/vscode/vs/workbench/browser/parts/views/media/views.css';
81
+ import 'vscode/vscode/vs/workbench/api/browser/viewsExtensionPoint';
82
+ import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution';
83
+ import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
84
+ import 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditor.contribution';
85
+ import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution';
86
+ import 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution';
87
+ import 'vscode/vscode/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution';
88
+ import 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution';
89
+ import 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.contribution';
90
+ import 'vscode/vscode/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution';
91
+ import 'vscode/vscode/vs/workbench/contrib/sash/browser/sash.contribution';
92
+ import 'vscode/vscode/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';
93
+ import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.autosave.contribution';
94
+ import 'vscode/vscode/vs/workbench/contrib/files/browser/files.editorPane.contribution';
95
+ import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands.save';
96
+ import 'vscode/vscode/vs/workbench/browser/actions/navigationActions';
97
+ import './tools/editorAssets.js';
98
98
  export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
99
99
  export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
100
100
  export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
@@ -454,11 +454,15 @@ onRenderWorkbench(async (accessor) => {
454
454
  const restoreDefaultViewsPromise = (async () => {
455
455
  if (initialLayoutState.views.defaults != null && initialLayoutState.views.defaults.length > 0) {
456
456
  mark('code/willOpenDefaultViews');
457
+ const locationsRestored = [];
457
458
  const tryOpenView = (view) => {
458
459
  const location = viewDescriptorService.getViewLocationById(view.id);
459
460
  if (location !== null) {
460
461
  const container = viewDescriptorService.getViewContainerByViewId(view.id);
461
462
  if (container != null) {
463
+ if (view.order >= (locationsRestored[location]?.order ?? 0)) {
464
+ locationsRestored[location] = { id: container.id, order: view.order };
465
+ }
462
466
  const containerModel = viewDescriptorService.getViewContainerModel(container);
463
467
  containerModel.setCollapsed(view.id, false);
464
468
  containerModel.setVisible(view.id, true);
@@ -485,6 +489,15 @@ onRenderWorkbench(async (accessor) => {
485
489
  }
486
490
  }
487
491
  }
492
+ if (locationsRestored[0 ] != null) {
493
+ initialLayoutState.views.containerToRestore.sideBar = locationsRestored[0 ].id;
494
+ }
495
+ if (locationsRestored[1 ] != null) {
496
+ initialLayoutState.views.containerToRestore.panel = locationsRestored[1 ].id;
497
+ }
498
+ if (locationsRestored[2 ] != null) {
499
+ initialLayoutState.views.containerToRestore.auxiliaryBar = locationsRestored[2 ].id;
500
+ }
488
501
  mark('code/didOpenDefaultViews');
489
502
  }
490
503
  })();
@@ -557,7 +570,6 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
557
570
  [( IActivityService.toString())]: new SyncDescriptor(ActivityService, [], true),
558
571
  [( IPaneCompositePartService.toString())]: new SyncDescriptor(PaneCompositePartService, [], true),
559
572
  [( IHoverService.toString())]: new SyncDescriptor(HoverService, [], true),
560
- [( IExplorerService.toString())]: new SyncDescriptor(ExplorerService, [], true),
561
573
  [( ICodeEditorService.toString())]: new SyncDescriptor(CodeEditorService, [], true),
562
574
  [( ITextEditorService.toString())]: new SyncDescriptor(TextEditorService, [], false),
563
575
  [( IEditorGroupsService.toString())]: new SyncDescriptor(MonacoEditorParts, [], false),