@codingame/monaco-vscode-api 1.83.15 → 1.85.0-next.0

package/monaco-treemending.js

@@ -847,8 +847,8 @@ async function run() {
         console.info('Monaco-editor has already been tree-mended, ignoring');
         process.exit(0);
     }
-    if ("0.44.0" !== monacoVersion) {
-        console.error(`Wrong monaco-editor version: expecting ${"0.44.0"}, got ${monacoVersion}`);
+    if ("0.45.0" !== monacoVersion) {
+        console.error(`Wrong monaco-editor version: expecting ${"0.45.0"}, got ${monacoVersion}`);
         process.exit(1);
     }
     // pnpm WA: copy files to a temp directory and patch files there. When finished copy back

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.83.15",
+  "version": "1.85.0-next.0",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -98,12 +98,12 @@
     "monaco-treemending": "./monaco-treemending.js"
   },
   "dependencies": {
-    "monaco-editor": "0.44.0",
+    "monaco-editor": "0.45.0",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "1.83.15",
-    "@codingame/monaco-vscode-layout-service-override": "1.83.15",
-    "@codingame/monaco-vscode-environment-service-override": "1.83.15",
-    "@codingame/monaco-vscode-extensions-service-override": "1.83.15",
-    "@codingame/monaco-vscode-quickaccess-service-override": "1.83.15"
+    "@codingame/monaco-vscode-files-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-layout-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-environment-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-extensions-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.0-next.0"
   }
 }

package/service-override/tools/editor.d.ts

@@ -1,21 +1,21 @@
 import { IEditorPane, IUntypedEditorInput, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, ITextDiffEditorPane } from '../../vscode/src/vs/workbench/common/editor.js';
+import { IEditorGroupsService } from '../../vscode/src/vs/workbench/services/editor/common/editorGroupsService.js';
+import { PreferredGroup } from '../../vscode/src/vs/workbench/services/editor/common/editorService.js';
+import { EditorInput } from '../../vscode/src/vs/workbench/common/editor/editorInput.js';
+import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput } from '../../vscode/src/vs/platform/editor/common/editor.js';
 import { ICodeEditor, IDiffEditor } from '../../vscode/src/vs/editor/browser/editorBrowser.js';
-import { IInstantiationService } from '../../vscode/src/vs/platform/instantiation/common/instantiation.js';
 import { IReference } from '../../vscode/src/vs/base/common/lifecycle.js';
 import { IConfigurationService } from '../../vscode/src/vs/platform/configuration/common/configuration.js';
-import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput } from '../../vscode/src/vs/platform/editor/common/editor.js';
+import { IInstantiationService } from '../../vscode/src/vs/platform/instantiation/common/instantiation.js';
 import { IFileService } from '../../vscode/src/vs/platform/files/common/files.js';
 import { IWorkspaceContextService } from '../../vscode/src/vs/platform/workspace/common/workspace.js';
 import { IUriIdentityService } from '../../vscode/src/vs/platform/uriIdentity/common/uriIdentity.js';
-import { IResolvedTextEditorModel, ITextModelService } from '../../vscode/src/vs/editor/common/services/resolverService.js';
-import { PreferredGroup } from '../../vscode/src/vs/workbench/services/editor/common/editorService.js';
-import { EditorInput } from '../../vscode/src/vs/workbench/common/editor/editorInput.js';
 import { IHostService } from '../../vscode/src/vs/workbench/services/host/browser/host.js';
-import { IEditorGroupsService } from '../../vscode/src/vs/workbench/services/editor/common/editorGroupsService.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../vscode/src/vs/editor/common/services/resolverService.js';
+import { EditorService } from '../../vscode/src/vs/workbench/services/editor/browser/editorService.js';
+import { IWorkspaceTrustRequestService } from '../../vscode/src/vs/platform/workspace/common/workspaceTrust.js';
 import { IEditorResolverService } from '../../vscode/src/vs/workbench/services/editor/common/editorResolverService.js';
 import { ITextEditorService } from '../../vscode/src/vs/workbench/services/textfile/common/textEditorService.js';
