@codingame/monaco-vscode-view-common-service-override 9.0.2 → 10.0.0

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

@@ -3,10 +3,8 @@ 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';
@@ -25,14 +23,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 { ActionsOrientation, prepareActions } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { 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, HiddenItemStrategy } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
+import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 
 var AbstractPaneCompositePart_1;
 var CompositeBarPosition;
@@ -51,16 +49,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 = ViewContainerLocation.Sidebar;
+        let location = 0 ;
         let registryId = Extensions.Viewlets;
         let globalActionsMenuId = MenuId.SidebarTitle;
-        if (partId === Parts.PANEL_PART) {
-            location = ViewContainerLocation.Panel;
+        if (partId === "workbench.parts.panel" ) {
+            location = 1 ;
             registryId = Extensions.Panels;
             globalActionsMenuId = MenuId.PanelTitle;
         }
-        else if (partId === Parts.AUXILIARYBAR_PART) {
-            location = ViewContainerLocation.AuxiliaryBar;
+        else if (partId === "workbench.parts.auxiliarybar" ) {
+            location = 2 ;
             registryId = Extensions.Auxiliary;
             globalActionsMenuId = MenuId.AuxiliaryBarTitle;
         }
@@ -142,10 +140,10 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this.emptyPaneMessageElement.classList.add('empty-pane-message-area');
         const messageElement = document.createElement('div');
         messageElement.classList.add('empty-pane-message');
-        messageElement.innerText = ( localize(9332, "Drag a view here to display."));
+        messageElement.innerText = ( localize(9406, "Drag a view here to display."));
         this.emptyPaneMessageElement.appendChild(messageElement);
         parent.appendChild(this.emptyPaneMessageElement);
-        this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(this.emptyPaneMessageElement, {
+        this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(this.element, {
             onDragOver: (e) => {
                 EventHelper.stop(e.eventData, true);
                 if (this.paneCompositeBar.value) {
@@ -174,6 +172,24 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
                 if (this.paneCompositeBar.value) {
                     this.paneCompositeBar.value.dndHandler.drop(e.dragAndDropData, undefined, e.eventData);
                 }
+                else {
+                    const dragData = e.dragAndDropData.getData();
+                    if (dragData.type === 'composite') {
+                        const currentContainer = this.viewDescriptorService.getViewContainerById(dragData.id);
+                        this.viewDescriptorService.moveViewContainerToLocation(currentContainer, this.location, undefined, 'dnd');
+                        this.openPaneComposite(currentContainer.id, true);
+                    }
+                    else if (dragData.type === 'view') {
+                        const viewToMove = this.viewDescriptorService.getViewDescriptorById(dragData.id);
+                        if (viewToMove && viewToMove.canMoveView) {
+                            this.viewDescriptorService.moveViewToLocation(viewToMove, this.location, 'dnd');
+                            const newContainer = this.viewDescriptorService.getViewContainerByViewId(viewToMove.id);
+                            this.openPaneComposite(newContainer.id, true).then(composite => {
+                                composite?.openView(viewToMove.id, true);
+                            });
+                        }
+                    }
+                }
             },
         }));
     }
@@ -189,12 +205,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: ActionsOrientation.HORIZONTAL,
+            orientation: 0 ,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-            toggleMenuTitle: ( localize(9333, "More Actions...")),
+            toggleMenuTitle: ( localize(9407, "More Actions...")),
             hoverDelegate: this.toolbarHoverDelegate,
-            hiddenItemStrategy: HiddenItemStrategy.NoHide
+            hiddenItemStrategy: -1
         }));
         this.updateGlobalToolbarActions();
         return titleArea;
@@ -210,12 +226,12 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this._register(CompositeDragAndDropObserver.INSTANCE.registerDraggable(this.titleLabelElement, draggedItemProvider, {}));
         return titleLabel;
     }
