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

package/index.d.ts

@@ -4,19 +4,19 @@ 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 { 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 { CustomViewOption, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
+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';
 export { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { ConfirmResult } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 export { EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInputCapabilities, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';

package/index.js

@@ -5,14 +5,14 @@ export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/com
 export { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.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';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
 export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
 export { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "2.2.2",
+  "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@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "2.2.2",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.2",
-    "@codingame/monaco-vscode-keybindings-service-override": "2.2.2",
-    "@codingame/monaco-vscode-files-service-override": "2.2.2",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.2",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.2",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.2",
-    "@codingame/monaco-vscode-host-service-override": "2.2.2",
-    "@codingame/monaco-vscode-base-service-override": "2.2.2"
+    "@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/editor.js

@@ -192,8 +192,8 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.onWillOpenEditor = this._onWillOpenEditor.event;
         this.id = --StandaloneEditorGroup_1.idCounter;
         this.index = -1;
-        this.label = `standalone editor ${this.editor.getId()}`;
-        this.ariaLabel = `standalone editor ${this.editor.getId()}`;
+        this.label = `standalone editor ${-this.id}`;
+        this.ariaLabel = `standalone editor ${-this.id}`;
         this.previewEditor = null;
         this.isLocked = true;
         this.stickyCount = 0;
@@ -201,8 +201,22 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.findEditors = (resource) => this.pane != null && ( resource.toString()) === ( this.pane.input.resource.toString()) ? [this.pane.input] : [];
         this.getEditorByIndex = (index) => this.pane != null && index === 0 ? this.pane.input : undefined;
         this.getIndexOfEditor = (editorInput) => this.pane != null && this.pane.input === editorInput ? 0 : -1;
-        this.openEditor = unsupported;
-        this.openEditors = unsupported;
+        this.openEditor = async (editor) => {
+            if (editor.isDisposed()) {
+                return undefined;
+            }
+            if (editor instanceof TextResourceEditorInput && ( editor.resource.toString()) === this.pane?.input.resource.toString()) {
+                this.focus();
+                return this.pane;
+            }
+            return undefined;
+        };
+        this.openEditors = async (editors) => {
+            if (editors.length === 1) {
+                return this.openEditor(editors[0].editor);
+            }
+            return undefined;
+        };
         this.isPinned = () => false;
         this.isSticky = () => false;
         this.isActive = () => this.editor.hasWidgetFocus();
@@ -318,6 +332,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
     }
     focus() {
         this.editor.focus();
+        this.editor.getContainerDomNode().scrollIntoView();
     }
 };
 StandaloneEditorGroup.idCounter = 0;
@@ -397,15 +412,23 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             const codeEditorService = StandaloneServices.get(ICodeEditorService);
             const handleCodeEditor = (editor) => {
                 if (editor instanceof StandaloneEditor) {
+                    let timeout;
                     const onEditorFocused = () => {
+                        if (timeout != null)
+                            window.clearTimeout(timeout);
                         this.activeGroupOverride = this.additionalGroups.find(group => group.editor === editor);
                         this._onDidChangeActiveGroup.fire(this.activeGroup);
                     };
                     const onEditorBlurred = () => {
-                        if (this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
-                            this.activeGroupOverride = undefined;
-                            this._onDidChangeActiveGroup.fire(this.activeGroup);
-                        }
+                        if (timeout != null)
+                            window.clearTimeout(timeout);
+                        timeout = window.setTimeout(() => {
+                            timeout = undefined;
+                            if (this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
+                                this.activeGroupOverride = undefined;
+                                this._onDidChangeActiveGroup.fire(this.activeGroup);
+                            }
+                        }, 100);
                     };
                     editor.onDidFocusEditorText(onEditorFocused);
                     editor.onDidFocusEditorWidget(onEditorFocused);

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/tools/views.d.ts

@@ -5,11 +5,9 @@ import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Dimension } from 'vscode/vscode/vs/base/browser/dom';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -21,19 +19,20 @@ export { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/com
 import { IEditorOpenContext, EditorInputCapabilities, Verbosity, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
 export { EditorInputCapabilities, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 
 type Label = string | {
     short: string;
     medium: string;
     long: string;
 };
-declare abstract class SimpleEditorPane extends EditorPane {
+declare abstract class InjectedEditorPane extends EditorPane {
+    constructor(id: string);
+}
+declare abstract class SimpleEditorPane extends InjectedEditorPane {
     protected container: HTMLElement;
     protected wrapper: HTMLElement;
     protected scrollbar: DomScrollableElement | undefined;
     private inputDisposable;
-    constructor(id: string, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
     protected createEditor(parent: HTMLElement): void;
     setInput(input: EditorInput, editorOptions: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
     layout(dimension: Dimension): void;
@@ -103,4 +102,4 @@ declare function getPanelPosition(): Position;
 declare const onDidChangeSideBarPosition: Event<string>;
 declare function getSideBarPosition(): Position;
 
-export { type CustomViewOption, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };
+export { type CustomViewOption, InjectedEditorPane as EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/tools/views.js

@@ -1,4 +1,3 @@
-import { __decorate, __param } from '../external/tslib/tslib.es6.js';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
@@ -22,11 +21,11 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { BaseActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { assertIsDefined, assertAllDefined } from 'vscode/vscode/vs/base/common/types';
 export { ConfirmResult } from '../override/vs/platform/dialogs/common/dialogs.js';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -34,9 +33,14 @@ export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layout
 import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 import { withReadyServices } from 'vscode/services';
 
-let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
-    constructor(id, telemetryService, themeService, storageService) {
-        super(id, telemetryService, themeService, storageService);
+class InjectedEditorPane extends EditorPane {
+    constructor(id) {
+        super(id, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService));
+    }
+}
+class SimpleEditorPane extends InjectedEditorPane {
+    constructor() {
+        super(...arguments);
         this.inputDisposable = this._register(new MutableDisposable());
     }
     createEditor(parent) {
@@ -76,12 +80,7 @@ let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
         this.inputDisposable.clear();
         super.clearInput();
     }
-};
-SimpleEditorPane = __decorate([
-    ( __param(1, ITelemetryService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IStorageService))
-], SimpleEditorPane);
+}
 class SimpleEditorInput extends EditorInput {
     constructor(resource, closeHandler) {
         super();
@@ -278,4 +277,4 @@ function getSideBarPosition() {
     return StandaloneServices.get(IWorkbenchLayoutService).getSideBarPosition();
 }
 
-export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };
+export { InjectedEditorPane as EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

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';
@@ -86,6 +65,8 @@ import { ViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/
 import { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
 export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
+import { IEditorPaneService } from 'vscode/vscode/vs/workbench/services/editor/common/editorPaneService';
+import { EditorPaneService } from 'vscode/vscode/vs/workbench/services/editor/browser/editorPaneService';
 import { MonacoEditorService, MonacoDelegateEditorGroupsService } from './tools/editor.js';
 import getServiceOverride$1 from '@codingame/monaco-vscode-bulk-edit-service-override';
 import getServiceOverride$2 from '@codingame/monaco-vscode-quickaccess-service-override';
@@ -93,14 +74,35 @@ 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';
-export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
+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';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 
 function createPart(id, role, classes) {
     const part = document.createElement(role === 'status' ? 'footer'  : 'div');
@@ -452,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);
@@ -483,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');
         }
     })();
@@ -555,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),
@@ -570,7 +584,8 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
         [( IWebviewViewService.toString())]: new SyncDescriptor(WebviewViewService, [], true),
         [( IWebviewWorkbenchService.toString())]: new SyncDescriptor(WebviewEditorService, [], true),
         [( IProgressService.toString())]: new SyncDescriptor(ProgressService, [], true),
-        [( IAuxiliaryWindowService.toString())]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true)
+        [( IAuxiliaryWindowService.toString())]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true),
+        [( IEditorPaneService.toString())]: new SyncDescriptor(EditorPaneService, [], true)
     };
 }
 

package/vscode/src/vs/base/browser/ui/toolbar/toolbar.d.ts

@@ -6,6 +6,7 @@ import { IActionRunner, IAction } from 'vscode/vscode/vs/base/common/actions';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { ResolvedKeybinding } from 'vscode/vscode/vs/base/common/keybindings';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconHoverDelegate';
 
 interface IToolBarOptions {
     orientation?: ActionsOrientation;
@@ -19,6 +20,7 @@ interface IToolBarOptions {
     moreIcon?: ThemeIcon;
     allowContextMenu?: boolean;
     skipTelemetry?: boolean;
+    hoverDelegate?: IHoverDelegate;
     /**
      * If true, toggled primary items are highlighted with a background color.
      */

package/vscode/src/vs/workbench/browser/parts/compositePart.d.ts

@@ -15,6 +15,8 @@ import { INotificationService } from 'vscode/vscode/vs/platform/notification/com
 import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/contextview';
 import { WorkbenchToolBar } from '../../../platform/actions/browser/toolbar.js';
 import { IBoundarySashes } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
+import { IBaseActionViewItemOptions } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
+import { IHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconHoverDelegate';
 
 interface ICompositeTitleLabel {
     /**
@@ -45,6 +47,7 @@ declare abstract class CompositePart<T extends Composite> extends Part {
     protected readonly onDidCompositeClose: Emitter<IComposite>;
     protected toolBar: WorkbenchToolBar | undefined;
     protected titleLabelElement: HTMLElement | undefined;
+    protected readonly hoverDelegate: IHoverDelegate;
     private readonly mapCompositeToCompositeContainer;
     private readonly mapActionsBindingToComposite;
     private activeComposite;
@@ -70,7 +73,7 @@ declare abstract class CompositePart<T extends Composite> extends Part {
     protected createTitleArea(parent: HTMLElement): HTMLElement;
     protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel;
     updateStyles(): void;
-    protected actionViewItemProvider(action: IAction): IActionViewItem | undefined;
+    protected actionViewItemProvider(action: IAction, options: IBaseActionViewItemOptions): IActionViewItem | undefined;
     protected actionsContextProvider(): unknown;
     protected createContentArea(parent: HTMLElement): HTMLElement;
     getProgressIndicator(id: string): IProgressIndicator | undefined;