-import { IWorkspaceTrustRequestService } from '../../vscode/src/vs/platform/workspace/common/workspaceTrust.js';
-import { EditorService } from '../../vscode/src/vs/workbench/services/editor/browser/editorService.js';
 
 type OpenEditor = (modelRef: IReference<IResolvedTextEditorModel>, options: IEditorOptions | undefined, sideBySide?: boolean) => Promise<ICodeEditor | undefined>;
 declare class MonacoEditorService extends EditorService {

package/service-override/tools/editor.js

@@ -88,7 +88,7 @@ function wrapOpenEditor(textModelService, defaultBehavior, fallbackBahavior) {
 }
 let MonacoEditorService = class MonacoEditorService extends EditorService {
     constructor(_openEditorFallback, _isEditorPartVisible, _editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService, textModelService) {
-        super(_editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService);
+        super(undefined, _editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService);
         this._isEditorPartVisible = _isEditorPartVisible;
         this.openEditor = wrapOpenEditor(textModelService, this.openEditor.bind(this), _openEditorFallback);
     }
@@ -228,7 +228,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
             });
             this.pane = new StandaloneEditorPane(editor, editorInput, this);
             this._onDidModelChange.fire({
-                kind: 3 ,
+                kind: 4 ,
                 editor: editorInput,
                 editorIndex: 0
             });
@@ -241,7 +241,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
                 const pane = this.pane;
                 this.pane = undefined;
                 this._onDidModelChange.fire({
-                    kind: 4 ,
+                    kind: 5 ,
                     editorIndex: 0
                 });
                 this._onDidActiveEditorChange.fire({
@@ -278,6 +278,19 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
             this.pane = new StandaloneEditorPane(editor, editorInput, this);
         }
     }
+    get groupsView() {
+        return unsupported();
+    }
+    notifyLabelChanged() { }
+    createEditorActions() {
+        return {
+            actions: {
+                primary: [],
+                secondary: []
+            },
+            onDidChange: Event.None
+        };
+    }
     get titleHeight() { return unsupported(); }
     setActive(isActive) {
         this.active = isActive;
@@ -314,6 +327,8 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this._serviceBrand = undefined;
         this.additionalGroups = [];
         this.activeGroupOverride = undefined;
+        this.onDidCreateAuxiliaryEditorPart = this.delegate.onDidCreateAuxiliaryEditorPart;
+        this.onDidChangeGroupMaximized = this.delegate.onDidChangeGroupMaximized;
         this._onDidChangeActiveGroup = new Emitter();
         this.onDidChangeActiveGroup = Event.any(this._onDidChangeActiveGroup.event, this.delegate.onDidChangeActiveGroup);
         this._onDidAddGroup = new Emitter();
@@ -322,8 +337,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this.onDidRemoveGroup = Event.any(this._onDidRemoveGroup.event, this.delegate.onDidRemoveGroup);
         this.onDidMoveGroup = this.delegate.onDidMoveGroup;
         this.onDidActivateGroup = this.delegate.onDidActivateGroup;
-        this.onDidLayout = this.delegate.onDidLayout;
-        this.onDidScroll = this.delegate.onDidScroll;
         this.onDidChangeGroupIndex = this.delegate.onDidChangeGroupIndex;
         this.onDidChangeGroupLocked = this.delegate.onDidChangeGroupLocked;
         this.getLayout = () => {
@@ -350,12 +363,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this.applyLayout = (...args) => {
             return this.delegate.applyLayout(...args);
         };
-        this.centerLayout = (...args) => {
-            return this.delegate.centerLayout(...args);
-        };
-        this.isLayoutCentered = (...args) => {
-            return this.delegate.isLayoutCentered(...args);
-        };
         this.setGroupOrientation = (...args) => {
             return this.delegate.setGroupOrientation(...args);
         };
@@ -380,9 +387,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this.copyGroup = (...args) => {
             return this.delegate.copyGroup(...args);
         };
-        this.enforcePartOptions = (...args) => {
-            return this.delegate.enforcePartOptions(...args);
-        };
         this.onDidChangeEditorPartOptions = this.delegate.onDidChangeEditorPartOptions;
         setTimeout(() => {
             const codeEditorService = StandaloneServices.get(ICodeEditorService);
@@ -392,8 +396,16 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
                         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);
+                        }
+                    };
                     editor.onDidFocusEditorText(onEditorFocused);
                     editor.onDidFocusEditorWidget(onEditorFocused);
+                    editor.onDidBlurEditorText(onEditorBlurred);
+                    editor.onDidBlurEditorWidget(onEditorBlurred);
                     if (editor.hasWidgetFocus()) {
                         onEditorFocused();
                     }
@@ -421,20 +433,33 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             codeEditorService.listCodeEditors().forEach(handleCodeEditor);
         });
     }