-    updateCompositeBar() {
+    updateCompositeBar(updateCompositeBarOption = false) {
         const wasCompositeBarVisible = this.compositeBarPosition !== undefined;
         const isCompositeBarVisible = this.shouldShowCompositeBar();
         const previousPosition = this.compositeBarPosition;
         const newPosition = isCompositeBarVisible ? this.getCompositeBarPosition() : undefined;
-        if (previousPosition === newPosition) {
+        if (!updateCompositeBarOption && previousPosition === newPosition) {
             return;
         }
         if (wasCompositeBarVisible) {
@@ -264,6 +280,9 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
             }
         }
         this.compositeBarPosition = newPosition;
+        if (updateCompositeBarOption) {
+            this.layoutCompositeBar();
+        }
     }
     createHeaderArea() {
         const headerArea = super.createHeaderArea();
@@ -377,7 +396,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 === Parts.PANEL_PART ? 0 : 1;
+            const borderWidth = this.partId === "workbench.parts.panel"  ? 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);
@@ -450,7 +469,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
             const menu = this.menuService.getMenuActions(ViewsSubMenu, scopedContextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
             createAndFillInActionBarActions(menu, { primary: viewsActions, secondary: [] }, () => true);
             disposables.dispose();
-            return viewsActions.length > 1 && ( (viewsActions.some(a => a.enabled))) ? ( (new SubmenuAction('views', ( localize(9334, "Views")), viewsActions))) : undefined;
+            return viewsActions.length > 1 && ( (viewsActions.some(a => a.enabled))) ? ( (new SubmenuAction('views', ( localize(9408, "Views")), viewsActions))) : undefined;
         }
         return undefined;
     }

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

@@ -1,12 +1,11 @@
 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 { ViewContainerLocation, ViewContainerLocations } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewContainerLocations } from 'vscode/vscode/vs/workbench/common/views';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 
 let PaneCompositePartService = class PaneCompositePartService extends Disposable {
@@ -16,9 +15,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(ViewContainerLocation.Panel, panelPart);
-        this.paneCompositeParts.set(ViewContainerLocation.Sidebar, sideBarPart);
-        this.paneCompositeParts.set(ViewContainerLocation.AuxiliaryBar, auxiliaryBarPart);
+        this.paneCompositeParts.set(1 , panelPart);
+        this.paneCompositeParts.set(0 , sideBarPart);
+        this.paneCompositeParts.set(2 , 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,9 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import 'vscode/vscode/vs/workbench/browser/parts/panel/media/panelpart.css';
 import { localize } 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';
@@ -30,13 +28,13 @@ 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';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
 var PanelPart_1;
 let PanelPart = class PanelPart extends AbstractPaneCompositePart {
@@ -56,13 +54,19 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         return Math.max(width, 300);
     }
     static { this.activePanelSettingsKey = 'workbench.panelpart.activepanelid'; }
-    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, 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);
+    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService, configurationService) {
+        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);
         this.commandService = commandService;
