npm - @codingame/monaco-vscode-views-service-override - Versions diffs - 1.82.5 → 1.83.0-next.0 - Mend

@codingame/monaco-vscode-views-service-override 1.82.5 → 1.83.0-next.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

package/assets/index-no-csp.html CHANGED Viewed

@@ -9,7 +9,7 @@
 		content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 </head>
-<body style="margin: 0; overflow: hidden; width: 100%; height: 100%" role="document">
+<body style="margin: 0; overflow: hidden; width: 100%; height: 100%; overscroll-behavior-x: none;" role="document">
 	<!-- TODO: Remove additional script tag once Firefox is fixed https://bugzilla.mozilla.org/show_bug.cgi?id=1737882 -->
 	<script></script>
 	<script async type="module">
@@ -91,6 +91,7 @@
 			}
 			body {
+				overscroll-behavior-x: none;
 				background-color: transparent;
 				color: var(--vscode-editor-foreground);
 				font-family: var(--vscode-font-family);

package/assets/index.html CHANGED Viewed

@@ -5,14 +5,14 @@
 	<meta charset="UTF-8">
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-YpE6bcIFag52zelq40uStbBhAzE0LMangMC3LerCUkc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-6JpGoG7PLARCKjONYYTGdYKRS+ziu31DUoawja2IO5k=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
 		content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 </head>
-<body style="margin: 0; overflow: hidden; width: 100%; height: 100%" role="document">
+<body style="margin: 0; overflow: hidden; width: 100%; height: 100%; overscroll-behavior-x: none;" role="document">
 	<script async type="module">
 		// @ts-check
 		/// <reference lib="dom" />
@@ -92,6 +92,7 @@
 			}
 			body {
+				overscroll-behavior-x: none;
 				background-color: transparent;
 				color: var(--vscode-editor-foreground);
 				font-family: var(--vscode-font-family);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "1.82.5",
+  "version": "1.83.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.82.5",
-    "monaco-editor": "0.43.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0",
+    "monaco-editor": "0.44.0"
   }
 }

package/views.js CHANGED Viewed

@@ -257,7 +257,7 @@ function registerCustomView(options) {
     const iconUrl = options.icon != null ? ( URI.parse(options.icon)) : undefined;
     const VIEW_CONTAINER = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
         id: options.id,
-        title: options.name,
+        title: { value: options.name, original: options.name },
         order: options.order,
         ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [options.id, { mergeViewWithContainerWhenSingleView: true }]),
         hideIfEmpty: true,

package/vscode/src/vs/base/browser/ui/grid/gridview.js CHANGED Viewed

@@ -245,10 +245,18 @@ class BranchNode {
     }
     removeChild(index, sizing) {
         index = validateIndex(index, this.children.length);
-        this.splitview.removeView(index, sizing);
+        const result = this.splitview.removeView(index, sizing);
         this.children.splice(index, 1);
         this.updateBoundarySashes();
         this.onDidChildrenChange();
+        return result;
+    }
+    removeAllChildren() {
+        const result = this.splitview.removeAllViews();
+        this.children.splice(0, this.children.length);
+        this.updateBoundarySashes();
+        this.onDidChildrenChange();
+        return result;
     }
     moveChild(from, to) {
         from = validateIndex(from, this.children.length);
@@ -552,15 +560,18 @@ function flipNode(node, size, orthogonalSize) {
             }
             result.addChild(flipNode(child, orthogonalSize, newSize), newSize, 0, true);
         }