+    get parts() { return this.delegate.parts; }
+    createAuxiliaryEditorPart(options) {
+        return this.delegate.createAuxiliaryEditorPart(options);
+    }
+    get mainPart() { return this.delegate.mainPart; }
+    get activePart() { return this.delegate.activePart; }
+    getPart(container) {
+        return this.delegate.getPart(container);
+    }
+    toggleMaximizeGroup(group) {
+        return this.delegate.toggleMaximizeGroup(group);
+    }
+    toggleExpandGroup(group) {
+        return this.delegate.toggleExpandGroup(group);
+    }
+    createEditorDropTarget(container, delegate) {
+        return this.delegate.createEditorDropTarget(container, delegate);
+    }
     get groups() {
         return [...this.additionalGroups, ...this.delegate.groups];
     }
     get activeGroup() {
         return this.activeGroupOverride ?? this.delegate.activeGroup;
     }
-    get contentDimension() { return this.delegate.contentDimension; }
     get sideGroup() { return this.delegate.sideGroup; }
     get count() { return this.delegate.count + this.additionalGroups.length; }
     get orientation() { return this.delegate.orientation; }
-    get isReady() { return this.delegate.isReady; }
-    get whenReady() { return this.delegate.whenReady; }
-    get whenRestored() { return this.delegate.whenRestored; }
-    get hasRestorableState() { return this.delegate.hasRestorableState; }
     get partOptions() { return this.delegate.partOptions; }
 };
 MonacoDelegateEditorGroupsService = __decorate([

package/services.d.ts

@@ -5,6 +5,7 @@ export { IInstantiationService } from './vscode/src/vs/platform/instantiation/co
 export { IContextKeyService } from './vscode/src/vs/platform/contextkey/common/contextkey.js';
 export { IDimension } from './vscode/src/vs/editor/common/core/dimension.js';
 export { default as Severity } from './vscode/src/vs/base/common/severity.js';
+export { ICommandService } from './vscode/src/vs/platform/commands/common/commands.js';
 export { IMarkerService } from './vscode/src/vs/platform/markers/common/markers.js';
 export { ILanguageService } from './vscode/src/vs/editor/common/languages/language.js';
 export { ILanguageConfigurationService } from './vscode/src/vs/editor/common/languages/languageConfigurationRegistry.js';
@@ -17,7 +18,6 @@ export { ITextModelContentProvider, ITextModelService } from './vscode/src/vs/ed
 export { CloseDirection, EditorInputWithOptions, EditorsOrder, GroupIdentifier, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorControl, IEditorPane, IEditorPartOptions, IEditorPartOptionsChangeEvent, IEditorWillMoveEvent, IEditorWillOpenEvent, IFindEditorOptions, IMatchEditorOptions, IUntypedEditorInput, IVisibleEditorPane } from './vscode/src/vs/workbench/common/editor.js';
 export { ITextFileService } from './vscode/src/vs/workbench/services/textfile/common/textfiles.js';
 export { IAction } from './vscode/src/vs/base/common/actions.js';
-export { ICommandService } from './vscode/src/vs/platform/commands/common/commands.js';
 export { IAudioCueService } from './vscode/src/vs/platform/audioCues/browser/audioCueService.js';
 import { IEditorOverrideServices } from './vscode/src/vs/editor/standalone/browser/standaloneServices.js';
 export { StandaloneServices } from './vscode/src/vs/editor/standalone/browser/standaloneServices.js';
@@ -70,7 +70,7 @@ export { IActivityService, IBadge } from './vscode/src/vs/workbench/services/act
 export { IHoverService } from './vscode/src/vs/workbench/services/hover/browser/hover.js';
 export { IExplorerService } from './vscode/src/vs/workbench/contrib/files/browser/files.js';
 export { IStatusbarService } from './vscode/src/vs/workbench/services/statusbar/browser/statusbar.js';
-export { ITitleService } from './vscode/src/vs/workbench/services/title/common/titleService.js';
+export { ITitleService } from './vscode/src/vs/workbench/services/title/browser/titleService.js';
 export { IBannerService } from './vscode/src/vs/workbench/services/banner/browser/bannerService.js';
 export { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, IWorkspaceTrustUriInfo } from './vscode/src/vs/platform/workspace/common/workspaceTrust.js';
 

package/services.js

@@ -76,7 +76,7 @@ export { IActivityService } from './vscode/src/vs/workbench/services/activity/co
 export { IHoverService } from './vscode/src/vs/workbench/services/hover/browser/hover.js';
 export { IExplorerService } from './vscode/src/vs/workbench/contrib/files/browser/files.js';
 export { IStatusbarService } from './vscode/src/vs/workbench/services/statusbar/browser/statusbar.js';
-export { ITitleService } from './vscode/src/vs/workbench/services/title/common/titleService.js';
+export { ITitleService } from './vscode/src/vs/workbench/services/title/browser/titleService.js';
 export { IBannerService } from './vscode/src/vs/workbench/services/banner/browser/bannerService.js';
 export { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'monaco-editor/esm/vs/platform/workspace/common/workspaceTrust.js';
 export { IDialogService, IFileDialogService } from './vscode/src/vs/platform/dialogs/common/dialogs.js';
@@ -85,9 +85,9 @@ async function initialize(overrides, container = document.body, configuration =
     initialize$1(container, configuration);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.83.0",
+            version: "1.85.0",
             quality: 'oss',
-            commit: "e7e037083ff4455cf320e344325dacb480062c3c",
+            commit: "af28b32d7e553898b2a91af498b1fb666fdebe0c",
             nameShort: 'Code - OSS Dev',
             nameLong: 'Code - OSS Dev',
             applicationName: 'code-oss',

package/vscode/src/vs/base/browser/broadcast.js

@@ -1,3 +1,4 @@
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 import { getErrorMessage } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
@@ -7,7 +8,7 @@ class BroadcastDataChannel extends Disposable {
         this.channelName = channelName;
         this._onDidReceiveData = this._register(( new Emitter()));
         this.onDidReceiveData = this._onDidReceiveData.event;
-        if ('BroadcastChannel' in window) {
+        if ('BroadcastChannel' in mainWindow) {
             try {
                 this.broadcastChannel = ( new BroadcastChannel(channelName));
                 const listener = (event) => {
@@ -36,16 +37,16 @@ class BroadcastDataChannel extends Disposable {
                 this._onDidReceiveData.fire(JSON.parse(event.newValue));
             }
         };
-        window.addEventListener('storage', listener);
-        this._register(toDisposable(() => window.removeEventListener('storage', listener)));
+        mainWindow.addEventListener('storage', listener);
+        this._register(toDisposable(() => mainWindow.removeEventListener('storage', listener)));
     }
     postData(data) {
         if (this.broadcastChannel) {
             this.broadcastChannel.postMessage(data);
         }
         else {
-            window.localStorage.removeItem(this.channelName);
-            window.localStorage.setItem(this.channelName, JSON.stringify(data));
+            localStorage.removeItem(this.channelName);
+            localStorage.setItem(this.channelName, JSON.stringify(data));
         }
     }
 }

package/vscode/src/vs/base/browser/dnd.d.ts

@@ -0,0 +1,6 @@
+interface IDragAndDropData {
+    update(dataTransfer: DataTransfer): void;
+    getData(): unknown;
+}
+
+export type { IDragAndDropData };

package/vscode/src/vs/base/browser/mouseEvent.d.ts

@@ -31,7 +31,7 @@ declare class StandardMouseEvent implements IMouseEvent {
     readonly altKey: boolean;
     readonly metaKey: boolean;
     readonly timestamp: number;
-    constructor(e: MouseEvent);
+    constructor(targetWindow: Window, e: MouseEvent);
     preventDefault(): void;
     stopPropagation(): void;
 }

package/vscode/src/vs/base/browser/touch.d.ts

@@ -0,0 +1,10 @@
+interface GestureEvent extends MouseEvent {
+    initialTarget: EventTarget | undefined;
+    translationX: number;
+    translationY: number;
+    pageX: number;
+    pageY: number;
+    tapCount: number;
+}
+
+export type { GestureEvent };

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

@@ -13,6 +13,7 @@ interface IActionViewItem extends IDisposable {
     isEnabled(): boolean;
     focus(fromRight?: boolean): void;
     blur(): void;
+    showHover?(): void;
 }
 interface IActionViewItemProvider {
     (action: IAction, options: IActionViewItemOptions): IActionViewItem | undefined;

package/vscode/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.d.ts

@@ -20,21 +20,6 @@ interface IHoverDelegateOptions extends IUpdatableHoverOptions {
      * dispose method is required.
      */
     target: IHoverDelegateTarget | HTMLElement;
-    /**
-     * Position of the hover. The default is to show above the target. This option will be ignored
-     * if there is not enough room to layout the hover in the specified position, unless the
-     * forcePosition option is set.
-     */
-    hoverPosition?: HoverPosition;
-    /**
-     * Whether to show the hover pointer
-     */
-    showPointer?: boolean;
-    /**
-     * Whether to skip the fade in animation, this should be used when hovering from one hover to
-     * another in the same group so it looks like the hover is moving from one element to the other.
-     */
-    skipFadeInAnimation?: boolean;
     /**
      * The container to pass to {@link IContextViewProvider.showContextView} which renders the hover
      * in. This is particularly useful for more natural tab focusing behavior, where the hover is
@@ -42,6 +27,28 @@ interface IHoverDelegateOptions extends IUpdatableHoverOptions {
      * element's container hiding on `focusout`.
      */
     container?: HTMLElement;
+    /**
+     * Options that defines where the hover is positioned.
+     */
+    position?: {
+        /**
+         * Position of the hover. The default is to show above the target. This option will be ignored
+         * if there is not enough room to layout the hover in the specified position, unless the
+         * forcePosition option is set.
+         */
+        hoverPosition?: HoverPosition;
+    };
+    appearance?: {
+        /**
+         * Whether to show the hover pointer
+         */
+        showPointer?: boolean;
+        /**
+         * Whether to skip the fade in animation, this should be used when hovering from one hover to
+         * another in the same group so it looks like the hover is moving from one element to the other.
+         */
+        skipFadeInAnimation?: boolean;
+    };
 }
 interface IHoverDelegate {
     showHover(options: IHoverDelegateOptions, focus?: boolean): IHoverWidget | undefined;

package/vscode/src/vs/base/browser/ui/menu/menubar.js

@@ -83,6 +83,7 @@ class MenuBar extends Disposable {
                 event.stopPropagation();
             }
         }));
+        const window = dom.getWindow(this.container);
         this._register(dom.addDisposableListener(window, dom.EventType.MOUSE_DOWN, () => {
             if (this.isFocused) {
                 this.setUnfocusedState();
@@ -167,7 +168,7 @@ class MenuBar extends Disposable {
                     e.stopPropagation();
                 }));
                 this._register(dom.addDisposableListener(buttonElement, dom.EventType.MOUSE_DOWN, (e) => {
-                    const mouseEvent = ( new StandardMouseEvent(e));
+                    const mouseEvent = ( new StandardMouseEvent(dom.getWindow(buttonElement), e));
                     if (!mouseEvent.leftButton) {
                         e.preventDefault();
                         return;
@@ -262,7 +263,7 @@ class MenuBar extends Disposable {
             e.stopPropagation();
         }));
         this._register(dom.addDisposableListener(buttonElement, dom.EventType.MOUSE_DOWN, (e) => {
-            const mouseEvent = ( new StandardMouseEvent(e));
+            const mouseEvent = ( new StandardMouseEvent(dom.getWindow(buttonElement), e));
             if (!mouseEvent.leftButton) {
                 e.preventDefault();
                 return;
@@ -478,7 +479,7 @@ class MenuBar extends Disposable {
             this.updateLabels(menuBarMenu.titleElement, menuBarMenu.buttonElement, menuBarMenu.label);
         });
         if (!this.overflowLayoutScheduled) {
-            this.overflowLayoutScheduled = dom.scheduleAtNextAnimationFrame(() => {
+            this.overflowLayoutScheduled = dom.scheduleAtNextAnimationFrame(dom.getWindow(this.container), () => {
                 this.updateOverflowAction();
                 this.overflowLayoutScheduled = undefined;
             });

package/vscode/src/vs/base/browser/ui/splitview/paneview.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-pane-view{height:100%;width:100%}.monaco-pane-view .pane{display:flex;flex-direction:column;height:100%;overflow:hidden;width:100%}.monaco-pane-view .pane.horizontal:not(.expanded){flex-direction:row}.monaco-pane-view .pane>.pane-header{align-items:center;box-sizing:border-box;cursor:pointer;display:flex;font-size:11px;font-weight:700;height:22px;overflow:hidden}.monaco-pane-view .pane>.pane-header>.title{text-transform:uppercase}.monaco-pane-view .pane.horizontal:not(.expanded)>.pane-header{flex-direction:column;height:100%;width:22px}.monaco-pane-view .pane>.pane-header>.codicon:first-of-type{margin:0 2px}.monaco-pane-view .pane.horizontal:not(.expanded)>.pane-header>.codicon:first-of-type{margin:2px}.monaco-pane-view .pane>.pane-header>.actions{display:none;margin-left:auto}.monaco-pane-view .pane>.pane-header>.actions .action-item{margin-right:4px}.monaco-pane-view .pane>.pane-header>.actions .action-label{padding:2px}.monaco-pane-view .pane:focus-within>.pane-header.expanded>.actions,.monaco-pane-view .pane:hover>.pane-header.expanded>.actions,.monaco-pane-view .pane>.pane-header.actions-always-visible.expanded>.actions,.monaco-pane-view .pane>.pane-header.focused.expanded>.actions{display:initial}.monaco-pane-view .pane>.pane-header .monaco-action-bar .action-item.select-container{cursor:default}.monaco-pane-view .pane>.pane-header .action-item .monaco-select-box{cursor:pointer;min-height:18px;min-width:110px;padding:2px 23px 2px 8px}.linux .monaco-pane-view .pane>.pane-header .action-item .monaco-select-box,.windows .monaco-pane-view .pane>.pane-header .action-item .monaco-select-box{padding:0 23px 0 8px}.monaco-pane-view:lang(ja) .pane>.pane-header,.monaco-pane-view:lang(ko) .pane>.pane-header,.monaco-pane-view:lang(zh-Hans) .pane>.pane-header,.monaco-pane-view:lang(zh-Hant) .pane>.pane-header{font-weight:400}.monaco-pane-view .pane>.pane-header.hidden{display:none}.monaco-pane-view .pane>.pane-body{flex:1;overflow:hidden}.monaco-pane-view.animated .split-view-view{transition-duration:.15s;transition-timing-function:ease-out}.reduce-motion .monaco-pane-view .split-view-view{transition-duration:0s!important}.monaco-pane-view.animated.vertical .split-view-view{transition-property:height}.monaco-pane-view.animated.horizontal .split-view-view{transition-property:width}#monaco-pane-drop-overlay{box-sizing:border-box;height:100%;left:0;position:absolute;width:100%;z-index:10000}#monaco-pane-drop-overlay>.pane-overlay-indicator{height:100%;min-height:22px;min-width:19px;pointer-events:none;position:absolute;transition:opacity .15s ease-out;width:100%}#monaco-pane-drop-overlay>.pane-overlay-indicator.overlay-move-transition{transition:top 70ms ease-out,left 70ms ease-out,width 70ms ease-out,height 70ms ease-out,opacity .15s ease-out}";
+var css = ".monaco-pane-view{height:100%;width:100%}.monaco-pane-view .pane{display:flex;flex-direction:column;height:100%;overflow:hidden;width:100%}.monaco-pane-view .pane.horizontal:not(.expanded){flex-direction:row}.monaco-pane-view .pane>.pane-header{align-items:center;box-sizing:border-box;cursor:pointer;display:flex;font-size:11px;font-weight:700;height:22px;overflow:hidden}.monaco-pane-view .pane>.pane-header.not-collapsible{cursor:default}.monaco-pane-view .pane>.pane-header>.title{text-transform:uppercase}.monaco-pane-view .pane.horizontal:not(.expanded)>.pane-header{flex-direction:column;height:100%;width:22px}.monaco-pane-view .pane>.pane-header>.codicon:first-of-type{margin:0 2px}.monaco-pane-view .pane.horizontal:not(.expanded)>.pane-header>.codicon:first-of-type{margin:2px}.monaco-pane-view .pane>.pane-header>.actions{display:none;margin-left:auto}.monaco-pane-view .pane>.pane-header>.actions .action-item{margin-right:4px}.monaco-pane-view .pane>.pane-header>.actions .action-label{padding:2px}.monaco-pane-view .pane:focus-within>.pane-header.expanded>.actions,.monaco-pane-view .pane:hover>.pane-header.expanded>.actions,.monaco-pane-view .pane>.pane-header.actions-always-visible.expanded>.actions,.monaco-pane-view .pane>.pane-header.focused.expanded>.actions{display:initial}.monaco-pane-view .pane>.pane-header .monaco-action-bar .action-item.select-container{cursor:default}.monaco-pane-view .pane>.pane-header .action-item .monaco-select-box{cursor:pointer;min-height:18px;min-width:110px;padding:2px 23px 2px 8px}.linux .monaco-pane-view .pane>.pane-header .action-item .monaco-select-box,.windows .monaco-pane-view .pane>.pane-header .action-item .monaco-select-box{padding:0 23px 0 8px}.monaco-pane-view:lang(ja) .pane>.pane-header,.monaco-pane-view:lang(ko) .pane>.pane-header,.monaco-pane-view:lang(zh-Hans) .pane>.pane-header,.monaco-pane-view:lang(zh-Hant) .pane>.pane-header{font-weight:400}.monaco-pane-view .pane>.pane-header.hidden{display:none}.monaco-pane-view .pane>.pane-body{flex:1;overflow:hidden}.monaco-pane-view.animated .split-view-view{transition-duration:.15s;transition-timing-function:ease-out}.reduce-motion .monaco-pane-view .split-view-view{transition-duration:0s!important}.monaco-pane-view.animated.vertical .split-view-view{transition-property:height}.monaco-pane-view.animated.horizontal .split-view-view{transition-property:width}#monaco-pane-drop-overlay{box-sizing:border-box;height:100%;left:0;position:absolute;width:100%;z-index:10000}#monaco-pane-drop-overlay>.pane-overlay-indicator{height:100%;min-height:22px;min-width:19px;pointer-events:none;position:absolute;transition:opacity .15s ease-out;width:100%}#monaco-pane-drop-overlay>.pane-overlay-indicator.overlay-move-transition{transition:top 70ms ease-out,left 70ms ease-out,width 70ms ease-out,height 70ms ease-out,opacity .15s ease-out}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/base/browser/ui/splitview/paneview.d.ts

@@ -36,6 +36,7 @@ declare abstract class Pane extends Disposable implements IView {
     protected _orientation: Orientation;
     private expandedSize;
     private _headerVisible;
+    private _collapsible;
     private _bodyRendered;
     private _minimumBodySize;
     private _maximumBodySize;
@@ -64,6 +65,8 @@ declare abstract class Pane extends Disposable implements IView {
     setExpanded(expanded: boolean): boolean;
     get headerVisible(): boolean;
     set headerVisible(visible: boolean);
+    get collapsible(): boolean;
+    set collapsible(collapsible: boolean);
     get orientation(): Orientation;
     set orientation(orientation: Orientation);
     render(): void;

package/vscode/src/vs/base/browser/ui/splitview/paneview.js

@@ -1,6 +1,6 @@
 import { isFirefox } from 'monaco-editor/esm/vs/base/browser/browser.js';
 import { DataTransfers } from 'monaco-editor/esm/vs/base/browser/dnd.js';
-import { $, append, trackFocus, EventType, addDisposableListener, EventHelper, clearNode } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { $, getWindow, append, trackFocus, EventType, addDisposableListener, EventHelper, clearNode } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { DomEmitter } from 'monaco-editor/esm/vs/base/browser/event.js';
 import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
 import { Gesture, EventType as EventType$1 } from 'monaco-editor/esm/vs/base/browser/touch.js';
@@ -61,6 +61,7 @@ class Pane extends Disposable {
         super();
         this.expandedSize = undefined;
         this._headerVisible = true;
+        this._collapsible = true;
         this._bodyRendered = false;
         this.styles = {
             dropBackground: undefined,
@@ -91,6 +92,9 @@ class Pane extends Disposable {
         return this._expanded;
     }
     setExpanded(expanded) {
+        if (!expanded && !this.collapsible) {
+            return false;
+        }
         if (this._expanded === !!expanded) {
             return false;
         }
@@ -103,12 +107,12 @@ class Pane extends Disposable {
                 this._bodyRendered = true;
             }
             if (typeof this.animationTimer === 'number') {
-                clearTimeout(this.animationTimer);
+                getWindow(this.element).clearTimeout(this.animationTimer);
             }
             append(this.element, this.body);
         }
         else {
-            this.animationTimer = window.setTimeout(() => {
+            this.animationTimer = getWindow(this.element).setTimeout(() => {
                 this.body.remove();
             }, 200);
         }
@@ -127,6 +131,16 @@ class Pane extends Disposable {
         this.updateHeader();
         this._onDidChange.fire(undefined);
     }
+    get collapsible() {
+        return this._collapsible;
+    }
+    set collapsible(collapsible) {
+        if (this._collapsible === !!collapsible) {
+            return;
+        }
+        this._collapsible = !!collapsible;
+        this.updateHeader();
+    }
     get orientation() {
         return this._orientation;
     }
@@ -200,12 +214,21 @@ class Pane extends Disposable {
     }
     updateHeader() {
         const expanded = !this.headerVisible || this.isExpanded();
+        if (this.collapsible) {
+            this.header.setAttribute('tabindex', '0');
+            this.header.setAttribute('role', 'button');
+        }
+        else {
+            this.header.removeAttribute('tabindex');
+            this.header.removeAttribute('role');
+        }
         this.header.style.lineHeight = `${this.headerSize}px`;
         this.header.classList.toggle('hidden', !this.headerVisible);
         this.header.classList.toggle('expanded', expanded);
+        this.header.classList.toggle('not-collapsible', !this.collapsible);
         this.header.setAttribute('aria-expanded', String(expanded));
-        this.header.style.color = this.styles.headerForeground ?? '';
-        this.header.style.backgroundColor = this.styles.headerBackground ?? '';
+        this.header.style.color = this.collapsible ? this.styles.headerForeground ?? '' : '';
+        this.header.style.backgroundColor = (this.collapsible ? this.styles.headerBackground : 'transparent') ?? '';
         this.header.style.borderTop = this.styles.headerBorder && this.orientation === 0  ? `1px solid ${this.styles.headerBorder}` : '';
         this.element.style.borderLeft = this.styles.leftBorder && this.orientation === 1  ? `1px solid ${this.styles.leftBorder}` : '';
     }
@@ -237,9 +260,9 @@ class PaneDraggable extends Disposable {
         if (isFirefox) {
             e.dataTransfer?.setData(DataTransfers.TEXT, this.pane.draggableElement.textContent || '');
         }
-        const dragImage = append(document.body, $('.monaco-drag-image', {}, this.pane.draggableElement.textContent || ''));
+        const dragImage = append(this.pane.element.ownerDocument.body, $('.monaco-drag-image', {}, this.pane.draggableElement.textContent || ''));
         e.dataTransfer.setDragImage(dragImage, -10, -10);
-        setTimeout(() => document.body.removeChild(dragImage), 0);
+        setTimeout(() => this.pane.element.ownerDocument.body.removeChild(dragImage), 0);
         this.context.draggable = this;
     }
     onDragEnter(e) {
@@ -408,10 +431,10 @@ class PaneView extends Disposable {
     }
     setupAnimation() {
         if (typeof this.animationTimer === 'number') {
-            window.clearTimeout(this.animationTimer);
+            getWindow(this.element).clearTimeout(this.animationTimer);
         }
         this.element.classList.add('animated');
-        this.animationTimer = window.setTimeout(() => {
+        this.animationTimer = getWindow(this.element).setTimeout(() => {
             this.animationTimer = undefined;
             this.element.classList.remove('animated');
         }, 200);
@@ -421,7 +444,7 @@ class PaneView extends Disposable {
     }
     focusPrevious() {
         const headers = this.getPaneHeaderElements();
-        const index = headers.indexOf(document.activeElement);
+        const index = headers.indexOf(this.element.ownerDocument.activeElement);
         if (index === -1) {
             return;
         }
@@ -429,7 +452,7 @@ class PaneView extends Disposable {
     }
     focusNext() {
         const headers = this.getPaneHeaderElements();
-        const index = headers.indexOf(document.activeElement);
+        const index = headers.indexOf(this.element.ownerDocument.activeElement);
         if (index === -1) {
             return;
         }

package/vscode/src/vs/base/common/actions.d.ts

@@ -19,20 +19,6 @@ interface IRunEvent {
     readonly action: IAction;
     readonly error?: Error;
 }
-declare class Separator implements IAction {
-    /**
-     * Joins all non-empty lists of actions with separators.
-     */
-    static join(...actionLists: readonly IAction[][]): IAction[];
-    static readonly ID = "vs.actions.separator";
-    readonly id: string;
-    readonly label: string;
-    readonly tooltip: string;
-    readonly class: string;
-    readonly enabled: boolean;
-    readonly checked: boolean;
-    run(): Promise<void>;
-}
 declare class SubmenuAction implements IAction {
     readonly id: string;
     readonly label: string;
@@ -46,4 +32,4 @@ declare class SubmenuAction implements IAction {
     run(): Promise<void>;
 }
 
-export { type IAction, type IActionRunner, type IRunEvent, Separator, SubmenuAction };
+export { type IAction, type IActionRunner, type IRunEvent, SubmenuAction };

package/vscode/src/vs/base/common/async.d.ts

@@ -1,35 +1,5 @@
-import { IDisposable } from './lifecycle.js';
-
 interface CancelablePromise<T> extends Promise<T> {
     cancel(): void;
 }
-declare class RunOnceScheduler implements IDisposable {
-    protected runner: ((...args: unknown[]) => void) | null;
-    private timeoutToken;
-    private timeout;
-    private timeoutHandler;
-    constructor(runner: (...args: any[]) => void, delay: number);
-    /**
-     * Dispose RunOnceScheduler
-     */
-    dispose(): void;
-    /**
-     * Cancel current scheduled runner (if any).
-     */
-    cancel(): void;
-    /**
-     * Cancel previous runner (if any) & schedule a new runner.
-     */
-    schedule(delay?: number): void;
-    get delay(): number;
-    set delay(value: number);
-    /**
-     * Returns true if scheduled.
-     */
-    isScheduled(): boolean;
-    flush(): void;
-    private onTimeout;
-    protected doRun(): void;
-}
 
-export { type CancelablePromise, RunOnceScheduler };
+export type { CancelablePromise };