+        this.configurationService = configurationService;
         this.minimumWidth = 300;
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 77;
         this.maximumHeight = Number.POSITIVE_INFINITY;
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('workbench.panel.showLabel')) {
+                this.updateCompositeBar(true);
+            }
+        }));
     }
     updateStyles() {
         super.updateStyles();
@@ -83,11 +87,11 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
             pinnedViewContainersKey: 'workbench.panel.pinnedPanels',
             placeholderViewContainersKey: 'workbench.panel.placeholderPanels',
             viewContainersWorkspaceStateKey: 'workbench.panel.viewContainersWorkspaceState',
-            icon: false,
-            orientation: ActionsOrientation.HORIZONTAL,
+            icon: this.configurationService.getValue('workbench.panel.showLabel') === false,
+            orientation: 0 ,
             recomputeSizes: true,
             activityHoverOptions: {
-                position: () => this.layoutService.getPanelPosition() === Position.BOTTOM && !this.layoutService.isPanelMaximized() ? HoverPosition.ABOVE : HoverPosition.BELOW,
+                position: () => this.layoutService.getPanelPosition() === 2  && !this.layoutService.isPanelMaximized() ? 3  : 2 ,
             },
             fillExtraContextMenuActions: actions => this.fillExtraContextMenuActions(actions),
             compositeSize: 0,
@@ -114,18 +118,18 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         createAndFillInContextMenuActions(panelAlignMenu, { primary: [], secondary: alignActions });
         actions.push(...[
             ( (new Separator())),
-            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3745, "Panel Position")), positionActions))),
-            ( (new SubmenuAction('workbench.action.panel.align', ( localize(3746, "Align Panel")), alignActions))),
-            toAction({ id: TogglePanelAction.ID, label: ( localize(3747, "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
+            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3774, "Panel Position")), positionActions))),
+            ( (new SubmenuAction('workbench.action.panel.align', ( localize(3775, "Align Panel")), alignActions))),
+            toAction({ id: TogglePanelAction.ID, label: ( localize(3776, "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
         ]);
     }
     layout(width, height, top, left) {
         let dimensions;
         switch (this.layoutService.getPanelPosition()) {
-            case Position.RIGHT:
+            case 1 :
                 dimensions = ( (new Dimension(width - 1, height)));
                 break;
-            case Position.TOP:
+            case 3 :
                 dimensions = ( (new Dimension(width, height - 1)));
                 break;
             default:
@@ -142,7 +146,7 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
     }
     toJSON() {
         return {
-            type: Parts.PANEL_PART
+            type: "workbench.parts.panel"
         };
     }
 };
@@ -159,7 +163,8 @@ PanelPart = PanelPart_1 = ( (__decorate([
     ( (__param(9, IContextKeyService))),
     ( (__param(10, IExtensionService))),
     ( (__param(11, ICommandService))),
-    ( (__param(12, IMenuService)))
+    ( (__param(12, IMenuService))),
+    ( (__param(13, IConfigurationService)))
 ], PanelPart)));
 
 export { PanelPart };

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

@@ -1,35 +1,31 @@
 import './media/sidebarpart.css.js';
 import { localize2 } 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';
 
 class FocusSideBarAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.focusSideBar',
-            title: ( localize2(9331, 'Focus into Primary Side Bar')),
+            title: ( localize2(9405, 'Focus into Primary Side Bar')),
             category: Categories.View,
             f1: true,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
+                weight: 200 ,
                 when: null,
-                primary: KeyMod.CtrlCmd | KeyCode.Digit0
+                primary: 2048  | 21
             }
         });
     }
     async run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        if (!layoutService.isVisible(Parts.SIDEBAR_PART)) {
-            layoutService.setPartHidden(false, Parts.SIDEBAR_PART);
+        if (!layoutService.isVisible("workbench.parts.sidebar" )) {
+            layoutService.setPartHidden(false, "workbench.parts.sidebar" );
         }
-        const viewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
+        const viewlet = paneCompositeService.getActivePaneComposite(0 );
         viewlet?.focus();
     }
 }

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

@@ -1,10 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/sidebarpart.css.js';
 import './sidebarActions.js';
