@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.1

package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js

@@ -34,6 +34,7 @@ import { OpenRecentAction } from '../../actions/windowActions.js';
 import { isICommandActionToggleInfo } from 'monaco-editor/esm/vs/platform/action/common/action.js';
 import { createAndFillInContextMenuActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
 import { defaultMenuStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     submenu: MenuId.MenubarFileMenu,
     title: {
@@ -674,7 +675,7 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
     }
     registerListeners() {
         super.registerListeners();
-        this._register(addDisposableListener(window, EventType.RESIZE, () => {
+        this._register(addDisposableListener(mainWindow, EventType.RESIZE, () => {
             if (this.menubar && !(isIOS && BrowserFeatures.pointerEvents)) {
                 this.menubar.blur();
             }

package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.d.ts

@@ -0,0 +1,25 @@
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IView } from '../../../../base/browser/ui/grid/grid.js';
+
+interface ITitleProperties {
+    isPure?: boolean;
+    isAdmin?: boolean;
+    prefix?: string;
+}
+interface ITitlebarPart extends IDisposable {
+    /**
+     * An event when the menubar visibility changes.
+     */
+    readonly onMenubarVisibilityChange: Event<boolean>;
+    /**
+     * Update some environmental title properties.
+     */
+    updateProperties(properties: ITitleProperties): void;
+}
+interface IAuxiliaryTitlebarPart extends ITitlebarPart, IView {
+    readonly container: HTMLElement;
+    readonly height: number;
+}
+
+export type { IAuxiliaryTitlebarPart, ITitleProperties, ITitlebarPart };

package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js

@@ -0,0 +1,258 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { dirname, basename } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { isWindows, isMacintosh, isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { trim } from 'monaco-editor/esm/vs/base/common/strings.js';
+import { template } from 'monaco-editor/esm/vs/base/common/labels.js';
+import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
+import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
+import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { getVirtualWorkspaceLocation } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { IViewsService } from '../../../common/views.js';
+import { isCodeEditor, isDiffEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
+var WindowTitle_1;
+let WindowTitle = class WindowTitle extends Disposable {
+    static { WindowTitle_1 = this; }
+    static { this.NLS_USER_IS_ADMIN = isWindows ? ( localizeWithPath(
+        'vs/workbench/browser/parts/titlebar/windowTitle',
+        'userIsAdmin',
+        "[Administrator]"
+    )) : ( localizeWithPath(
+        'vs/workbench/browser/parts/titlebar/windowTitle',
+        'userIsSudo',
+        "[Superuser]"
+    )); }
+    static { this.NLS_EXTENSION_HOST = ( localizeWithPath(
+        'vs/workbench/browser/parts/titlebar/windowTitle',
+        'devExtensionWindowTitlePrefix',
+        "[Extension Development Host]"
+    )); }
+    static { this.TITLE_DIRTY = '\u25cf '; }
+    get value() { return this.title ?? ''; }
+    get workspaceName() { return this.labelService.getWorkspaceLabel(this.contextService.getWorkspace()); }
+    get fileName() {
+        const activeEditor = this.editorService.activeEditor;
+        if (!activeEditor) {
+            return undefined;
+        }
+        const fileName = activeEditor.getTitle(0 );
+        const dirty = activeEditor?.isDirty() && !activeEditor.isSaving() ? WindowTitle_1.TITLE_DIRTY : '';
+        return `${dirty}${fileName}`;
+    }
+    constructor(targetWindow, editorGroupsContainer, configurationService, editorService, environmentService, contextService, labelService, userDataProfileService, productService, viewsService) {
+        super();
+        this.targetWindow = targetWindow;
+        this.configurationService = configurationService;
+        this.environmentService = environmentService;
+        this.contextService = contextService;
+        this.labelService = labelService;
+        this.userDataProfileService = userDataProfileService;
+        this.productService = productService;
+        this.viewsService = viewsService;
+        this.properties = { isPure: true, isAdmin: false, prefix: undefined };
+        this.activeEditorListeners = this._register(( new DisposableStore()));
+        this.titleUpdater = this._register(( new RunOnceScheduler(() => this.doUpdateTitle(), 0)));
+        this.onDidChangeEmitter = ( new Emitter());
+        this.onDidChange = this.onDidChangeEmitter.event;
+        this.titleIncludesFocusedView = false;
+        this.editorService = editorService.createScoped(editorGroupsContainer, this._store);
+        this.updateTitleIncludesFocusedView();
+        this.registerListeners();
+    }
+    registerListeners() {
+        this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChanged(e)));
+        this._register(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChange()));
+        this._register(this.contextService.onDidChangeWorkspaceFolders(() => this.titleUpdater.schedule()));
+        this._register(this.contextService.onDidChangeWorkbenchState(() => this.titleUpdater.schedule()));
+        this._register(this.contextService.onDidChangeWorkspaceName(() => this.titleUpdater.schedule()));
+        this._register(this.labelService.onDidChangeFormatters(() => this.titleUpdater.schedule()));
+        this._register(this.userDataProfileService.onDidChangeCurrentProfile(() => this.titleUpdater.schedule()));
+        this._register(this.viewsService.onDidChangeFocusedView(() => {
+            if (this.titleIncludesFocusedView) {
+                this.titleUpdater.schedule();
+            }
+        }));
+    }
+    onConfigurationChanged(event) {
+        if (event.affectsConfiguration("window.title" )) {
+            this.updateTitleIncludesFocusedView();
+        }
+        if (event.affectsConfiguration("window.title" ) || event.affectsConfiguration("window.titleSeparator" )) {
+            this.titleUpdater.schedule();
+        }
+    }
+    updateTitleIncludesFocusedView() {
+        const titleTemplate = this.configurationService.getValue("window.title" );
+        this.titleIncludesFocusedView = typeof titleTemplate === 'string' && titleTemplate.includes('${focusedView}');
+    }
+    onActiveEditorChange() {
+        this.activeEditorListeners.clear();
+        this.titleUpdater.schedule();
+        const activeEditor = this.editorService.activeEditor;
+        if (activeEditor) {
+            this.activeEditorListeners.add(activeEditor.onDidChangeDirty(() => this.titleUpdater.schedule()));
+            this.activeEditorListeners.add(activeEditor.onDidChangeLabel(() => this.titleUpdater.schedule()));
+        }
+        if (this.titleIncludesFocusedView) {
+            const activeTextEditorControl = this.editorService.activeTextEditorControl;
+            const textEditorControls = [];
+            if (isCodeEditor(activeTextEditorControl)) {
+                textEditorControls.push(activeTextEditorControl);
+            }
+            else if (isDiffEditor(activeTextEditorControl)) {
+                textEditorControls.push(activeTextEditorControl.getOriginalEditor(), activeTextEditorControl.getModifiedEditor());
+            }
+            for (const textEditorControl of textEditorControls) {
+                this.activeEditorListeners.add(textEditorControl.onDidBlurEditorText(() => this.titleUpdater.schedule()));
+                this.activeEditorListeners.add(textEditorControl.onDidFocusEditorText(() => this.titleUpdater.schedule()));
+            }
+        }
+    }
+    doUpdateTitle() {
+        const title = this.getFullWindowTitle();
+        if (title !== this.title) {
+            let nativeTitle = title;
+            if (!trim(nativeTitle)) {
+                nativeTitle = this.productService.nameLong;
+            }
+            if (!this.targetWindow.document.title && isMacintosh && nativeTitle === this.productService.nameLong) {
+                this.targetWindow.document.title = `${this.productService.nameLong} ${WindowTitle_1.TITLE_DIRTY}`;
+            }
+            this.targetWindow.document.title = nativeTitle;
+            this.title = title;
+            this.onDidChangeEmitter.fire();
+        }
+    }
+    getFullWindowTitle() {
+        const { prefix, suffix } = this.getTitleDecorations();
+        let title = this.getWindowTitle() || this.productService.nameLong;
+        if (prefix) {
+            title = `${prefix} ${title}`;
+        }
+        if (suffix) {
+            title = `${title} ${suffix}`;
+        }
+        return title.replace(/[^\S ]/g, ' ');
+    }
+    getTitleDecorations() {
+        let prefix;
+        let suffix;
+        if (this.properties.prefix) {
+            prefix = this.properties.prefix;
+        }
+        if (this.environmentService.isExtensionDevelopment) {
+            prefix = !prefix
+                ? WindowTitle_1.NLS_EXTENSION_HOST
+                : `${WindowTitle_1.NLS_EXTENSION_HOST} - ${prefix}`;
+        }
+        if (this.properties.isAdmin) {
+            suffix = WindowTitle_1.NLS_USER_IS_ADMIN;
+        }
+        return { prefix, suffix };
+    }
+    updateProperties(properties) {
+        const isAdmin = typeof properties.isAdmin === 'boolean' ? properties.isAdmin : this.properties.isAdmin;
+        const isPure = typeof properties.isPure === 'boolean' ? properties.isPure : this.properties.isPure;
+        const prefix = typeof properties.prefix === 'string' ? properties.prefix : this.properties.prefix;
+        if (isAdmin !== this.properties.isAdmin || isPure !== this.properties.isPure || prefix !== this.properties.prefix) {
+            this.properties.isAdmin = isAdmin;
+            this.properties.isPure = isPure;
+            this.properties.prefix = prefix;
+            this.titleUpdater.schedule();
+        }
+    }
+    getWindowTitle() {
+        const editor = this.editorService.activeEditor;
+        const workspace = this.contextService.getWorkspace();
+        let root;
+        if (workspace.configuration) {
+            root = workspace.configuration;
+        }
+        else if (workspace.folders.length) {
+            root = workspace.folders[0].uri;
+        }
+        const editorResource = EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY });
+        let editorFolderResource = editorResource ? dirname(editorResource) : undefined;
+        if (editorFolderResource?.path === '.') {
+            editorFolderResource = undefined;
+        }
+        let folder = undefined;
+        if (this.contextService.getWorkbenchState() === 2 ) {
+            folder = workspace.folders[0];
+        }
+        else if (editorResource) {
+            folder = this.contextService.getWorkspaceFolder(editorResource) ?? undefined;
+        }
+        let remoteName = undefined;
+        if (this.environmentService.remoteAuthority && !isWeb) {
+            remoteName = this.labelService.getHostLabel(Schemas.vscodeRemote, this.environmentService.remoteAuthority);
+        }
+        else {
+            const virtualWorkspaceLocation = getVirtualWorkspaceLocation(workspace);
+            if (virtualWorkspaceLocation) {
+                remoteName = this.labelService.getHostLabel(virtualWorkspaceLocation.scheme, virtualWorkspaceLocation.authority);
+            }
+        }
+        const activeEditorShort = editor ? editor.getTitle(0 ) : '';
+        const activeEditorMedium = editor ? editor.getTitle(1 ) : activeEditorShort;
+        const activeEditorLong = editor ? editor.getTitle(2 ) : activeEditorMedium;
+        const activeFolderShort = editorFolderResource ? basename(editorFolderResource) : '';
+        const activeFolderMedium = editorFolderResource ? this.labelService.getUriLabel(editorFolderResource, { relative: true }) : '';
+        const activeFolderLong = editorFolderResource ? this.labelService.getUriLabel(editorFolderResource) : '';
+        const rootName = this.labelService.getWorkspaceLabel(workspace);
+        const rootNameShort = this.labelService.getWorkspaceLabel(workspace, { verbose: 0  });
+        const rootPath = root ? this.labelService.getUriLabel(root) : '';
+        const folderName = folder ? folder.name : '';
+        const folderPath = folder ? this.labelService.getUriLabel(folder.uri) : '';
+        const dirty = editor?.isDirty() && !editor.isSaving() ? WindowTitle_1.TITLE_DIRTY : '';
+        const appName = this.productService.nameLong;
+        const profileName = this.userDataProfileService.currentProfile.isDefault ? '' : this.userDataProfileService.currentProfile.name;
+        const separator = this.configurationService.getValue("window.titleSeparator" );
+        const titleTemplate = this.configurationService.getValue("window.title" );
+        const focusedView = this.viewsService.getFocusedViewName();
+        return template(titleTemplate, {
+            activeEditorShort,
+            activeEditorLong,
+            activeEditorMedium,
+            activeFolderShort,
+            activeFolderMedium,
+            activeFolderLong,
+            rootName,
+            rootPath,
+            rootNameShort,
+            folderName,
+            folderPath,
+            dirty,
+            appName,
+            remoteName,
+            profileName,
+            focusedView,
+            separator: { label: separator }
+        });
+    }
+    isCustomTitleFormat() {
+        const title = this.configurationService.inspect("window.title" );
+        const titleSeparator = this.configurationService.inspect("window.titleSeparator" );
+        return title.value !== title.defaultValue || titleSeparator.value !== titleSeparator.defaultValue;
+    }
+};
+WindowTitle = WindowTitle_1 = ( __decorate([
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IEditorService)),
+    ( __param(4, IBrowserWorkbenchEnvironmentService)),
+    ( __param(5, IWorkspaceContextService)),
+    ( __param(6, ILabelService)),
+    ( __param(7, IUserDataProfileService)),
+    ( __param(8, IProductService)),
+    ( __param(9, IViewsService))
+], WindowTitle));
+export { WindowTitle };

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-pane-view .split-view-view:first-of-type>.pane>.pane-header{border-top:none!important}.monaco-pane-view .split-view-view:first-of-type>.pane{border-left:none!important}.monaco-pane-view .pane>.pane-header{position:relative}.monaco-pane-view .pane.expanded>.pane-header>.actions.show-expanded,.monaco-pane-view .pane>.pane-header>.actions.show-always{display:initial}.monaco-pane-view .pane>.pane-header>.icon{display:none;height:16px;width:16px}.monaco-pane-view .pane.pane.horizontal:not(.expanded)>.pane-header>.icon{display:inline;margin-top:4px}.monaco-pane-view .pane>.pane-header h3.title{-webkit-margin-before:0;-webkit-margin-after:0;font-size:11px;min-width:3ch;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-pane-view .pane>.pane-header .description{display:block;flex-shrink:100000;font-weight:400;margin-left:10px;opacity:.6;overflow:hidden;text-overflow:ellipsis;text-transform:none;white-space:nowrap}.monaco-pane-view .pane>.pane-header .description .codicon{font-size:9px;margin-left:2px}.monaco-pane-view .pane.horizontal:not(.expanded)>.pane-header .description,.monaco-pane-view .pane.horizontal:not(.expanded)>.pane-header h3.title,.monaco-pane-view .pane>.pane-header:not(.expanded) .description{display:none}.monaco-pane-view .pane .monaco-progress-container{height:2px;left:0;position:absolute;top:-2px;z-index:5}.monaco-pane-view .pane:not(.merged-header) .monaco-progress-container{top:20px}";
+var css = ".monaco-pane-view .split-view-view:first-of-type>.pane>.pane-header{border-top:none!important}.monaco-pane-view .split-view-view:first-of-type>.pane{border-left:none!important}.monaco-pane-view .pane>.pane-header{position:relative}.monaco-pane-view .pane>.pane-header.not-collapsible .twisty-container{display:none}.monaco-pane-view .pane>.pane-header.not-collapsible .title{margin-left:8px}.monaco-pane-view .pane.expanded>.pane-header>.actions.show-expanded,.monaco-pane-view .pane>.pane-header>.actions.show-always{display:initial}.monaco-pane-view .pane>.pane-header>.icon{display:none;height:16px;width:16px}.monaco-pane-view .pane.pane.horizontal:not(.expanded)>.pane-header>.icon{display:inline;margin-top:4px}.monaco-pane-view .pane>.pane-header h3.title{-webkit-margin-before:0;-webkit-margin-after:0;font-size:11px;min-width:3ch;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-pane-view .pane>.pane-header .description{display:block;flex-shrink:100000;font-weight:400;margin-left:10px;opacity:.6;overflow:hidden;text-overflow:ellipsis;text-transform:none;white-space:nowrap}.monaco-pane-view .pane>.pane-header .description .codicon{font-size:9px;margin-left:2px}.monaco-pane-view .pane.horizontal:not(.expanded)>.pane-header .description,.monaco-pane-view .pane.horizontal:not(.expanded)>.pane-header h3.title,.monaco-pane-view .pane>.pane-header:not(.expanded) .description{display:none}.monaco-pane-view .pane .monaco-progress-container{left:0;position:absolute;top:-2px;z-index:5}.monaco-pane-view .pane:not(.merged-header) .monaco-progress-container{top:20px}";
 n(css,{});
 export { css, css as default };

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

@@ -69,9 +69,6 @@ declare abstract class ViewPane extends Pane implements IView {
     private titleDescriptionContainer?;
     private iconContainer?;
     protected twistiesContainer?: HTMLElement;
-    private bodyContainer;
-    private viewWelcomeContainer;
-    private viewWelcomeDisposable;
     private viewWelcomeController;
     protected readonly scopedContextKeyService: IContextKeyService;
     constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, telemetryService: ITelemetryService);
@@ -83,6 +80,8 @@ declare abstract class ViewPane extends Pane implements IView {
     setExpanded(expanded: boolean): boolean;
     render(): void;
     protected renderHeader(container: HTMLElement): void;
+    protected updateHeader(): void;
+    private updateTwistyIcon;
     protected getTwistyIcon(expanded: boolean): ThemeIcon;
     style(styles: IPaneStyles): void;
     private getIcon;
@@ -91,7 +90,6 @@ declare abstract class ViewPane extends Pane implements IView {
     private setTitleDescription;
     protected updateTitleDescription(description?: string | undefined): void;
     private calculateTitle;
-    private scrollableElement;
     protected renderBody(container: HTMLElement): void;
     protected layoutBody(height: number, width: number): void;
     onDidScrollRoot(): void;
@@ -107,7 +105,6 @@ declare abstract class ViewPane extends Pane implements IView {
     getActionRunner(): IActionRunner | undefined;
     getOptimalWidth(): number;
     saveState(): void;
-    private updateViewWelcome;
     shouldShowWelcome(): boolean;
     getFilterWidget(): FilterWidget | undefined;
     shouldShowFilterInHeader(): boolean;