@codingame/monaco-vscode-api 3.2.3 → 4.1.0

package/vscode/src/vs/workbench/browser/parts/views/media/views.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".file-icon-themable-tree .align-icon-with-twisty .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree .monaco-tl-twistie.force-no-twistie,.file-icon-themable-tree.align-icons-and-twisties .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree.hide-arrows .monaco-tl-twistie:not(.force-twistie){background-image:none!important;padding-right:0!important;visibility:hidden;width:0!important}.file-icon-themable-tree .monaco-list-row .content .monaco-highlighted-label .highlight,.monaco-tl-contents .monaco-highlighted-label .highlight{background-color:var(--vscode-list-filterMatchBackground);color:unset!important;outline:1px dotted var(--vscode-list-filterMatchBorder);outline-offset:-1px}.monaco-workbench .tree-explorer-viewlet-tree-view{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .message{display:flex;padding:4px 12px 4px 18px;user-select:text;-webkit-user-select:text}.monaco-workbench .tree-explorer-viewlet-tree-view .message p{margin-bottom:0;margin-top:0;padding-bottom:4px}.monaco-workbench .tree-explorer-viewlet-tree-view .message ul{padding-left:24px}.monaco-workbench .tree-explorer-viewlet-tree-view .message a{color:var(--vscode-textLink-foreground)}.monaco-workbench .tree-explorer-viewlet-tree-view .message.hide{display:none}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree.hide{display:none}.monaco-workbench .pane>.pane-body>.welcome-view{box-sizing:border-box;display:flex;flex-direction:column;height:100%;width:100%}.monaco-workbench .pane>.pane-body.welcome>:not(.welcome-view),.monaco-workbench .pane>.pane-body:not(.welcome)>.welcome-view{display:none}.monaco-workbench .pane>.pane-body .welcome-view-content{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;padding:0 20px 1em}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container{max-width:300px;width:100%}.monaco-workbench:not(.reduce-motion) .pane>.pane-body .welcome-view-content>.button-container{transition:max-width .2s ease-out}.monaco-workbench .pane>.pane-body .welcome-view-content.wide>.button-container{max-width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container>.monaco-button{max-width:300px}.monaco-workbench .pane>.pane-body .welcome-view-content>p{width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>*{margin-block-end:0;margin-block-start:1em;margin-inline-end:0;margin-inline-start:0}.customview-tree .monaco-list-row .monaco-tl-contents.align-icon-with-twisty:before{display:none}.customview-tree .monaco-list-row .monaco-tl-contents:not(.align-icon-with-twisty):before{display:inline-block}.customview-tree .monaco-list .monaco-list-row{padding-left:0;padding-right:12px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item{display:flex;flex:1;flex-wrap:nowrap;height:22px;line-height:22px;overflow:hidden;padding-left:3px;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-selectBackground);border:1px solid var(--vscode-checkbox-selectBorder)}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-background);border:1px solid var(--vscode-checkbox-border);height:16px;margin:3px 6px 3px 0;opacity:1;padding:0;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox.codicon{font-size:13px;line-height:15px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-inputbox{flex:1;line-height:normal}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel{flex:1;overflow:hidden;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-icon-label-container:after{content:\"\";display:block}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon,.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;align-items:center;background-position:0;background-repeat:no-repeat;background-size:16px;display:flex;height:22px;justify-content:center;padding-right:6px;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.disabled{opacity:.6}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon.codicon-modifier-spin{margin-left:-6px;padding-left:6px}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon{color:currentColor!important}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel .monaco-icon-label-container>.monaco-icon-name-container{flex:1}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel:after{margin-right:4px;padding-right:0}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions{display:none}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions .action-label{padding:2px}.customview-tree .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .actions{display:block}.monaco-workbench .auxiliarybar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item.viewpane-filter-container{max-width:inherit}.viewpane-filter-container{cursor:default;display:flex}.viewpane-filter-container.grow{flex:1}.viewpane-filter-container>.viewpane-filter{align-items:center;display:flex;flex:1;position:relative}.viewpane-filter-container>.viewpane-filter .monaco-inputbox{flex:1;font-size:12px;height:24px}.pane-header .viewpane-filter-container>.viewpane-filter .monaco-inputbox .monaco-inputbox{height:20px;line-height:18px}.monaco-workbench.vs .viewpane-filter-container>.viewpane-filter .monaco-inputbox{height:25px}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls{align-items:center;bottom:0;display:flex;position:absolute;right:0;top:0}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge{border-radius:2px;margin:4px 0;padding:0 8px}.viewpane-filter.small>.viewpane-filter-controls>.viewpane-filter-badge,.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge.hidden{display:none}.viewpane-filter>.viewpane-filter-controls>.monaco-action-bar .action-item .action-label.codicon.filter{padding:2px}.panel>.title .monaco-action-bar .action-item.viewpane-filter-container{margin-right:10px;max-width:400px;min-width:150px}.pane-body .viewpane-filter-container:not(:empty){flex:1;height:auto;margin:10px 20px}.pane-body .viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-item{margin-right:4px}.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-label.codicon.codicon-filter.checked{background-color:var(--vscode-inputOption-activeBackground);border-color:var(--vscode-inputOption-activeBorder);color:var(--vscode-inputOption-activeForeground)}";
+var css = ".file-icon-themable-tree .align-icon-with-twisty .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree .monaco-tl-twistie.force-no-twistie,.file-icon-themable-tree.align-icons-and-twisties .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree.hide-arrows .monaco-tl-twistie:not(.force-twistie){background-image:none!important;padding-right:0!important;visibility:hidden;width:0!important}.file-icon-themable-tree .monaco-list-row .content .monaco-highlighted-label .highlight,.pane-body .monaco-tl-contents .monaco-highlighted-label .highlight{background-color:var(--vscode-list-filterMatchBackground);color:unset!important;outline:1px dotted var(--vscode-list-filterMatchBorder);outline-offset:-1px}.monaco-workbench .tree-explorer-viewlet-tree-view{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .message{display:flex;padding:4px 12px 4px 18px;user-select:text;-webkit-user-select:text}.monaco-workbench .tree-explorer-viewlet-tree-view .message p{margin-bottom:0;margin-top:0;padding-bottom:4px}.monaco-workbench .tree-explorer-viewlet-tree-view .message ul{padding-left:24px}.monaco-workbench .tree-explorer-viewlet-tree-view .message a{color:var(--vscode-textLink-foreground)}.monaco-workbench .tree-explorer-viewlet-tree-view .message.hide{display:none}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree.hide{display:none}.monaco-workbench .pane>.pane-body>.welcome-view{box-sizing:border-box;display:flex;flex-direction:column;height:100%;width:100%}.monaco-workbench .pane>.pane-body.welcome>:not(.welcome-view),.monaco-workbench .pane>.pane-body:not(.welcome)>.welcome-view{display:none}.monaco-workbench .pane>.pane-body .welcome-view-content{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;padding:0 20px 1em}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container{max-width:300px;width:100%}.monaco-workbench:not(.reduce-motion) .pane>.pane-body .welcome-view-content>.button-container{transition:max-width .2s ease-out}.monaco-workbench .pane>.pane-body .welcome-view-content.wide>.button-container{max-width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container>.monaco-button{max-width:300px}.monaco-workbench .pane>.pane-body .welcome-view-content>p{width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>*{margin-block-end:0;margin-block-start:1em;margin-inline-end:0;margin-inline-start:0}.customview-tree .monaco-list-row .monaco-tl-contents.align-icon-with-twisty:before{display:none}.customview-tree .monaco-list-row .monaco-tl-contents:not(.align-icon-with-twisty):before{display:inline-block}.customview-tree .monaco-list .monaco-list-row{padding-left:0;padding-right:12px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item{display:flex;flex:1;flex-wrap:nowrap;height:22px;line-height:22px;overflow:hidden;padding-left:3px;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-selectBackground);border:1px solid var(--vscode-checkbox-selectBorder)}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-background);border:1px solid var(--vscode-checkbox-border);height:16px;margin:3px 6px 3px 0;opacity:1;padding:0;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox.codicon{font-size:13px;line-height:15px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-inputbox{flex:1;line-height:normal}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel{flex:1;overflow:hidden;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-icon-label-container:after{content:\"\";display:block}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon,.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;align-items:center;background-position:0;background-repeat:no-repeat;background-size:16px;display:flex;height:22px;justify-content:center;padding-right:6px;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.disabled{opacity:.6}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon.codicon-modifier-spin{margin-left:-6px;padding-left:6px}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon{color:currentColor!important}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel .monaco-icon-label-container>.monaco-icon-name-container{flex:1}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel:after{margin-right:4px;padding-right:0}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions{display:none}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions .action-label{padding:2px}.customview-tree .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .actions{display:block}.monaco-workbench .auxiliarybar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item.viewpane-filter-container{max-width:inherit}.viewpane-filter-container{cursor:default;display:flex}.viewpane-filter-container.grow{flex:1}.viewpane-filter-container>.viewpane-filter{align-items:center;display:flex;flex:1;position:relative}.viewpane-filter-container>.viewpane-filter .monaco-inputbox{flex:1;font-size:12px;height:24px}.pane-header .viewpane-filter-container>.viewpane-filter .monaco-inputbox .monaco-inputbox{height:20px;line-height:18px}.monaco-workbench.vs .viewpane-filter-container>.viewpane-filter .monaco-inputbox{height:25px}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls{align-items:center;bottom:0;display:flex;position:absolute;right:0;top:0}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge{border-radius:2px;margin:4px 2px 4px 0;padding:0 8px}.viewpane-filter.small>.viewpane-filter-controls>.viewpane-filter-badge,.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge.hidden{display:none}.panel>.title .monaco-action-bar .action-item.viewpane-filter-container{margin-right:10px;max-width:400px;min-width:150px}.pane-body .viewpane-filter-container:not(:empty){flex:1;height:auto;margin:10px 20px}.pane-body .viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-item{margin-right:4px}.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-label.codicon.codicon-filter.checked{background-color:var(--vscode-inputOption-activeBackground);border-color:var(--vscode-inputOption-activeBorder);color:var(--vscode-inputOption-activeForeground)}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/views/treeView.js