-import { Parts, LayoutSettings, Position, ActivityBarPosition } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { ActiveViewletContext, SidebarFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
@@ -24,15 +22,11 @@ import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { SIDE_BAR_BORDER, SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/contextview';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
-import '../../../../base/browser/ui/grid/grid.js';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
 import { ActivitybarPart, ActivityBarCompositeBar } from '../activitybar/activitybarPart.js';
-import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
-import { HoverPosition } from 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -40,14 +34,6 @@ import { Separator } from 'vscode/vscode/vs/base/common/actions';
 import { ToggleActivityBarVisibilityActionId } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
-import { LayoutPriority } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
-import 'vscode/vscode/vs/base/browser/dom';
-import 'vscode/vscode/vs/base/browser/ui/sash/sash';
-import 'vscode/vscode/vs/base/common/arrays';
-import 'vscode/vscode/vs/base/common/color';
-import 'vscode/vscode/vs/base/common/event';
-import 'vscode/vscode/vs/base/common/lifecycle';
-import '../../../../base/browser/ui/grid/gridview.css.js';
 
 var SidebarPart_1;
 let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
@@ -66,17 +52,17 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         return Math.max(width, 300);
     }
     constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, configurationService, menuService) {
-        super(Parts.SIDEBAR_PART, { hasTitle: true, borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0 }, SidebarPart_1.activeViewletSettingsKey, ActiveViewletContext.bindTo(contextKeyService), SidebarFocusContext.bindTo(contextKeyService), 'sideBar', 'viewlet', SIDE_BAR_TITLE_FOREGROUND, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
+        super("workbench.parts.sidebar" , { hasTitle: true, borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0 }, SidebarPart_1.activeViewletSettingsKey, ActiveViewletContext.bindTo(contextKeyService), SidebarFocusContext.bindTo(contextKeyService), 'sideBar', 'viewlet', SIDE_BAR_TITLE_FOREGROUND, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.configurationService = configurationService;
         this.minimumWidth = 170;
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 0;
         this.maximumHeight = Number.POSITIVE_INFINITY;
-        this.priority = LayoutPriority.Low;
+        this.priority = 1 ;
         this.activityBarPart = this._register(this.instantiationService.createInstance(ActivitybarPart, this));
         this.rememberActivityBarVisiblePosition();
         this._register(configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
+            if (e.affectsConfiguration("workbench.activityBar.location" )) {
                 this.onDidChangeActivityBarLocation();
             }
         }));
@@ -100,7 +86,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         container.style.backgroundColor = this.getColor(SIDE_BAR_BACKGROUND) || '';
         container.style.color = this.getColor(SIDE_BAR_FOREGROUND) || '';
         const borderColor = this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder);
-        const isPositionLeft = this.layoutService.getSideBarPosition() === Position.LEFT;
+        const isPositionLeft = this.layoutService.getSideBarPosition() === 0 ;
         container.style.borderRightWidth = borderColor && isPositionLeft ? '1px' : '';
         container.style.borderRightStyle = borderColor && isPositionLeft ? 'solid' : '';
         container.style.borderRightColor = isPositionLeft ? borderColor || '' : '';
