@codingame/monaco-vscode-views-service-override 3.2.2 → 4.0.0

package/index.d.ts

@@ -8,7 +8,7 @@ export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/com
 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 { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/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';

package/index.js

@@ -14,6 +14,6 @@ export { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInpu
 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 { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
 export { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';
 export { SidebarPart } from 'vscode/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json

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

package/tools/editor.js

@@ -26,6 +26,85 @@ import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { unsupported } from '../tools.js';
 
 var StandaloneEditorGroup_1;
+class EmptyEditorGroup {
+    constructor() {
+        this.isTransient = () => false;
+        this.windowId = mainWindow.vscodeWindowId;
+        this.createEditorActions = unsupported;
+        this.onDidFocus = Event.None;
+        this.onDidOpenEditorFail = Event.None;
+        this.whenRestored = Promise.resolve();
+        this.disposed = false;
+        this.setActive = unsupported;
+        this.notifyIndexChanged = unsupported;
+        this.relayout = unsupported;
+        this.dispose = unsupported;
+        this.toJSON = unsupported;
+        this.minimumWidth = 0;
+        this.maximumWidth = Number.POSITIVE_INFINITY;
+        this.minimumHeight = 0;
+        this.maximumHeight = Number.POSITIVE_INFINITY;
+        this.onDidChange = Event.None;
+        this.layout = unsupported;
+        this.onDidModelChange = Event.None;
+        this.onWillDispose = Event.None;
+        this.onDidActiveEditorChange = Event.None;
+        this.onWillCloseEditor = Event.None;
+        this.onDidCloseEditor = Event.None;
+        this.onWillMoveEditor = Event.None;
+        this.onWillOpenEditor = Event.None;
+        this.id = 0;
+        this.index = 0;
+        this.label = 'main';
+        this.ariaLabel = 'main';
+        this.activeEditorPane = undefined;
+        this.activeEditor = null;
+        this.previewEditor = null;
+        this.count = 0;
+        this.isEmpty = false;
+        this.isLocked = false;
+        this.stickyCount = 0;
+        this.editors = [];
+        this.getEditors = () => [];
+        this.findEditors = () => [];
+        this.getEditorByIndex = () => undefined;
+        this.getIndexOfEditor = unsupported;
+        this.openEditor = unsupported;
+        this.openEditors = unsupported;
+        this.isPinned = () => false;
+        this.isSticky = () => false;
+        this.isActive = () => false;
+        this.contains = () => false;
+        this.moveEditor = unsupported;
+        this.moveEditors = unsupported;
+        this.copyEditor = unsupported;
+        this.copyEditors = unsupported;
+        this.closeEditor = unsupported;
+        this.closeEditors = unsupported;
+        this.closeAllEditors = unsupported;
+        this.replaceEditors = unsupported;
+        this.pinEditor = () => { };
+        this.stickEditor = () => { };
+        this.unstickEditor = () => { };
+        this.lock = () => { };
+        this.isFirst = unsupported;
+        this.isLast = unsupported;
+    }
+    get groupsView() {
+        return unsupported();
+    }
+    notifyLabelChanged() { }
+    get titleHeight() {
+        return unsupported();
+    }
+    get element() {
+        return unsupported();
+    }
+    get scopedContextKeyService() { return StandaloneServices.get(IContextKeyService); }
+    focus() {
+    }
+}
+const fakeActiveGroup = new EmptyEditorGroup();
 class SimpleEditorPane {
     constructor(editor) {
         this.editor = editor;
@@ -35,7 +114,7 @@ class SimpleEditorPane {
         this.onDidBlur = Event.None;
         this.input = undefined;
         this.options = undefined;
-        this.group = undefined;
+        this.group = fakeActiveGroup;
         this.scopedContextKeyService = undefined;
         this.getViewState = unsupported;
         this.isVisible = unsupported;
@@ -165,6 +244,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.editor = editor;
         this.scopedContextKeyService = scopedContextKeyService;
         this.active = false;
+        this.isTransient = () => false;
         this.windowId = mainWindow.vscodeWindowId;
         this.onDidFocus = this.editor.onDidFocusEditorWidget;
         this.onDidOpenEditorFail = Event.None;
@@ -478,7 +558,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         return this.delegate.createAuxiliaryEditorPart(options);
     }
     get mainPart() { return this.delegate.mainPart; }
-    get activePart() { return this.delegate.activePart; }
     getPart(container) {
         return this.delegate.getPart(container);
     }
@@ -506,4 +585,4 @@ MonacoDelegateEditorGroupsService = __decorate([
     ( __param(1, IInstantiationService))
 ], MonacoDelegateEditorGroupsService);
 
-export { MonacoDelegateEditorGroupsService, MonacoEditorService, wrapOpenEditor };
+export { MonacoDelegateEditorGroupsService, MonacoEditorService, fakeActiveGroup, wrapOpenEditor };

package/tools/views.d.ts

@@ -19,6 +19,7 @@ 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';
+import { IEditorGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 
 type Label = string | {
     short: string;
@@ -64,7 +65,7 @@ declare abstract class SimpleEditorInput extends EditorInput {
     isDirty(): boolean;
     setDirty(dirty: boolean): void;
 }
-declare function registerEditorPane<Services extends BrandedService[]>(typeId: string, name: string, ctor: new (...services: Services) => EditorPane, inputCtors: (new (...args: any[]) => EditorInput)[]): IDisposable;
+declare function registerEditorPane<Services extends BrandedService[]>(typeId: string, name: string, ctor: new (group: IEditorGroup, ...services: Services) => EditorPane, inputCtors: (new (...args: any[]) => EditorInput)[]): IDisposable;
 declare function registerEditor(globPattern: string, editorInfo: RegisteredEditorInfo, editorOptions: RegisteredEditorOptions, factory: EditorInputFactoryObject): IDisposable;
 declare function registerEditorSerializer<Services extends BrandedService[]>(editorTypeId: string, ctor: {
     new (...Services: Services): IEditorSerializer;

package/tools/views.js

@@ -28,14 +28,18 @@ import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar
 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';
+export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
+export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+export { SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+import { fakeActiveGroup } from './editor.js';
 import { withReadyServices } from 'vscode/services';
 
 class InjectedEditorPane extends EditorPane {
     constructor(id) {
-        super(id, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService));
+        super(id, fakeActiveGroup, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService));
     }
 }
 class SimpleEditorPane extends InjectedEditorPane {

package/views.d.ts

@@ -1,9 +1,9 @@
 import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 export { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { ILayoutInitializationState } from 'vscode/vscode/vs/workbench/browser/layout';
 export { ILayoutInitializationState } from 'vscode/vscode/vs/workbench/browser/layout';
 import { OpenEditor } from './tools/editor.js';

package/views.js

@@ -62,11 +62,12 @@ import { EditorParts } from 'vscode/vscode/vs/workbench/browser/parts/editor/edi
 import { IAuxiliaryWindowService, BrowserAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { ViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/viewsService';
-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 { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
+export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
+import { ICustomEditorLabelService, CustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService';
 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';
@@ -94,6 +95,7 @@ import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.autosave.contribu
 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 'vscode/vscode/vs/workbench/browser/style';
 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';
@@ -209,6 +211,9 @@ let MonacoEditorParts = class MonacoEditorParts extends MonacoDelegateEditorGrou
     registerPart(part) {
         return this.delegate.registerPart(part);
     }
+    get activePart() {
+        return this.delegate.activePart;
+    }
 };
 MonacoEditorParts = __decorate([
     ( __param(0, IInstantiationService))
@@ -585,7 +590,8 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
         [( IWebviewWorkbenchService.toString())]: new SyncDescriptor(WebviewEditorService, [], true),
         [( IProgressService.toString())]: new SyncDescriptor(ProgressService, [], true),
         [( IAuxiliaryWindowService.toString())]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true),
-        [( IEditorPaneService.toString())]: new SyncDescriptor(EditorPaneService, [], true)
+        [( IEditorPaneService.toString())]: new SyncDescriptor(EditorPaneService, [], true),
+        [( ICustomEditorLabelService.toString())]: new SyncDescriptor(CustomEditorLabelService, [], true)
     };
 }
 

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

@@ -6,7 +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';
+import { IHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegate';
 
 interface IToolBarOptions {
     orientation?: ActionsOrientation;

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

@@ -16,7 +16,7 @@ import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/co
 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';
+import { IHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegate';
 
 interface ICompositeTitleLabel {
     /**
@@ -47,13 +47,13 @@ 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;
+    protected readonly toolbarHoverDelegate: IHoverDelegate;
     private readonly mapCompositeToCompositeContainer;
     private readonly mapActionsBindingToComposite;
     private activeComposite;
     private lastActiveCompositeId;
     private readonly instantiatedCompositeItems;
-    private titleLabel;
+    protected titleLabel: ICompositeTitleLabel | undefined;
     private progressBar;
     private contentAreaSize;
     private readonly actionsListener;
@@ -72,6 +72,8 @@ declare abstract class CompositePart<T extends Composite> extends Part {
     protected hideActiveComposite(): Composite | undefined;
     protected createTitleArea(parent: HTMLElement): HTMLElement;
     protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel;
+    protected createHeaderArea(): HTMLElement;
+    protected createFooterArea(): HTMLElement;
     updateStyles(): void;
     protected actionViewItemProvider(action: IAction, options: IBaseActionViewItemOptions): IActionViewItem | undefined;
     protected actionsContextProvider(): unknown;

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

@@ -4,6 +4,7 @@ import { IProgressIndicator } from 'vscode/vscode/vs/platform/progress/common/pr
 import { PaneCompositeDescriptor, PaneComposite } from 'vscode/vscode/vs/workbench/browser/panecomposite';
 import { IPaneComposite } from 'vscode/vscode/vs/workbench/common/panecomposite';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IView } from 'vscode/vscode/vs/base/browser/ui/grid/grid';
 import { Parts, IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { CompositePart, ICompositeTitleLabel } from './compositePart.js';
@@ -21,6 +22,11 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { SubmenuAction } from 'vscode/vscode/vs/base/common/actions';
 import { Composite } from 'vscode/vscode/vs/workbench/browser/composite';
 
+declare enum CompositeBarPosition {
+    TOP = 0,
+    TITLE = 1,
+    BOTTOM = 2
+}
 interface IPaneCompositePart extends IView {
     readonly partId: Parts.PANEL_PART | Parts.AUXILIARYBAR_PART | Parts.SIDEBAR_PART;
     readonly onDidPaneCompositeOpen: Event<IPaneComposite>;
@@ -76,8 +82,11 @@ declare abstract class AbstractPaneCompositePart extends CompositePart<PaneCompo
     readonly onDidPaneCompositeClose: Event<IPaneComposite>;
     private readonly location;
     private titleContainer;
+    private headerFooterCompositeBarContainer;
+    protected headerFooterCompositeBarDispoables: DisposableStore;
     private paneCompositeBarContainer;
     private paneCompositeBar;
+    private compositeBarPosition;
     private emptyPaneMessageElement;
     private globalToolBar;
     private readonly globalActions;
@@ -93,8 +102,12 @@ declare abstract class AbstractPaneCompositePart extends CompositePart<PaneCompo
     private createEmptyPaneMessage;
     protected createTitleArea(parent: HTMLElement): HTMLElement;
     protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel;
-    protected updateTitleArea(): void;
-    protected createCompisteBar(): PaneCompositeBar;
+    protected updateCompositeBar(): void;
+    protected createHeaderArea(): HTMLElement;
+    protected createFooterArea(): HTMLElement;
+    protected createHeaderFooterCompositeBarArea(area: HTMLElement): HTMLElement;
+    private removeFooterHeaderArea;
+    protected createCompositeBar(): PaneCompositeBar;
     protected onTitleAreaUpdate(compositeId: string): void;
     openPaneComposite(id?: string, focus?: boolean): Promise<PaneComposite | undefined>;
     private doOpenPaneComposite;
@@ -112,9 +125,12 @@ declare abstract class AbstractPaneCompositePart extends CompositePart<PaneCompo
     private updateGlobalToolbarActions;
     protected getToolbarWidth(): number;
     private onTitleAreaContextMenu;
+    private onCompositeBarAreaContextMenu;
+    private onCompositeBarContextMenu;
     protected getViewsSubmenuAction(): SubmenuAction | undefined;
     protected abstract shouldShowCompositeBar(): boolean;
     protected abstract getCompositeBarOptions(): IPaneCompositeBarOptions;
+    protected abstract getCompositeBarPosition(): CompositeBarPosition;
 }
 
-export { AbstractPaneCompositePart, type IPaneCompositePart };
+export { AbstractPaneCompositePart, CompositeBarPosition, type IPaneCompositePart };

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.d.ts

@@ -9,7 +9,7 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { AbstractPaneCompositePart } from '../paneCompositePart.js';
+import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IPaneCompositeBarOptions } from '../paneCompositeBar.js';
 
@@ -28,6 +28,7 @@ declare class PanelPart extends AbstractPaneCompositePart {
     private fillExtraContextMenuActions;
     layout(width: number, height: number, top: number, left: number): void;
     protected shouldShowCompositeBar(): boolean;
+    protected getCompositeBarPosition(): CompositeBarPosition;
     toJSON(): object;
 }
 

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.d.ts

@@ -11,7 +11,7 @@ import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/co
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { LayoutPriority } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { AbstractPaneCompositePart } from '../paneCompositePart.js';
+import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
 import { ActivityBarCompositeBar } from '../activitybar/activitybarPart.js';
 import { IPaneCompositeBarOptions } from '../paneCompositeBar.js';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
@@ -31,13 +31,13 @@ declare class SidebarPart extends AbstractPaneCompositePart {
     updateStyles(): void;
     layout(width: number, height: number, top: number, left: number): void;
     protected getTitleAreaDropDownAnchorAlignment(): AnchorAlignment;
-    protected createCompisteBar(): ActivityBarCompositeBar;
+    protected createCompositeBar(): ActivityBarCompositeBar;
     protected getCompositeBarOptions(): IPaneCompositeBarOptions;
     protected shouldShowCompositeBar(): boolean;
     private shouldShowActivityBar;
+    protected getCompositeBarPosition(): CompositeBarPosition;
     private rememberActivityBarVisiblePosition;
     private getRememberedActivityBarVisiblePosition;
-    private updateActivityBarVisiblity;
     getPinnedPaneCompositeIds(): string[];
     getVisiblePaneCompositeIds(): string[];
     focusActivityBar(): Promise<void>;