@@ -7,7 +7,7 @@ import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionView
 import { CollapseAllAction } from '../../../../base/browser/ui/tree/treeDefaults.js';
 import { ActionRunner } from '../../../../base/common/actions.js';
 import { timeout } from '../../../../base/common/async.js';
-import { CancellationTokenSource, CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
@@ -646,7 +646,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
         let command = element?.command;
         if (element && !command) {
             if ((element instanceof ResolvableTreeItem) && element.hasResolve) {
-                await element.resolve(( new CancellationTokenSource()).token);
+                await element.resolve(CancellationToken.None);
                 command = element.command;
             }
         }
@@ -952,7 +952,7 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         this.onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
         this._hasCheckbox = false;
         this._renderedElements = ( new Map());
-        this._hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'mouse', false, { persistence: undefined  }));
+        this._hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'mouse', false, {}));
         this._register(this.themeService.onDidFileIconThemeChange(() => this.rerender()));
         this._register(this.themeService.onDidColorThemeChange(() => this.rerender()));
         this._register(checkboxStateHandler.onDidChangeCheckboxState(items => {

package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js

@@ -3,7 +3,17 @@ import { Delayer } from '../../../../base/common/async.js';
 import { $, append, addStandardDisposableListener, EventType, trackFocus } from '../../../../base/browser/dom.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
-import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import { badgeBackground, badgeForeground } from '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
@@ -147,9 +157,9 @@ let FilterWidget = class FilterWidget extends Widget {
     createToolBar(container) {
         return this.instantiationService.createInstance(MenuWorkbenchToolBar, container, viewFilterMenu, {
             hiddenItemStrategy: -1 ,
-            actionViewItemProvider: (action) => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof SubmenuItemAction && action.item.submenu.id === viewFilterSubmenu.id) {
-                    this.moreFiltersActionViewItem = this.instantiationService.createInstance(MoreFiltersActionViewItem, action, undefined);
+                    this.moreFiltersActionViewItem = this.instantiationService.createInstance(MoreFiltersActionViewItem, action, options);
                     this.moreFiltersActionViewItem.checked = this.isMoreFiltersChecked;
                     return this.moreFiltersActionViewItem;
                 }

package/vscode/src/vs/workbench/browser/parts/views/viewPane.d.ts

@@ -31,6 +31,7 @@ interface IViewPaneOptions extends IPaneOptions {
     readonly showActions?: ViewPaneShowActions;
     readonly titleMenuId?: MenuId;
     readonly donotForwardArgs?: boolean;
+    readonly singleViewPaneContainerTitle?: string;
 }
 declare abstract class ViewPane extends Pane implements IView {
     protected keybindingService: IKeybindingService;
@@ -59,6 +60,8 @@ declare abstract class ViewPane extends Pane implements IView {
     get title(): string;
     private _titleDescription;
     get titleDescription(): string | undefined;
+    private _singleViewPaneContainerTitle;
+    get singleViewPaneContainerTitle(): string | undefined;
     readonly menuActions: CompositeMenuActions;
     private progressBar;
     private progressIndicator;
@@ -66,8 +69,11 @@ declare abstract class ViewPane extends Pane implements IView {
     private readonly showActions;
     private headerContainer?;
     private titleContainer?;
+    private titleContainerHover?;
     private titleDescriptionContainer?;
+    private titleDescriptionContainerHover?;
     private iconContainer?;
+    private iconContainerHover?;
     protected twistiesContainer?: HTMLElement;
     private viewWelcomeController;
     protected readonly scopedContextKeyService: IContextKeyService;

package/vscode/src/vs/workbench/browser/parts/views/viewPane.js

@@ -2,9 +2,19 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/paneviewlet.css.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { asCssVariable, foreground } from '../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
+import { foreground } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { SIDE_BAR_BACKGROUND, PANEL_BACKGROUND } from '../../../common/theme.js';
-import { append, $, addDisposableListener, asCssValueWithDefault, createCSSRule, asCSSUrl, after, focusWindow, trackFocus, EventType, Dimension, reset } from '../../../../base/browser/dom.js';
+import { append, $, addDisposableListener, asCssValueWithDefault, createCSSRule, asCSSUrl, after, trackFocus, EventType, Dimension, reset } from '../../../../base/browser/dom.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { Action } from '../../../../base/common/actions.js';
 import { prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
@@ -39,6 +49,8 @@ import { FilterWidget } from './viewFilter.js';
 import { BaseActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { defaultProgressBarStyles, defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 var ViewPane_1;
 var ViewPaneShowActions;
 ( (function(ViewPaneShowActions) {
@@ -237,6 +249,9 @@ let ViewPane = class ViewPane extends Pane {
     get titleDescription() {
         return this._titleDescription;
     }
+    get singleViewPaneContainerTitle() {
+        return this._singleViewPaneContainerTitle;
+    }
     constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService) {
         super({ ...options, ...{ orientation: viewDescriptorService.getViewLocationById(options.id) === 1  ? 1  : 0  } });
         this.keybindingService = keybindingService;
@@ -262,6 +277,7 @@ let ViewPane = class ViewPane extends Pane {
         this.id = options.id;
         this._title = options.title;
         this._titleDescription = options.titleDescription;
+        this._singleViewPaneContainerTitle = options.singleViewPaneContainerTitle;
         this.showActions = options.showActions ?? ViewPaneShowActions.Default;
         this.scopedContextKeyService = this._register(contextKeyService.createScoped(this.element));
         this.scopedContextKeyService.createKey('view', this.id);
@@ -393,21 +409,22 @@ let ViewPane = class ViewPane extends Pane {
             this.iconContainer.classList.add(...cssClass.split(' '));
         }
         const calculatedTitle = this.calculateTitle(title);
-        this.titleContainer = append(container, $('h3.title', { title: calculatedTitle }, calculatedTitle));
+        this.titleContainer = append(container, $('h3.title', {}, calculatedTitle));
+        this.titleContainerHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.titleContainer, calculatedTitle));
         if (this._titleDescription) {
             this.setTitleDescription(this._titleDescription);
         }
-        this.iconContainer.title = calculatedTitle;
+        this.iconContainerHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.iconContainer, calculatedTitle));
         this.iconContainer.setAttribute('aria-label', calculatedTitle);
     }
     updateTitle(title) {
         const calculatedTitle = this.calculateTitle(title);
         if (this.titleContainer) {
             this.titleContainer.textContent = calculatedTitle;
-            this.titleContainer.setAttribute('title', calculatedTitle);
+            this.titleContainerHover?.update(calculatedTitle);
         }
         if (this.iconContainer) {
-            this.iconContainer.title = calculatedTitle;
+            this.iconContainerHover?.update(calculatedTitle);
             this.iconContainer.setAttribute('aria-label', calculatedTitle);
         }
         this._title = title;
@@ -416,10 +433,11 @@ let ViewPane = class ViewPane extends Pane {
     setTitleDescription(description) {
         if (this.titleDescriptionContainer) {
             this.titleDescriptionContainer.textContent = description ?? '';
-            this.titleDescriptionContainer.setAttribute('title', description ?? '');
+            this.titleDescriptionContainerHover?.update(description ?? '');
         }
         else if (description && this.titleContainer) {
-            this.titleDescriptionContainer = after(this.titleContainer, $('span.description', { title: description }, description));
+            this.titleDescriptionContainer = after(this.titleContainer, $('span.description', {}, description));
+            this.titleDescriptionContainerHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.titleDescriptionContainer, description));
         }
     }
     updateTitleDescription(description) {
@@ -459,7 +477,7 @@ let ViewPane = class ViewPane extends Pane {
         }
         if (this.progressIndicator === undefined) {
             const that = this;
-            this.progressIndicator = ( new ScopedProgressIndicator(
+            this.progressIndicator = this._register(( new ScopedProgressIndicator(
                 assertIsDefined(this.progressBar),
                 new (class extends AbstractProgressScope {
                     constructor() {
@@ -467,7 +485,7 @@ let ViewPane = class ViewPane extends Pane {
                         this._register(that.onDidChangeBodyVisibility(isVisible => isVisible ? this.onScopeOpened(that.id) : this.onScopeClosed(that.id)));
                     }
                 })()
-            ));
+            )));
         }
         return this.progressIndicator;
     }
@@ -485,7 +503,6 @@ let ViewPane = class ViewPane extends Pane {
         return SIDE_BAR_BACKGROUND;
     }
     focus() {
-        focusWindow(this.element);
         if (this.viewWelcomeController.enabled) {
             this.viewWelcomeController.focus();
         }

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js

@@ -13,12 +13,22 @@ import { localizeWithPath } from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuRegistry, MenuId, registerAction2, IMenuService, Action2 } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { activeContrastBorder, asCssVariable } from '../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
+import { activeContrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { Themable, IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { CompositeMenuActions } from '../../actions.js';
@@ -35,13 +45,6 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     submenu: ViewsSubMenu,
     title: ( localizeWithPath('vs/workbench/browser/parts/views/viewPaneContainer', 'views', "Views")),
     order: 1,
-    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(
-        'viewContainerLocation',
-        ViewContainerLocationToString(0 )
-    )), ( ContextKeyExpr.notEquals(
-        `config.${"workbench.activityBar.location" }`,
-        "top"
-    )))),
 });
 class ViewPaneDropOverlay extends Themable {
     static { this.OVERLAY_ID = 'monaco-pane-drop-overlay'; }
@@ -409,9 +412,13 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
     getTitle() {
         const containerTitle = this.viewContainerModel.title;
         if (this.isViewMergedWithContainer()) {
+            const singleViewPaneContainerTitle = this.paneItems[0].pane.singleViewPaneContainerTitle;
+            if (singleViewPaneContainerTitle) {
+                return singleViewPaneContainerTitle;
+            }
             const paneItemTitle = this.paneItems[0].pane.title;
             if (containerTitle === paneItemTitle) {
-                return this.paneItems[0].pane.title;
+                return paneItemTitle;
             }
             return paneItemTitle ? `${containerTitle}: ${paneItemTitle}` : containerTitle;
         }
@@ -593,7 +600,8 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
                 id: viewDescriptor.id,
                 title: viewDescriptor.name.value,
                 fromExtensionId: viewDescriptor.extensionId,
-                expanded: !collapsed
+                expanded: !collapsed,
+                singleViewPaneContainerTitle: viewDescriptor.singleViewPaneContainerTitle,
             });
             pane.render();
             const contextMenuDisposable = addDisposableListener(pane.draggableElement, 'contextmenu', e => {
@@ -862,10 +870,6 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
         }
     }
     isViewMergedWithContainer() {
-        const location = this.viewDescriptorService.getViewContainerLocation(this.viewContainer);
-        if (location === 0  && !this.layoutService.isVisible("workbench.parts.activitybar" ) && this.configurationService.getValue("workbench.activityBar.location" ) === "top" ) {
-            return false;
-        }
         if (!(this.options.mergeViewWithContainerWhenSingleView && this.paneItems.length === 1)) {
             return false;
         }

package/vscode/src/vs/workbench/browser/quickaccess.js

@@ -1,8 +1,12 @@
+import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../nls.js';
 import { ContextKeyExpr, RawContextKey } from '../../platform/contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../platform/keybinding/common/keybinding.js';
 import { IQuickInputService } from '../../platform/quickinput/common/quickInput.js';
+import { Disposable } from '../../base/common/lifecycle.js';
 import { getIEditor } from '../../editor/browser/editorBrowser.js';
+import { IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../services/editor/common/editorService.js';
 const inQuickPickContextKeyValue = 'inQuickOpen';
 const InQuickPickContextKey = ( new RawContextKey(inQuickPickContextKeyValue, false, ( localizeWithPath(
     'vs/workbench/browser/quickaccess',
@@ -21,10 +25,13 @@ function getQuickNavigateHandler(id, next) {
         quickInputService.navigate(!!next, quickNavigate);
     };
 }
-class EditorViewState {
-    constructor(editorService) {
+let PickerEditorState = class PickerEditorState extends Disposable {
+    constructor(editorService, editorGroupsService) {
+        super();
         this.editorService = editorService;
+        this.editorGroupsService = editorGroupsService;
         this._editorViewState = undefined;
+        this.openedTransientEditors = ( new Set());
     }
     set() {
         if (this._editorViewState) {
@@ -39,24 +46,44 @@ class EditorViewState {
             };
         }
     }
-    async restore(shouldCloseCurrEditor = false) {
+    async openTransientEditor(editor, group) {
+        editor.options = { ...editor.options, transient: true };
+        const editorPane = await this.editorService.openEditor(editor, group);
+        if (editorPane?.input && editorPane.input !== this._editorViewState?.editor && editorPane.group.isTransient(editorPane.input)) {
+            this.openedTransientEditors.add(editorPane.input);
+        }
+        return editorPane;
+    }
+    async restore() {
         if (this._editorViewState) {
-            const options = {
-                viewState: this._editorViewState.state,
-                preserveFocus: true
-            };
-            if (shouldCloseCurrEditor) {
-                const activeEditorPane = this.editorService.activeEditorPane;
-                const currEditor = activeEditorPane?.input;
-                if (currEditor && currEditor !== this._editorViewState.editor && activeEditorPane?.group.isPinned(currEditor) !== true) {
-                    await activeEditorPane.group.closeEditor(currEditor);
+            for (const editor of this.openedTransientEditors) {
+                if (editor.isDirty()) {
+                    continue;
+                }
+                for (const group of this.editorGroupsService.groups) {
+                    if (group.isTransient(editor)) {
+                        await group.closeEditor(editor, { preserveFocus: true });
+                    }
                 }
             }
-            await this._editorViewState.group.openEditor(this._editorViewState.editor, options);
+            await this._editorViewState.group.openEditor(this._editorViewState.editor, {
+                viewState: this._editorViewState.state,
+                preserveFocus: true
+            });
+            this.reset();
         }
     }
     reset() {
         this._editorViewState = undefined;
+        this.openedTransientEditors.clear();
     }
-}
-export { EditorViewState, InQuickPickContextKey, defaultQuickAccessContext, defaultQuickAccessContextKeyValue, getQuickNavigateHandler, inQuickPickContext, inQuickPickContextKeyValue };
+    dispose() {
+        super.dispose();
+        this.reset();
+    }
+};
+PickerEditorState = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, IEditorGroupsService))
+], PickerEditorState));
+export { InQuickPickContextKey, PickerEditorState, defaultQuickAccessContext, defaultQuickAccessContextKeyValue, getQuickNavigateHandler, inQuickPickContext, inQuickPickContextKeyValue };

package/vscode/src/vs/workbench/browser/style.js

@@ -1,4 +1,53 @@
 import './media/style.css.js';
-import { isWindows, isMacintosh } from '../../base/common/platform.js';
-const DEFAULT_FONT_FAMILY = isWindows ? '"Segoe WPC", "Segoe UI", sans-serif' : isMacintosh ? '-apple-system, BlinkMacSystemFont, sans-serif' : 'system-ui, "Ubuntu", "Droid Sans", sans-serif';
-export { DEFAULT_FONT_FAMILY };
+import { registerThemingParticipant } from '../../platform/theme/common/themeService.js';
+import { TITLE_BAR_ACTIVE_BACKGROUND, WORKBENCH_BACKGROUND } from '../common/theme.js';
+import { isWeb, isIOS } from '../../base/common/platform.js';
+import { createMetaElement } from '../../base/browser/dom.js';
+import { isSafari, isStandalone } from '../../base/browser/browser.js';
+import '../../platform/theme/common/colorUtils.js';
+import { selectionBackground } from '../../platform/theme/common/colors/baseColors.js';
+import '../../platform/theme/common/colors/chartsColors.js';
+import '../../platform/theme/common/colors/editorColors.js';
+import '../../platform/theme/common/colors/inputColors.js';
+import '../../platform/theme/common/colors/listColors.js';
+import '../../platform/theme/common/colors/menuColors.js';
+import '../../platform/theme/common/colors/minimapColors.js';
+import '../../platform/theme/common/colors/miscColors.js';
+import '../../platform/theme/common/colors/quickpickColors.js';
+import '../../platform/theme/common/colors/searchColors.js';
+import { mainWindow } from '../../base/browser/window.js';
+registerThemingParticipant((theme, collector) => {
+    const workbenchBackground = WORKBENCH_BACKGROUND(theme);
+    collector.addRule(`.monaco-workbench-part { background-color: ${workbenchBackground}; }`);
+    const windowSelectionBackground = theme.getColor(selectionBackground);
+    if (windowSelectionBackground) {
+        collector.addRule(`.monaco-workbench-part ::selection { background-color: ${windowSelectionBackground}; }`);
+    }
+    if (isWeb) {
+        const titleBackground = theme.getColor(TITLE_BAR_ACTIVE_BACKGROUND);
+        if (titleBackground) {
+            const metaElementId = 'monaco-workbench-meta-theme-color';
+            let metaElement = mainWindow.document.getElementById(metaElementId);
+            if (!metaElement) {
+                metaElement = createMetaElement();
+                metaElement.name = 'theme-color';
+                metaElement.id = metaElementId;
+            }
+            metaElement.content = ( titleBackground.toString());
+        }
+    }
+    if (isSafari) {
+        collector.addRule(`
+			.monaco-workbench-part.web {
+				touch-action: none;
+			}
+			.monaco-workbench-part .monaco-editor .view-lines {
+				user-select: text;
+				-webkit-user-select: text;
+			}
+		`);
+    }
+    if (isIOS && isStandalone()) {
+        collector.addRule(`.monaco-workbench-part { background-color: ${workbenchBackground}; }`);
+    }
+});

package/vscode/src/vs/workbench/browser/web.api.d.ts

@@ -18,6 +18,12 @@ interface IWorkbenchConstructionOptions {
      * from. It is for example being used for the websocket connections as address.
      */
     readonly remoteAuthority?: string;
+    /**
+     * The server base path is the path where the workbench is served from.
+     * The path must be absolute (start with a slash).
+     * Corresponds to option `server-base-path` on the server side.
+     */
+    readonly serverBasePath?: string;
     /**
      * The connection token to send to the server.
      */

package/vscode/src/vs/workbench/browser/window.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
 import { setFullscreen, isSafari } from '../../base/browser/browser.js';
-import { getWindowsCount, getWindows, getActiveWindow, getWindow, getWindowById, addDisposableListener, EventType, EventHelper, windowOpenWithSuccess, windowOpenPopup, windowOpenNoOpener } from '../../base/browser/dom.js';
+import { getWindowsCount, getWindows, getWindow, getActiveWindow, getWindowById, addDisposableListener, EventType, EventHelper, windowOpenWithSuccess, windowOpenPopup, windowOpenNoOpener } from '../../base/browser/dom.js';
 import { DomEmitter } from '../../base/browser/event.js';
 import { requestUsbDevice, requestSerialPort, requestHidDevice } from '../../base/browser/deviceAccess.js';
 import { timeout } from '../../base/common/async.js';
@@ -8,7 +8,7 @@ import { Event } from '../../base/common/event.js';
 import { Disposable, dispose, toDisposable } from '../../base/common/lifecycle.js';
 import { matchesScheme, Schemas } from '../../base/common/network.js';
 import { isMacintosh, isIOS } from '../../base/common/platform.js';
-import Severity from '../../base/common/severity.js';
+import Severity$1 from '../../base/common/severity.js';
 import { URI } from '../../base/common/uri.js';
 import { localizeWithPath } from '../../nls.js';
 import { CommandsRegistry } from '../../platform/commands/common/commands.js';
@@ -25,32 +25,39 @@ import { registerWindowDriver } from '../services/driver/browser/driver.js';
 import { isAuxiliaryWindow, mainWindow } from '../../base/browser/window.js';
 import { createSingleCallFunction } from '../../base/common/functional.js';
 import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { IWorkbenchEnvironmentService } from '../services/environment/common/environmentService.js';
 import { IDialogService } from '../../platform/dialogs/common/dialogs.js';
 var BaseWindow_1;
 let BaseWindow = class BaseWindow extends Disposable {
     static { BaseWindow_1 = this; }
     static { this.TIMEOUT_HANDLES = Number.MIN_SAFE_INTEGER; }
     static { this.TIMEOUT_DISPOSABLES = ( new Map()); }
-    constructor(targetWindow, dom = { getWindowsCount, getWindows }, hostService) {
+    constructor(targetWindow, dom = { getWindowsCount, getWindows }, hostService, environmentService) {
         super();
         this.hostService = hostService;
+        this.environmentService = environmentService;
         this.enableWindowFocusOnElementFocus(targetWindow);
         this.enableMultiWindowAwareTimeout(targetWindow, dom);
         this.registerFullScreenListeners(targetWindow.vscodeWindowId);
     }
     enableWindowFocusOnElementFocus(targetWindow) {
-        const originalFocus = HTMLElement.prototype.focus;
+        const originalFocus = targetWindow.HTMLElement.prototype.focus;
+        const that = this;
         targetWindow.HTMLElement.prototype.focus = function (options) {
-            const activeWindow = getActiveWindow();
-            if (activeWindow.document.hasFocus()) {
-                const elementWindow = getWindow(this);
-                if (activeWindow !== elementWindow) {
-                    elementWindow.focus();
-                }
-            }
+            that.onElementFocus(getWindow(this));
             originalFocus.apply(this, [options]);
         };
     }
+    onElementFocus(targetWindow) {
+        const activeWindow = getActiveWindow();
+        if (activeWindow !== targetWindow && activeWindow.document.hasFocus()) {
+            targetWindow.focus();
+            if (!this.environmentService.extensionTestsLocationURI &&
+                !targetWindow.document.hasFocus()) {
+                this.hostService.focus(targetWindow);
+            }
+        }
+    }
     enableMultiWindowAwareTimeout(targetWindow, dom = { getWindowsCount, getWindows }) {
         const originalSetTimeout = targetWindow.setTimeout;
         Object.defineProperty(targetWindow, 'vscodeOriginalSetTimeout', { get: () => originalSetTimeout });
@@ -149,17 +156,18 @@ let BaseWindow = class BaseWindow extends Disposable {
     }
 };
 BaseWindow = BaseWindow_1 = ( __decorate([
-    ( __param(2, IHostService))
+    ( __param(2, IHostService)),
+    ( __param(3, IWorkbenchEnvironmentService))
 ], BaseWindow));
 let BrowserWindow = class BrowserWindow extends BaseWindow {
-    constructor(openerService, lifecycleService, dialogService, labelService, productService, environmentService, layoutService, instantiationService, hostService) {
-        super(mainWindow, undefined, hostService);
+    constructor(openerService, lifecycleService, dialogService, labelService, productService, browserEnvironmentService, layoutService, instantiationService, hostService) {
+        super(mainWindow, undefined, hostService, browserEnvironmentService);
         this.openerService = openerService;
         this.lifecycleService = lifecycleService;
         this.dialogService = dialogService;
         this.labelService = labelService;
         this.productService = productService;
-        this.environmentService = environmentService;
+        this.browserEnvironmentService = browserEnvironmentService;
         this.layoutService = layoutService;
         this.instantiationService = instantiationService;
         this.registerListeners();
@@ -182,7 +190,7 @@ let BrowserWindow = class BrowserWindow extends BaseWindow {
         Event.toPromise(Event.any(Event.once(( new DomEmitter(mainWindow.document.body, EventType.KEY_DOWN, true)).event), Event.once(( new DomEmitter(mainWindow.document.body, EventType.MOUSE_DOWN, true)).event))).then(async () => {
             await timeout(3000);
             await this.dialogService.prompt({
-                type: Severity.Error,
+                type: Severity$1.Error,
                 message: ( localizeWithPath(
                     'vs/workbench/browser/window',
                     'shutdownError',
@@ -221,8 +229,8 @@ let BrowserWindow = class BrowserWindow extends BaseWindow {
         this.openerService.setDefaultExternalOpener({
             openExternal: async (href) => {
                 let isAllowedOpener = false;
-                if (this.environmentService.options?.openerAllowedExternalUrlPrefixes) {
-                    for (const trustedPopupPrefix of this.environmentService.options.openerAllowedExternalUrlPrefixes) {
+                if (this.browserEnvironmentService.options?.openerAllowedExternalUrlPrefixes) {
+                    for (const trustedPopupPrefix of this.browserEnvironmentService.options.openerAllowedExternalUrlPrefixes) {
                         if (href.startsWith(trustedPopupPrefix)) {
                             isAllowedOpener = true;
                             break;
@@ -234,7 +242,7 @@ let BrowserWindow = class BrowserWindow extends BaseWindow {
                         const opened = windowOpenWithSuccess(href, !isAllowedOpener);
                         if (!opened) {
                             await this.dialogService.prompt({
-                                type: Severity.Warning,
+                                type: Severity$1.Warning,
                                 message: ( localizeWithPath(
                                     'vs/workbench/browser/window',
                                     'unableToOpenExternal',
@@ -317,7 +325,7 @@ let BrowserWindow = class BrowserWindow extends BaseWindow {
                             ));
                         }
                         await this.hostService.withExpectedShutdown(() => this.dialogService.prompt({
-                            type: Severity.Info,
+                            type: Severity$1.Info,
                             message: ( localizeWithPath(
                                 'vs/workbench/browser/window',
                                 'openExternalDialogTitle',