@codingame/monaco-vscode-view-common-service-override 5.3.0 → 6.0.1

package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js

@@ -1,39 +1,45 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { GroupsOrder, GroupLocation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DisposableMap, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MainEditorPart } from './editorPart.js';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { firstOrDefault, distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { AuxiliaryEditorPart } from './auxiliaryEditorPart.js';
 import { MultiWindowParts } from 'vscode/vscode/vs/workbench/browser/part';
 import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { isHTMLElement } from 'vscode/vscode/vs/base/browser/dom';
 
 var EditorParts_1;
 const _moduleId = "vs/workbench/browser/parts/editor/editorParts";
 let EditorParts = class EditorParts extends MultiWindowParts {
     static { EditorParts_1 = this; }
-    constructor(instantiationService, storageService, themeService, auxiliaryWindowService) {
+    constructor(instantiationService, storageService, themeService, auxiliaryWindowService, contextKeyService) {
         super('workbench.editorParts', themeService, storageService);
         this.instantiationService = instantiationService;
         this.storageService = storageService;
         this.auxiliaryWindowService = auxiliaryWindowService;
+        this.contextKeyService = contextKeyService;
         this.mainPart = this._register(this.createMainEditorPart());
         this.mostRecentActiveParts = [this.mainPart];
         this._onDidCreateAuxiliaryEditorPart = this._register(( (new Emitter())));
         this.onDidCreateAuxiliaryEditorPart = this._onDidCreateAuxiliaryEditorPart.event;
-        this.workspaceMemento = this.getMemento(1 , 0 );
+        this.workspaceMemento = this.getMemento(StorageScope.WORKSPACE, StorageTarget.USER);
         this._isReady = false;
         this.whenReadyPromise = ( (new DeferredPromise()));
         this.whenReady = this.whenReadyPromise.p;
         this.whenRestoredPromise = ( (new DeferredPromise()));
         this.whenRestored = this.whenRestoredPromise.p;
         this.editorWorkingSets = (() => {
-            const workingSetsRaw = this.storageService.get(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, 1 );
+            const workingSetsRaw = this.storageService.get(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, StorageScope.WORKSPACE);
             if (workingSetsRaw) {
                 return JSON.parse(workingSetsRaw);
             }
@@ -55,12 +61,18 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         this.onDidChangeGroupLocked = this._onDidChangeGroupLocked.event;
         this._onDidChangeGroupMaximized = this._register(( (new Emitter())));
         this.onDidChangeGroupMaximized = this._onDidChangeGroupMaximized.event;
+        this.globalContextKeys = ( (new Map()));
+        this.scopedContextKeys = ( (new Map()));
+        this.contextKeyProviders = ( (new Map()));
+        this.registeredContextKeys = ( (new Map()));
+        this.contextKeyProviderDisposables = this._register(( (new DisposableMap())));
         this._register(this.registerPart(this.mainPart));
         this.restoreParts();
         this.registerListeners();
     }
     registerListeners() {
-        this._register(this.onDidChangeMementoValue(1 , this._store)(e => this.onDidChangeMementoState(e)));
+        this._register(this.onDidChangeMementoValue(StorageScope.WORKSPACE, this._store)(e => this.onDidChangeMementoState(e)));
+        this.whenReady.then(() => this.registerGroupsContextKeyListeners());
     }
     createMainEditorPart() {
         return this.instantiationService.createInstance(MainEditorPart, this);
@@ -118,7 +130,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     }
     getPart(groupOrElement) {
         if (this._parts.size > 1) {
-            if (groupOrElement instanceof HTMLElement) {
+            if (isHTMLElement(groupOrElement)) {
                 const element = groupOrElement;
                 return this.getPartByDocument(element.ownerDocument);
             }
@@ -203,7 +215,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         );
     }
     onDidChangeMementoState(e) {
-        if (e.external && e.scope === 1 ) {
+        if (e.external && e.scope === StorageScope.WORKSPACE) {
             this.reloadMemento(e.scope);
             const state = this.loadState();
             if (state) {
@@ -216,7 +228,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
             if (part === this.mainPart) {
                 continue;
             }
-            for (const group of part.getGroups(1 )) {
+            for (const group of part.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
                 await group.closeAllEditors({ excludeConfirming: true });
             }
             const closed = part.close();
@@ -256,7 +268,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
             this.saveWorkingSets();
         }
     }
-    async applyWorkingSet(workingSet) {
+    async applyWorkingSet(workingSet, options) {
         let workingSetState;
         if (workingSet === 'empty') {
             workingSetState = 'empty';
@@ -271,11 +283,13 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         if (!applied) {
             return false;
         }
-        await this.mainPart.applyState(workingSetState === 'empty' ? workingSetState : workingSetState.main);
-        const mostRecentActivePart = firstOrDefault(this.mostRecentActiveParts);
-        if (mostRecentActivePart) {
-            await mostRecentActivePart.whenReady;
-            mostRecentActivePart.activeGroup.focus();
+        await this.mainPart.applyState(workingSetState === 'empty' ? workingSetState : workingSetState.main, options);
+        if (!options?.preserveFocus) {
+            const mostRecentActivePart = firstOrDefault(this.mostRecentActiveParts);
+            if (mostRecentActivePart) {
+                await mostRecentActivePart.whenReady;
+                mostRecentActivePart.activeGroup.focus();
+            }
         }
         return true;
     }
@@ -288,7 +302,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         return undefined;
     }
     saveWorkingSets() {
-        this.storageService.store(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, JSON.stringify(this.editorWorkingSets), 1 , 1 );
+        this.storageService.store(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, JSON.stringify(this.editorWorkingSets), StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
     get activeGroup() {
         return this.activePart.activeGroup;
@@ -302,15 +316,15 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     get count() {
         return this.groups.length;
     }
-    getGroups(order = 0 ) {
+    getGroups(order = GroupsOrder.CREATION_TIME) {
         if (this._parts.size > 1) {
             let parts;
             switch (order) {
-                case 2 :
-                case 0 :
+                case GroupsOrder.GRID_APPEARANCE:
+                case GroupsOrder.CREATION_TIME:
                     parts = this.parts;
                     break;
-                case 1 :
+                case GroupsOrder.MOST_RECENTLY_ACTIVE:
                     parts = distinct([...this.mostRecentActiveParts, ...this.parts]);
                     break;
             }
@@ -378,18 +392,18 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     findGroup(scope, source = this.activeGroup, wrap) {
         const sourcePart = this.getPart(source);
         if (this._parts.size > 1) {
-            const groups = this.getGroups(2 );
-            if (scope.location === 0  || scope.location === 1 ) {
-                return scope.location === 0  ? groups[0] : groups[groups.length - 1];
+            const groups = this.getGroups(GroupsOrder.GRID_APPEARANCE);
+            if (scope.location === GroupLocation.FIRST || scope.location === GroupLocation.LAST) {
+                return scope.location === GroupLocation.FIRST ? groups[0] : groups[groups.length - 1];
             }
             const group = sourcePart.findGroup(scope, source, false);
             if (group) {
                 return group;
             }
-            if (scope.location === 2  || scope.location === 3 ) {
+            if (scope.location === GroupLocation.NEXT || scope.location === GroupLocation.PREVIOUS) {
                 const sourceGroup = this.assertGroupView(source);
                 const index = groups.indexOf(sourceGroup);
-                if (scope.location === 2 ) {
+                if (scope.location === GroupLocation.NEXT) {
                     let nextGroup = groups[index + 1];
                     if (!nextGroup && wrap) {
                         nextGroup = groups[0];
@@ -428,6 +442,109 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     createEditorDropTarget(container, delegate) {
         return this.getPart(container).createEditorDropTarget(container, delegate);
     }
+    registerGroupsContextKeyListeners() {
+        this._register(this.onDidChangeActiveGroup(() => this.updateGlobalContextKeys()));
+        this.groups.forEach(group => this.registerGroupContextKeyProvidersListeners(group));
+        this._register(this.onDidAddGroup(group => this.registerGroupContextKeyProvidersListeners(group)));
+        this._register(this.onDidRemoveGroup(group => {
+            this.scopedContextKeys.delete(group.id);
+            this.registeredContextKeys.delete(group.id);
+            this.contextKeyProviderDisposables.deleteAndDispose(group.id);
+        }));
+    }
+    updateGlobalContextKeys() {
+        const activeGroupScopedContextKeys = this.scopedContextKeys.get(this.activeGroup.id);
+        if (!activeGroupScopedContextKeys) {
+            return;
+        }
+        for (const [key, globalContextKey] of this.globalContextKeys) {
+            const scopedContextKey = activeGroupScopedContextKeys.get(key);
+            if (scopedContextKey) {
+                globalContextKey.set(scopedContextKey.get());
+            }
+            else {
+                globalContextKey.reset();
+            }
+        }
+    }
+    bind(contextKey, group) {
+        let globalContextKey = this.globalContextKeys.get(contextKey.key);
+        if (!globalContextKey) {
+            globalContextKey = contextKey.bindTo(this.contextKeyService);
+            this.globalContextKeys.set(contextKey.key, globalContextKey);
+        }
+        let groupScopedContextKeys = this.scopedContextKeys.get(group.id);
+        if (!groupScopedContextKeys) {
+            groupScopedContextKeys = ( (new Map()));
+            this.scopedContextKeys.set(group.id, groupScopedContextKeys);
+        }
+        let scopedContextKey = groupScopedContextKeys.get(contextKey.key);
+        if (!scopedContextKey) {
+            scopedContextKey = contextKey.bindTo(group.scopedContextKeyService);
+            groupScopedContextKeys.set(contextKey.key, scopedContextKey);
+        }
+        const that = this;
+        return {
+            get() {
+                return scopedContextKey.get();
+            },
+            set(value) {
+                if (that.activeGroup === group) {
+                    globalContextKey.set(value);
+                }
+                scopedContextKey.set(value);
+            },
+            reset() {
+                if (that.activeGroup === group) {
+                    globalContextKey.reset();
+                }
+                scopedContextKey.reset();
+            },
+        };
+    }
+    registerContextKeyProvider(provider) {
+        if (( (this.contextKeyProviders.has(provider.contextKey.key))) || ( (this.globalContextKeys.has(provider.contextKey.key)))) {
+            throw ( (new Error(
+                `A context key provider for key ${provider.contextKey.key} already exists.`
+            )));
+        }
+        this.contextKeyProviders.set(provider.contextKey.key, provider);
+        const setContextKeyForGroups = () => {
+            for (const group of this.groups) {
+                this.updateRegisteredContextKey(group, provider);
+            }
+        };
+        setContextKeyForGroups();
+        const onDidChange = provider.onDidChange?.(() => setContextKeyForGroups());
+        return toDisposable(() => {
+            onDidChange?.dispose();
+            this.globalContextKeys.delete(provider.contextKey.key);
+            this.scopedContextKeys.forEach(scopedContextKeys => scopedContextKeys.delete(provider.contextKey.key));
+            this.contextKeyProviders.delete(provider.contextKey.key);
+            this.registeredContextKeys.forEach(registeredContextKeys => registeredContextKeys.delete(provider.contextKey.key));
+        });
+    }
+    registerGroupContextKeyProvidersListeners(group) {
+        const disposable = group.onDidActiveEditorChange(() => {
+            for (const contextKeyProvider of ( (this.contextKeyProviders.values()))) {
+                this.updateRegisteredContextKey(group, contextKeyProvider);
+            }
+        });
+        this.contextKeyProviderDisposables.set(group.id, disposable);
+    }
+    updateRegisteredContextKey(group, provider) {
+        let groupRegisteredContextKeys = this.registeredContextKeys.get(group.id);
+        if (!groupRegisteredContextKeys) {
+            groupRegisteredContextKeys = ( (new Map()));
+            this.scopedContextKeys.set(group.id, groupRegisteredContextKeys);
+        }
+        let scopedRegisteredContextKey = groupRegisteredContextKeys.get(provider.contextKey.key);
+        if (!scopedRegisteredContextKey) {
+            scopedRegisteredContextKey = this.bind(provider.contextKey, group);
+            groupRegisteredContextKeys.set(provider.contextKey.key, scopedRegisteredContextKey);
+        }
+        scopedRegisteredContextKey.set(provider.getGroupContextKeyValue(group));
+    }
     get partOptions() { return this.mainPart.partOptions; }
     get onDidChangeEditorPartOptions() { return this.mainPart.onDidChangeEditorPartOptions; }
 };
@@ -435,7 +552,8 @@ EditorParts = EditorParts_1 = ( (__decorate([
     ( (__param(0, IInstantiationService))),
     ( (__param(1, IStorageService))),
     ( (__param(2, IThemeService))),
-    ( (__param(3, IAuxiliaryWindowService)))
+    ( (__param(3, IAuxiliaryWindowService))),
+    ( (__param(4, IContextKeyService)))
 ], EditorParts)));
 
 export { EditorParts };

package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js

@@ -1,15 +1,19 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
+import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Disposable, DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { CompositeDragAndDrop, CompositeBar } from './compositeBar.js';
 import { asCSSUrl, createCSSRule, Dimension, isMouseEvent } from 'vscode/vscode/vs/base/browser/dom';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ToggleCompositePinnedAction, ToggleCompositeBadgeAction, CompositeBarAction } from 'vscode/vscode/vs/workbench/browser/parts/compositeBarActions';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -41,15 +45,15 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         this.compositeActions = ( (new Map()));
         this.hasExtensionsRegistered = false;
         this._cachedViewContainers = undefined;
-        this.location = paneCompositePart.partId === "workbench.parts.panel"
-            ? 1  : paneCompositePart.partId === "workbench.parts.auxiliarybar"
-            ? 2  : 0 ;
+        this.location = paneCompositePart.partId === Parts.PANEL_PART
+            ? ViewContainerLocation.Panel : paneCompositePart.partId === Parts.AUXILIARYBAR_PART
+            ? ViewContainerLocation.AuxiliaryBar : ViewContainerLocation.Sidebar;
         this.dndHandler = ( (new CompositeDragAndDrop(
             this.viewDescriptorService,
             this.location,
             this.options.orientation,
             async (id, focus) => { return (await this.paneCompositePart.openPaneComposite(id, focus)) ?? null; },
-            (from, to, before) => this.compositeBar.move(from, to, this.options.orientation === 1  ? before?.verticallyBefore : before?.horizontallyBefore),
+            (from, to, before) => this.compositeBar.move(from, to, this.options.orientation === ActionsOrientation.VERTICAL ? before?.verticallyBefore : before?.horizontallyBefore),
             () => this.compositeBar.getCompositeBarItems()
         )));
         const cachedItems = ( (this.cachedViewContainers
@@ -117,7 +121,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
             }
             this.onDidRegisterExtensions();
             this._register(this.compositeBar.onDidChange(() => this.saveCachedViewContainers()));
-            this._register(this.storageService.onDidChangeValue(0 , this.options.pinnedViewContainersKey, this._store)(e => this.onDidPinnedViewContainersStorageValueChange(e)));
+            this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, this.options.pinnedViewContainersKey, this._store)(e => this.onDidPinnedViewContainersStorageValueChange(e)));
         });
     }
     onDidChangeViewContainers(added, removed) {
@@ -285,7 +289,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 return false;
             }
         }
-        if (!this.hasExtensionsRegistered && !(this.part === "workbench.parts.sidebar"  && this.environmentService.remoteAuthority && isNative)) {
+        if (!this.hasExtensionsRegistered && !(this.part === Parts.SIDEBAR_PART && this.environmentService.remoteAuthority && isNative)) {
             cachedViewContainer = cachedViewContainer || this.cachedViewContainers.find(({ id }) => id === viewContainerId);
             if (!viewContainer && cachedViewContainer?.isBuiltin && cachedViewContainer?.visible) {
                 return false;
@@ -451,7 +455,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         this.setPinnedViewContainers(( (cachedViewContainers.map(({ id, pinned, order }) => ({
             id,
             pinned,
-            visible: pinnedViewContainers.find(({ id: pinnedId }) => pinnedId === id)?.visible,
+            visible: Boolean(pinnedViewContainers.find(({ id: pinnedId }) => pinnedId === id)?.visible),
             order
         })))));
         this.setPlaceholderViewContainers(( (cachedViewContainers.map(({ id, icon, name, views, isBuiltin }) => ({
@@ -486,10 +490,10 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         }
     }
     getStoredPinnedViewContainersValue() {
-        return this.storageService.get(this.options.pinnedViewContainersKey, 0 , '[]');
+        return this.storageService.get(this.options.pinnedViewContainersKey, StorageScope.PROFILE, '[]');
     }
     setStoredPinnedViewContainersValue(value) {
-        this.storageService.store(this.options.pinnedViewContainersKey, value, 0 , 0 );
+        this.storageService.store(this.options.pinnedViewContainersKey, value, StorageScope.PROFILE, StorageTarget.USER);
     }
     getPlaceholderViewContainers() {
         return JSON.parse(this.placeholderViewContainersValue);
@@ -510,10 +514,10 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         }
     }
     getStoredPlaceholderViewContainersValue() {
-        return this.storageService.get(this.options.placeholderViewContainersKey, 0 , '[]');
+        return this.storageService.get(this.options.placeholderViewContainersKey, StorageScope.PROFILE, '[]');
     }
     setStoredPlaceholderViewContainersValue(value) {
-        this.storageService.store(this.options.placeholderViewContainersKey, value, 0 , 1 );
+        this.storageService.store(this.options.placeholderViewContainersKey, value, StorageScope.PROFILE, StorageTarget.MACHINE);
     }
     getViewContainersWorkspaceState() {
         return JSON.parse(this.viewContainersWorkspaceStateValue);
@@ -534,10 +538,10 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         }
     }
     getStoredViewContainersWorkspaceStateValue() {
-        return this.storageService.get(this.options.viewContainersWorkspaceStateKey, 1 , '[]');
+        return this.storageService.get(this.options.viewContainersWorkspaceStateKey, StorageScope.WORKSPACE, '[]');
     }
     setStoredViewContainersWorkspaceStateValue(value) {
-        this.storageService.store(this.options.viewContainersWorkspaceStateKey, value, 1 , 1 );
+        this.storageService.store(this.options.viewContainersWorkspaceStateKey, value, StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
 };
 PaneCompositeBar = ( (__decorate([
@@ -585,8 +589,8 @@ let ViewContainerActivityAction = class ViewContainerActivityAction extends Comp
         }
         this.lastRun = now;
         const focus = (event && 'preserveFocus' in event) ? !event.preserveFocus : true;
-        if (this.part === "workbench.parts.activitybar" ) {
-            const sideBarVisible = this.layoutService.isVisible("workbench.parts.sidebar" );
+        if (this.part === Parts.ACTIVITYBAR_PART) {
+            const sideBarVisible = this.layoutService.isVisible(Parts.SIDEBAR_PART);
             const activeViewlet = this.paneCompositePart.getActivePaneComposite();
             const focusBehavior = this.configurationService.getValue('workbench.activityBar.iconClickBehavior');
             if (sideBarVisible && activeViewlet?.getId() === this.compositeBarActionItem.id) {
@@ -598,7 +602,7 @@ let ViewContainerActivityAction = class ViewContainerActivityAction extends Comp
                     case 'toggle':
                     default:
                         this.logAction('hide');
-                        this.layoutService.setPartHidden(true, "workbench.parts.sidebar" );
+                        this.layoutService.setPartHidden(true, Parts.SIDEBAR_PART);
                         break;
                 }
                 return;

package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js

@@ -3,8 +3,10 @@ import './media/paneCompositePart.css.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Extensions } from 'vscode/vscode/vs/workbench/browser/panecomposite';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { DisposableStore, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { CompositePart } from './compositePart.js';
 import { PaneCompositeBar } from './paneCompositeBar.js';
@@ -23,14 +25,14 @@ import { EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vscode/vscode/vs/workbench/comm
 import { CompositeMenuActions } from 'vscode/vscode/vs/workbench/browser/actions';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
-import { prepareActions } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { ActionsOrientation, prepareActions } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Gesture, EventType as EventType$1 } from 'vscode/vscode/vs/base/browser/touch';
 import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
 import { SubmenuAction } from 'vscode/vscode/vs/base/common/actions';
 import { ViewsSubMenu } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
-import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
+import { WorkbenchToolBar, HiddenItemStrategy } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 
 var AbstractPaneCompositePart_1;
 const _moduleId = "vs/workbench/browser/parts/paneCompositePart";
@@ -50,16 +52,16 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
          (Event.map(this.onDidCompositeOpen.event, compositeEvent => compositeEvent.composite))
     ); }
     constructor(partId, partOptions, activePaneCompositeSettingsKey, activePaneContextKey, paneFocusContextKey, nameForTelemetry, compositeCSSClass, titleForegroundColor, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService) {
-        let location = 0 ;
+        let location = ViewContainerLocation.Sidebar;
         let registryId = Extensions.Viewlets;
         let globalActionsMenuId = MenuId.SidebarTitle;
-        if (partId === "workbench.parts.panel" ) {
-            location = 1 ;
+        if (partId === Parts.PANEL_PART) {
+            location = ViewContainerLocation.Panel;
             registryId = Extensions.Panels;
             globalActionsMenuId = MenuId.PanelTitle;
         }
-        else if (partId === "workbench.parts.auxiliarybar" ) {
-            location = 2 ;
+        else if (partId === Parts.AUXILIARYBAR_PART) {
+            location = ViewContainerLocation.AuxiliaryBar;
             registryId = Extensions.Auxiliary;
             globalActionsMenuId = MenuId.AuxiliaryBarTitle;
         }
@@ -188,12 +190,12 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         const globalTitleActionsContainer = titleArea.appendChild($('.global-actions'));
         this.globalToolBar = this._register(this.instantiationService.createInstance(WorkbenchToolBar, globalTitleActionsContainer, {
             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
-            orientation: 0 ,
+            orientation: ActionsOrientation.HORIZONTAL,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
             toggleMenuTitle: ( localizeWithPath(_moduleId, 1, "More Actions...")),
             hoverDelegate: this.toolbarHoverDelegate,
-            hiddenItemStrategy: -1
+            hiddenItemStrategy: HiddenItemStrategy.NoHide
         }));
         this.updateGlobalToolbarActions();
         return titleArea;
@@ -361,7 +363,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         }
         this.hideActiveComposite();
     }
-    focusComositeBar() {
+    focusCompositeBar() {
         this.paneCompositeBar.value?.focus();
     }
     layout(width, height, top, left) {
@@ -376,7 +378,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
     layoutCompositeBar() {
         if (this.contentDimension && this.dimension && this.paneCompositeBar.value) {
             const padding = this.compositeBarPosition === CompositeBarPosition.TITLE ? 16 : 8;
-            const borderWidth = this.partId === "workbench.parts.panel"  ? 0 : 1;
+            const borderWidth = this.partId === Parts.PANEL_PART ? 0 : 1;
             let availableWidth = this.contentDimension.width - padding - borderWidth;
             availableWidth = Math.max(AbstractPaneCompositePart_1.MIN_COMPOSITE_BAR_WIDTH, availableWidth - this.getToolbarWidth());
             this.paneCompositeBar.value.layout(availableWidth, this.dimension.height);

package/vscode/src/vs/workbench/browser/parts/paneCompositePartService.js

@@ -1,11 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { AuxiliaryBarPart } from './auxiliarybar/auxiliaryBarPart.js';
 import { PanelPart } from './panel/panelPart.js';
 import { SidebarPart } from './sidebar/sidebarPart.js';
-import { ViewContainerLocations } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewContainerLocation, ViewContainerLocations } from 'vscode/vscode/vs/workbench/common/views';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 
 let PaneCompositePartService = class PaneCompositePartService extends Disposable {
@@ -15,9 +16,9 @@ let PaneCompositePartService = class PaneCompositePartService extends Disposable
         const panelPart = instantiationService.createInstance(PanelPart);
         const sideBarPart = instantiationService.createInstance(SidebarPart);
         const auxiliaryBarPart = instantiationService.createInstance(AuxiliaryBarPart);
-        this.paneCompositeParts.set(1 , panelPart);
-        this.paneCompositeParts.set(0 , sideBarPart);
-        this.paneCompositeParts.set(2 , auxiliaryBarPart);
+        this.paneCompositeParts.set(ViewContainerLocation.Panel, panelPart);
+        this.paneCompositeParts.set(ViewContainerLocation.Sidebar, sideBarPart);
+        this.paneCompositeParts.set(ViewContainerLocation.AuxiliaryBar, auxiliaryBarPart);
         const eventDisposables = this._register(( new DisposableStore()));
         this.onDidPaneCompositeOpen = Event.any(...( ViewContainerLocations.map(loc => ( Event.map(
             this.paneCompositeParts.get(loc).onDidPaneCompositeOpen,

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js

@@ -2,7 +2,9 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import 'vscode/vscode/vs/workbench/browser/parts/panel/media/panelpart.css';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Separator, SubmenuAction, toAction } from 'vscode/vscode/vs/base/common/actions';
+import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { ActivePanelContext, PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
@@ -28,6 +30,7 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
+import { HoverPosition } from 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
@@ -55,7 +58,7 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
     }
     static { this.activePanelSettingsKey = 'workbench.panelpart.activepanelid'; }
     constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService) {
-        super("workbench.parts.panel" , { hasTitle: true }, PanelPart_1.activePanelSettingsKey, ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), 'panel', 'panel', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
+        super(Parts.PANEL_PART, { hasTitle: true }, PanelPart_1.activePanelSettingsKey, ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), 'panel', 'panel', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.commandService = commandService;
         this.minimumWidth = 300;
         this.maximumWidth = Number.POSITIVE_INFINITY;
@@ -81,10 +84,10 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
             placeholderViewContainersKey: 'workbench.panel.placeholderPanels',
             viewContainersWorkspaceStateKey: 'workbench.panel.viewContainersWorkspaceState',
             icon: false,
-            orientation: 0 ,
+            orientation: ActionsOrientation.HORIZONTAL,
             recomputeSizes: true,
             activityHoverOptions: {
-                position: () => this.layoutService.getPanelPosition() === 2  && !this.layoutService.isPanelMaximized() ? 3  : 2 ,
+                position: () => this.layoutService.getPanelPosition() === Position.BOTTOM && !this.layoutService.isPanelMaximized() ? HoverPosition.ABOVE : HoverPosition.BELOW,
             },
             fillExtraContextMenuActions: actions => this.fillExtraContextMenuActions(actions),
             compositeSize: 0,
@@ -120,7 +123,7 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
     }
     layout(width, height, top, left) {
         let dimensions;
-        if (this.layoutService.getPanelPosition() === 1 ) {
+        if (this.layoutService.getPanelPosition() === Position.RIGHT) {
             dimensions = ( (new Dimension(width - 1, height)));
         }
         else {
@@ -136,7 +139,7 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
     }
     toJSON() {
         return {
-            type: "workbench.parts.panel"
+            type: Parts.PANEL_PART
         };
     }
 };

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js

@@ -1,9 +1,13 @@
 import './media/sidebarpart.css.js';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 
 const _moduleId = "vs/workbench/browser/parts/sidebar/sidebarActions";
 class FocusSideBarAction extends Action2 {
@@ -14,20 +18,19 @@ class FocusSideBarAction extends Action2 {
             category: Categories.View,
             f1: true,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: null,
-                primary: 2048  | 21
+                primary: KeyMod.CtrlCmd | KeyCode.Digit0
             }
         });
     }
     async run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        if (!layoutService.isVisible("workbench.parts.sidebar" )) {
-            layoutService.setPartHidden(false, "workbench.parts.sidebar" );
-            return;
+        if (!layoutService.isVisible(Parts.SIDEBAR_PART)) {
+            layoutService.setPartHidden(false, Parts.SIDEBAR_PART);
         }
-        const viewlet = paneCompositeService.getActivePaneComposite(0 );
+        const viewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
         viewlet?.focus();
     }
 }