@@ -110,13 +96,13 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         container.style.outlineColor = this.getColor(SIDE_BAR_DRAG_AND_DROP_BACKGROUND) ?? '';
     }
     layout(width, height, top, left) {
-        if (!this.layoutService.isVisible(Parts.SIDEBAR_PART)) {
+        if (!this.layoutService.isVisible("workbench.parts.sidebar" )) {
             return;
         }
         super.layout(width, height, top, left);
     }
     getTitleAreaDropDownAnchorAlignment() {
-        return this.layoutService.getSideBarPosition() === Position.LEFT ? AnchorAlignment.LEFT : AnchorAlignment.RIGHT;
+        return this.layoutService.getSideBarPosition() === 0  ? 0  : 1 ;
     }
     createCompositeBar() {
         return this.instantiationService.createInstance(ActivityBarCompositeBar, this.getCompositeBarOptions(), this.partId, this, false);
@@ -128,10 +114,10 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             placeholderViewContainersKey: ActivitybarPart.placeholderViewContainersKey,
             viewContainersWorkspaceStateKey: ActivitybarPart.viewContainersWorkspaceStateKey,
             icon: true,
-            orientation: ActionsOrientation.HORIZONTAL,
+            orientation: 0 ,
             recomputeSizes: true,
             activityHoverOptions: {
-                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? HoverPosition.ABOVE : HoverPosition.BELOW,
+                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? 3  : 2 ,
             },
             fillExtraContextMenuActions: actions => {
                 const viewsSubmenuAction = this.getViewsSubmenuAction();
@@ -157,37 +143,37 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         };
     }
     shouldShowCompositeBar() {
-        const activityBarPosition = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
-        return activityBarPosition === ActivityBarPosition.TOP || activityBarPosition === ActivityBarPosition.BOTTOM;
+        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
+        return activityBarPosition === "top"  || activityBarPosition === "bottom" ;
     }
     shouldShowActivityBar() {
         if (this.shouldShowCompositeBar()) {
             return false;
         }
-        return this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.HIDDEN;
+        return this.configurationService.getValue("workbench.activityBar.location" ) !== "hidden" ;
     }
     getCompositeBarPosition() {
-        const activityBarPosition = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
+        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
         switch (activityBarPosition) {
-            case ActivityBarPosition.TOP: return CompositeBarPosition.TOP;
-            case ActivityBarPosition.BOTTOM: return CompositeBarPosition.BOTTOM;
-            case ActivityBarPosition.HIDDEN:
-            case ActivityBarPosition.DEFAULT:
+            case "top" : return CompositeBarPosition.TOP;
+            case "bottom" : return CompositeBarPosition.BOTTOM;
+            case "hidden" :
+            case "default" :
             default: return CompositeBarPosition.TITLE;
         }
     }
     rememberActivityBarVisiblePosition() {
-        const activityBarPosition = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
-        if (activityBarPosition !== ActivityBarPosition.HIDDEN) {
-            this.storageService.store(LayoutSettings.ACTIVITY_BAR_LOCATION, activityBarPosition, StorageScope.PROFILE, StorageTarget.USER);
+        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
+        if (activityBarPosition !== "hidden" ) {
+            this.storageService.store("workbench.activityBar.location" , activityBarPosition, 0 , 0 );
         }
     }
     getRememberedActivityBarVisiblePosition() {
-        const activityBarPosition = this.storageService.get(LayoutSettings.ACTIVITY_BAR_LOCATION, StorageScope.PROFILE);
+        const activityBarPosition = this.storageService.get("workbench.activityBar.location" , 0 );
         switch (activityBarPosition) {
-            case ActivityBarPosition.TOP: return ActivityBarPosition.TOP;
-            case ActivityBarPosition.BOTTOM: return ActivityBarPosition.BOTTOM;
-            default: return ActivityBarPosition.DEFAULT;
+            case "top" : return "top" ;
+            case "bottom" : return "bottom" ;
+            default: return "default" ;
         }
     }
     getPinnedPaneCompositeIds() {
@@ -197,16 +183,16 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         return this.shouldShowCompositeBar() ? super.getVisiblePaneCompositeIds() : this.activityBarPart.getVisiblePaneCompositeIds();
     }
     async focusActivityBar() {
-        if (this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) === ActivityBarPosition.HIDDEN) {
-            await this.configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, this.getRememberedActivityBarVisiblePosition());
+        if (this.configurationService.getValue("workbench.activityBar.location" ) === "hidden" ) {
+            await this.configurationService.updateValue("workbench.activityBar.location" , this.getRememberedActivityBarVisiblePosition());
             this.onDidChangeActivityBarLocation();
         }
         if (this.shouldShowCompositeBar()) {
             this.focusCompositeBar();
         }
         else {
-            if (!this.layoutService.isVisible(Parts.ACTIVITYBAR_PART)) {
-                this.layoutService.setPartHidden(false, Parts.ACTIVITYBAR_PART);
+            if (!this.layoutService.isVisible("workbench.parts.activitybar" )) {
+                this.layoutService.setPartHidden(false, "workbench.parts.activitybar" );
             }
             this.activityBarPart.show(true);
         }
@@ -217,18 +203,18 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             constructor() {
                 super({
                     id: ToggleActivityBarVisibilityActionId,
-                    title: ( localize2(3725, "Toggle Activity Bar Visibility")),
+                    title: ( localize2(3754, "Toggle Activity Bar Visibility")),
                 });
             }
             run() {
-                const value = that.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) === ActivityBarPosition.HIDDEN ? that.getRememberedActivityBarVisiblePosition() : ActivityBarPosition.HIDDEN;
-                return that.configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, value);
+                const value = that.configurationService.getValue("workbench.activityBar.location" ) === "hidden"  ? that.getRememberedActivityBarVisiblePosition() : "hidden" ;
+                return that.configurationService.updateValue("workbench.activityBar.location" , value);
             }
         }));
     }
     toJSON() {
         return {
-            type: Parts.SIDEBAR_PART
+            type: "workbench.parts.sidebar"
         };
     }
 };