+        node.dispose();
         return result;
     }
     else {
-        return ( new LeafNode(
+        const result = ( new LeafNode(
             node.view,
             orthogonal(node.orientation),
             node.layoutController,
             orthogonalSize
         ));
+        node.dispose();
+        return result;
     }
 }
 class GridView {
@@ -642,7 +653,13 @@ class GridView {
                 this.layoutController,
                 parent.orthogonalSize
             ));
-            parent.addChild(node, size, index);
+            try {
+                parent.addChild(node, size, index);
+            }
+            catch (err) {
+                node.dispose();
+                throw err;
+            }
         }
         else {
             const [, grandParent] = tail2(pathToParent);
@@ -652,7 +669,8 @@ class GridView {
             if (typeof newSiblingCachedVisibleSize === 'number') {
                 newSiblingSize = Sizing.Invisible(newSiblingCachedVisibleSize);
             }
-            grandParent.removeChild(parentIndex);
+            const oldChild = grandParent.removeChild(parentIndex);
+            oldChild.dispose();
             const newParent = ( new BranchNode(
                 parent.orientation,
                 parent.layoutController,
@@ -686,6 +704,7 @@ class GridView {
             throw new Error('Invalid location');
         }
         parent.removeChild(index, sizing);
+        node.dispose();
         if (parent.children.length === 0) {
             throw new Error('Invalid grid state');
         }
@@ -699,6 +718,7 @@ class GridView {
                 return node.view;
             }
             parent.removeChild(0);
+            parent.dispose();
             this.root = sibling;
             this.boundarySashes = this.boundarySashes;
             this.trySet2x2();
@@ -706,16 +726,16 @@ class GridView {
         }
         const [, grandParent] = tail2(pathToParent);
         const [, parentIndex] = tail2(rest);
-        const sibling = parent.children[0];
         const isSiblingVisible = parent.isChildVisible(0);
-        parent.removeChild(0);
+        const sibling = parent.removeChild(0);
         const sizes = ( grandParent.children.map((_, i) => grandParent.getChildSize(i)));
         grandParent.removeChild(parentIndex, sizing);
+        parent.dispose();
         if (sibling instanceof BranchNode) {
             sizes.splice(parentIndex, 1, ...( sibling.children.map(c => c.size)));
-            for (let i = 0; i < sibling.children.length; i++) {
-                const child = sibling.children[i];
-                grandParent.addChild(child, child.size, parentIndex + i);
+            const siblingChildren = sibling.removeAllChildren();
+            for (let i = 0; i < siblingChildren.length; i++) {
+                grandParent.addChild(siblingChildren[i], siblingChildren[i].size, parentIndex + i);
             }
         }
         else {
@@ -728,6 +748,7 @@ class GridView {
             const sizing = isSiblingVisible ? sibling.orthogonalSize : Sizing.Invisible(sibling.orthogonalSize);
             grandParent.addChild(newSibling, sizing, parentIndex);
         }
+        sibling.dispose();
         for (let i = 0; i < sizes.length; i++) {
             grandParent.resizeChild(i, sizes[i]);
         }
@@ -970,9 +991,7 @@ class GridView {
     dispose() {
         this.onDidSashResetRelay.dispose();
         this.root.dispose();
-        if (this.element && this.element.parentElement) {
-            this.element.parentElement.removeChild(this.element);
-        }
+        this.element.parentElement?.removeChild(this.element);
     }
 }

package/vscode/src/vs/base/common/codicons.d.ts CHANGED Viewed

@@ -289,7 +289,7 @@ declare const Codicon: {
     readonly note: ThemeIcon;
     readonly octoface: ThemeIcon;
     readonly openPreview: ThemeIcon;
-    readonly package_: ThemeIcon;
+    readonly package: ThemeIcon;
     readonly paintcan: ThemeIcon;
     readonly pin: ThemeIcon;
     readonly play: ThemeIcon;

package/vscode/src/vs/platform/actions/browser/toolbar.d.ts CHANGED Viewed

@@ -42,9 +42,14 @@ type IWorkbenchToolBarOptions = IToolBarOptions & {
     /** This is controlled by the WorkbenchToolBar */
     allowContextMenu?: never;
     /**
-     * Maximun number of items that can shown. Extra items will be shown in the overflow menu.
+     * Controls the overflow behavior of the primary group of toolbar. This isthe maximum number of items and id of
+     * items that should never overflow
+     *
      */
-    maxNumberOfItems?: number;
+    overflowBehavior?: {
+        maxItems: number;
+        exempted?: string[];
+    };
 };
 /**
  * The `WorkbenchToolBar` does

package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js CHANGED Viewed

@@ -463,7 +463,8 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
         if (!viewContainer) {
             viewContainer = this.viewContainersRegistry.registerViewContainer({
                 id,
-                title, extensionId,
+                title: { value: title, original: title },
+                extensionId,
                 ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [id, { mergeViewWithContainerWhenSingleView: true }])),
                 hideIfEmpty: true,
                 order,

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarActions.js CHANGED Viewed

@@ -26,7 +26,6 @@ import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/st
 import { IHoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hover';
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-import { ICredentialsService } from 'vscode/vscode/vs/platform/credentials/common/credentials';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
 import { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
@@ -34,6 +33,7 @@ import { ISecretStorageService } from 'vscode/vscode/vs/platform/secrets/common/
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { runWhenIdle } from 'monaco-editor/esm/vs/base/common/async.js';
 import { Lazy } from 'monaco-editor/esm/vs/base/common/lazy.js';
+import { DEFAULT_ICON } from '../../../services/userDataProfile/common/userDataProfileIcons.js';
 var ViewContainerActivityAction_1, AccountsActivityActionViewItem_1;
 let ViewContainerActivityAction = class ViewContainerActivityAction extends ActivityAction {
@@ -181,20 +181,19 @@ MenuActivityActionViewItem = ( __decorate([
 let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
     static { AccountsActivityActionViewItem_1 = this; }
     static { this.ACCOUNTS_VISIBILITY_PREFERENCE_KEY = 'workbench.activity.showAccounts'; }
-    constructor(action, contextMenuActionsProvider, colors, activityHoverOptions, themeService, lifecycleService, hoverService, contextMenuService, menuService, contextKeyService, authenticationService, environmentService, productService, configurationService, storageService, keybindingService, secretStorageService, credentialsService, logService) {
+    constructor(action, contextMenuActionsProvider, colors, activityHoverOptions, themeService, lifecycleService, hoverService, contextMenuService, menuService, contextKeyService, authenticationService, environmentService, productService, configurationService, storageService, keybindingService, secretStorageService, logService) {
         super(MenuId.AccountsContext, action, contextMenuActionsProvider, true, colors, activityHoverOptions, themeService, hoverService, menuService, contextMenuService, contextKeyService, configurationService, environmentService, keybindingService);
         this.lifecycleService = lifecycleService;
         this.authenticationService = authenticationService;
         this.productService = productService;
         this.storageService = storageService;
         this.secretStorageService = secretStorageService;
-        this.credentialsService = credentialsService;
         this.logService = logService;
         this.groupedAccounts = ( new Map());
         this.problematicProviders = ( new Set());
         this.initialized = false;
         this.sessionFromEmbedder = ( new Lazy(
-            () => getCurrentAuthenticationSessionInfo(this.credentialsService, this.secretStorageService, this.productService)
+            () => getCurrentAuthenticationSessionInfo(this.secretStorageService, this.productService)
         ));
         this.registerListeners();
         this.initialize();
@@ -272,7 +271,7 @@ let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extend
                 if (account.canSignOut) {
                     const signOutAction = disposables.add(( new Action('signOut', ( localize('signOut', "Sign Out")), undefined, true, async () => {
                         const allSessions = await this.authenticationService.getSessions(providerId);
-                        const sessionsForAccount = allSessions.filter(s => s.account.id === account.id);
+                        const sessionsForAccount = allSessions.filter(s => s.account.label === account.label);
                         return await this.authenticationService.removeAccountSessions(providerId, account.label, sessionsForAccount);
                     })));
                     providerSubMenuActions.push(signOutAction);
@@ -311,31 +310,28 @@ let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extend
     }
     async addOrUpdateAccount(providerId, account) {
         let accounts = this.groupedAccounts.get(providerId);
-        if (accounts) {
-            const existingAccount = accounts.find(a => a.id === account.id);
-            if (existingAccount) {
-                if (existingAccount.label !== account.label) {
-                    existingAccount.label = account.label;
-                }
-                return;
-            }
-        }
-        else {
+        if (!accounts) {
             accounts = [];
             this.groupedAccounts.set(providerId, accounts);
         }
         const sessionFromEmbedder = await this.sessionFromEmbedder.value;
-        let canSignOut = !!sessionFromEmbedder?.canSignOut;
-        if (!canSignOut) {
-            if (sessionFromEmbedder?.id) {
-                const sessions = (await this.authenticationService.getSessions(providerId)).filter(s => s.account.id === account.id);
-                canSignOut = !( sessions.some(s => s.id === sessionFromEmbedder.id));
-            }
-            else {
-                canSignOut = true;
+        let canSignOut = true;
+        if (sessionFromEmbedder
+            && !sessionFromEmbedder.canSignOut
+            && ( (await this.authenticationService.getSessions(providerId))
+                .some(s => s.id === sessionFromEmbedder.id
+                && s.account.id === account.id))) {
+            canSignOut = false;
+        }
+        const existingAccount = accounts.find(a => a.label === account.label);
+        if (existingAccount) {
+            if (!canSignOut) {
+                existingAccount.canSignOut = canSignOut;
             }
         }
-        accounts.push({ ...account, canSignOut });
+        else {
+            accounts.push({ ...account, canSignOut });
+        }
     }
     removeAccount(providerId, account) {
         const accounts = this.groupedAccounts.get(providerId);
@@ -384,14 +380,12 @@ AccountsActivityActionViewItem = AccountsActivityActionViewItem_1 = ( __decorate
     ( __param(14, IStorageService)),
     ( __param(15, IKeybindingService)),
     ( __param(16, ISecretStorageService)),
-    ( __param(17, ICredentialsService)),
-    ( __param(18, ILogService))
+    ( __param(17, ILogService))
 ], AccountsActivityActionViewItem));
 let GlobalActivityActionViewItem = class GlobalActivityActionViewItem extends MenuActivityActionViewItem {
     constructor(action, contextMenuActionsProvider, colors, activityHoverOptions, userDataProfileService, themeService, hoverService, menuService, contextMenuService, contextKeyService, configurationService, environmentService, keybindingService) {
         super(MenuId.GlobalActivity, action, contextMenuActionsProvider, true, colors, activityHoverOptions, themeService, hoverService, menuService, contextMenuService, contextKeyService, configurationService, environmentService, keybindingService);
         this.userDataProfileService = userDataProfileService;
-        this._register(this.userDataProfileService.onDidChangeCurrentProfile(() => this.updateProfileBadge()));
     }
     render(container) {
         super.render(container);
@@ -411,7 +405,11 @@ let GlobalActivityActionViewItem = class GlobalActivityActionViewItem extends Me
         if (this.action.getBadge()) {
             return;
         }
-        this.profileBadgeContent.textContent = this.userDataProfileService.currentProfile.name.substring(0, 2).toUpperCase();
+        if (!this.userDataProfileService.currentProfile.icon || this.userDataProfileService.currentProfile.icon === DEFAULT_ICON.id) {
+            this.profileBadgeContent.classList.toggle('profile-text-overlay', true);
+            this.profileBadgeContent.classList.toggle('profile-icon-overlay', false);
+            this.profileBadgeContent.textContent = this.userDataProfileService.currentProfile.name.substring(0, 2).toUpperCase();
+        }
         show(this.profileBadge);
     }
     updateBadge() {

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.d.ts CHANGED Viewed

@@ -11,6 +11,7 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IPaneCompositeSelectorPart, IPaneCompositePart } from 'vscode/vscode/vs/workbench/browser/parts/paneCompositePart';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
 declare class ActivitybarPart extends Part implements IPaneCompositeSelectorPart {
     private readonly paneCompositePart;
@@ -21,12 +22,12 @@ declare class ActivitybarPart extends Part implements IPaneCompositeSelectorPart
     private readonly contextKeyService;
     private readonly configurationService;
     private readonly environmentService;
+    private readonly userDataProfileService;
     readonly _serviceBrand: undefined;
     private static readonly PINNED_VIEW_CONTAINERS;
     private static readonly PLACEHOLDER_VIEW_CONTAINERS;
     private static readonly ACTION_HEIGHT;
     private static readonly ACCOUNTS_ACTION_INDEX;
-    private static readonly GEAR_ICON;
     private static readonly ACCOUNTS_ICON;
     readonly minimumWidth: number;
     readonly maximumWidth: number;
@@ -49,7 +50,7 @@ declare class ActivitybarPart extends Part implements IPaneCompositeSelectorPart
     private readonly location;
     private hasExtensionsRegistered;
     private readonly enabledViewContainersContextKeys;
-    constructor(paneCompositePart: IPaneCompositePart, instantiationService: IInstantiationService, layoutService: IWorkbenchLayoutService, themeService: IThemeService, storageService: IStorageService, extensionService: IExtensionService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, environmentService: IWorkbenchEnvironmentService);
+    constructor(paneCompositePart: IPaneCompositePart, instantiationService: IInstantiationService, layoutService: IWorkbenchLayoutService, themeService: IThemeService, storageService: IStorageService, extensionService: IExtensionService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, environmentService: IWorkbenchEnvironmentService, userDataProfileService: IUserDataProfileService);
     private createCompositeBar;
     private getActivityHoverOptions;
     private getContextMenuActionsForComposite;
@@ -69,6 +70,7 @@ declare class ActivitybarPart extends Part implements IPaneCompositeSelectorPart
     protected createContentArea(parent: HTMLElement): HTMLElement;
     private registerKeyboardNavigationListeners;
     private createGlobalActivityActionBar;
+    private createGlobalActivity;
     private toggleAccountsActivity;
     private getCompositeActions;
     private onDidRegisterViewContainers;

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js CHANGED Viewed

@@ -34,6 +34,8 @@ import { toAction, Separator } from 'monaco-editor/esm/vs/base/common/actions.js
 import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
 import { StringSHA1 } from 'monaco-editor/esm/vs/base/common/hash.js';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
+import { DEFAULT_ICON } from '../../../services/userDataProfile/common/userDataProfileIcons.js';
 var ActivitybarPart_1;
 let ActivitybarPart = class ActivitybarPart extends Part {
@@ -42,9 +44,8 @@ let ActivitybarPart = class ActivitybarPart extends Part {
     static { this.PLACEHOLDER_VIEW_CONTAINERS = 'workbench.activity.placeholderViewlets'; }
     static { this.ACTION_HEIGHT = 48; }
     static { this.ACCOUNTS_ACTION_INDEX = 0; }
-    static { this.GEAR_ICON = registerIcon('settings-view-bar-icon', Codicon.settingsGear, ( localize('settingsViewBarIcon', "Settings icon in the view bar."))); }
     static { this.ACCOUNTS_ICON = registerIcon('accounts-view-bar-icon', Codicon.account, ( localize('accountsViewBarIcon', "Accounts icon in the view bar."))); }
-    constructor(paneCompositePart, instantiationService, layoutService, themeService, storageService, extensionService, viewDescriptorService, contextKeyService, configurationService, environmentService) {
+    constructor(paneCompositePart, instantiationService, layoutService, themeService, storageService, extensionService, viewDescriptorService, contextKeyService, configurationService, environmentService, userDataProfileService) {
         super("workbench.parts.activitybar" , { hasTitle: false }, themeService, storageService, layoutService);
         this.paneCompositePart = paneCompositePart;
         this.instantiationService = instantiationService;
@@ -54,6 +55,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
         this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
         this.environmentService = environmentService;
+        this.userDataProfileService = userDataProfileService;
         this.minimumWidth = 48;
         this.maximumWidth = 48;
         this.minimumHeight = 0;
@@ -381,11 +383,12 @@ let ActivitybarPart = class ActivitybarPart extends Part {
             animated: false,
             preventLoopNavigation: true
         })));
-        this.globalActivityAction = this._register(( new ActivityAction({
-            id: 'workbench.actions.manage',
-            name: ( localize('manage', "Manage")),
-            classNames: ThemeIcon.asClassNameArray(ActivitybarPart_1.GEAR_ICON),
-        })));
+        this.globalActivityAction = this._register(( new ActivityAction(this.createGlobalActivity())));
+        this._register(this.userDataProfileService.onDidChangeCurrentProfile(e => {
+            if (this.globalActivityAction) {
+                this.globalActivityAction.activity = this.createGlobalActivity();
+            }
+        }));
         if (this.accountsVisibilityPreference) {
             this.accountsActivityAction = this._register(( new ActivityAction({
                 id: 'workbench.actions.accounts',
@@ -396,6 +399,13 @@ let ActivitybarPart = class ActivitybarPart extends Part {
         }
         this.globalActivityActionBar.push(this.globalActivityAction);
     }
+    createGlobalActivity() {
+        return {
+            id: 'workbench.actions.manage',
+            name: ( localize('manage', "Manage")),
+            classNames: ThemeIcon.asClassNameArray(this.userDataProfileService.currentProfile.icon ? ThemeIcon.fromId(this.userDataProfileService.currentProfile.icon) : DEFAULT_ICON),
+        };
+    }
     toggleAccountsActivity() {
         if (!!this.accountsActivityAction === this.accountsVisibilityPreference) {
             return;
@@ -779,7 +789,8 @@ ActivitybarPart = ActivitybarPart_1 = ( __decorate([
     ( __param(6, IViewDescriptorService)),
     ( __param(7, IContextKeyService)),
     ( __param(8, IConfigurationService)),
-    ( __param(9, IWorkbenchEnvironmentService))
+    ( __param(9, IWorkbenchEnvironmentService)),
+    ( __param(10, IUserDataProfileService))
 ], ActivitybarPart));
 export { ActivitybarPart };

package/vscode/src/vs/workbench/browser/parts/activitybar/media/activityaction.css.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item{display:block;position:relative}.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:before{background-color:transparent;content:\"\";display:none;height:2px;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:background-color;width:48px}.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:before{margin-top:-2px;top:1px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:after{bottom:1px;margin-bottom:-2px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:first-of-type:before{margin-top:-2px;top:2px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:last-of-type:after{bottom:2px;margin-bottom:-2px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before{transition-delay:0s}.monaco-workbench .activitybar>.content.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .activitybar>.content.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom+.action-item:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:last-of-type.bottom:after{background-color:var(--insert-border-color)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label{box-sizing:border-box;display:flex;height:48px;margin-right:0;overflow:hidden;position:relative;width:48px;z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label:not(.codicon){font-size:15px;line-height:40px;padding:0 0 0 48px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label.codicon{align-items:center;font-size:24px;justify-content:center}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.uri-icon{background-color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-left:2px solid;content:\"\";height:100%;position:absolute;top:0;width:0;z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before{height:100%;top:0}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator.action-item,.monaco-workbench.hc-light .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator{display:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.clicked:focus:before{border-left:none!important}.monaco-workbench .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{left:0}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{right:0}.monaco-workbench.hc-black .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-black .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before{outline:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge{z-index:2}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{pointer-events:none}.monaco-workbench.border .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{left:-2px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .badge-content{border-radius:20px;font-size:9px;font-weight:600;height:16px;line-height:16px;min-width:8px;padding:0 4px;position:absolute;right:8px;text-align:center;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-badge-content{background-color:var(--vscode-profileBadge-background);border:2px solid var(--vscode-activityBar-background);border-radius:7px;color:var(--vscode-profileBadge-foreground);font-size:9px;font-weight:600;line-height:10px;padding:2px 3px;position:absolute;right:6px;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:active .profile-badge-content,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-badge-content,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-badge-content{color:var(--vscode-activityBar-foreground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content{font-size:12px;font-weight:unset;justify-content:center;padding:0}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content:before{text-align:center;vertical-align:baseline}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{left:auto;right:0}";
+var css = ".monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item{display:block;position:relative}.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:before{background-color:transparent;content:\"\";display:none;height:2px;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:background-color;width:48px}.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:before{margin-top:-2px;top:1px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:after{bottom:1px;margin-bottom:-2px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:first-of-type:before{margin-top:-2px;top:2px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:last-of-type:after{bottom:2px;margin-bottom:-2px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before{transition-delay:0s}.monaco-workbench .activitybar>.content.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .activitybar>.content.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom+.action-item:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:last-of-type.bottom:after{background-color:var(--insert-border-color)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label{box-sizing:border-box;display:flex;height:48px;margin-right:0;overflow:hidden;position:relative;width:48px;z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label:not(.codicon){font-size:15px;line-height:40px;padding:0 0 0 48px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label.codicon{align-items:center;font-size:24px;justify-content:center}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.uri-icon{background-color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-left:2px solid;content:\"\";height:100%;position:absolute;top:0;width:0;z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before{height:100%;top:0}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator.action-item,.monaco-workbench.hc-light .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator{display:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.clicked:focus:before{border-left:none!important}.monaco-workbench .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{left:0}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{right:0}.monaco-workbench.hc-black .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-black .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before{outline:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge{z-index:2}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{pointer-events:none}.monaco-workbench.border .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{left:-2px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .badge-content{border-radius:20px;font-size:9px;font-weight:600;height:16px;line-height:16px;min-width:8px;padding:0 4px;position:absolute;right:8px;text-align:center;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-icon-overlay{background-color:var(--vscode-activityBar-background);position:absolute;right:6px;top:27px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-icon-overlay .codicon{color:var(--vscode-activityBar-inactiveForeground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .profile-badge .profile-icon-overlay .codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-badge .profile-icon-overlay .codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-badge .profile-icon-overlay .codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-text-overlay{background-color:var(--vscode-profileBadge-background);border:2px solid var(--vscode-activityBar-background);border-radius:7px;color:var(--vscode-profileBadge-foreground);font-size:9px;font-weight:600;line-height:10px;padding:2px 3px;position:absolute;right:6px;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:active .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-text-overlay{color:var(--vscode-activityBar-foreground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content{font-size:12px;font-weight:unset;justify-content:center;padding:0}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content:before{text-align:center;vertical-align:baseline}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{left:auto;right:0}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js CHANGED Viewed

@@ -31,6 +31,7 @@ import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCo
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { defaultBreadcrumbsWidgetStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 var BreadcrumbsControl_1;
 class OutlineItem extends BreadcrumbsItem {
@@ -405,6 +406,48 @@ BreadcrumbsControl = BreadcrumbsControl_1 = ( __decorate([
     ( __param(10, IConfigurationService)),
     ( __param(11, IBreadcrumbsService))
 ], BreadcrumbsControl));
+let BreadcrumbsControlFactory = class BreadcrumbsControlFactory {
+    get control() { return this._control; }
+    get onDidEnablementChange() { return this._onDidEnablementChange.event; }
+    constructor(container, editorGroup, options, configurationService, instantiationService, fileService) {
+        this._disposables = ( new DisposableStore());
+        this._onDidEnablementChange = this._disposables.add(( new Emitter()));
+        const config = this._disposables.add(BreadcrumbsConfig.IsEnabled.bindTo(configurationService));
+        this._disposables.add(config.onDidChange(() => {
+            const value = config.getValue();
+            if (!value && this._control) {
+                this._control.dispose();
+                this._control = undefined;
+                this._onDidEnablementChange.fire();
+            }
+            else if (value && !this._control) {
+                this._control = instantiationService.createInstance(BreadcrumbsControl, container, options, editorGroup);
+                this._control.update();
+                this._onDidEnablementChange.fire();
+            }
+        }));
+        if (config.getValue()) {
+            this._control = instantiationService.createInstance(BreadcrumbsControl, container, options, editorGroup);
+        }
+        this._disposables.add(fileService.onDidChangeFileSystemProviderRegistrations(e => {
+            if (this._control?.model && this._control.model.resource.scheme !== e.scheme) {
+                return;
+            }
+            if (this._control?.update()) {
+                this._onDidEnablementChange.fire();
+            }
+        }));
+    }
+    dispose() {
+        this._disposables.dispose();
+        this._control?.dispose();
+    }
+};
+BreadcrumbsControlFactory = ( __decorate([
+    ( __param(3, IConfigurationService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IFileService))
+], BreadcrumbsControlFactory));
 registerAction2(class ToggleBreadcrumb extends Action2 {
     constructor() {
         super({
@@ -691,4 +734,4 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
-export { BreadcrumbsControl };
+export { BreadcrumbsControl, BreadcrumbsControlFactory };