@codingame/monaco-vscode-api 3.2.3 → 4.1.0

package/vscode/src/vs/workbench/browser/parts/banner/bannerPart.js

@@ -0,0 +1,233 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import './media/bannerpart.css.js';
+import { localize2WithPath } from '../../../../nls.js';
+import { addDisposableListener, EventType, clearNode, $, append, asCSSUrl } from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Part } from '../../part.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { Action } from '../../../../base/common/actions.js';
+import { Link } from '../../../../platform/opener/browser/link.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IBannerService } from '../../../services/banner/browser/bannerService.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { URI } from '../../../../base/common/uri.js';
+import { widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
+import { BannerFocused } from '../../../common/contextkeys.js';
+let BannerPart = class BannerPart extends Part {
+    get minimumHeight() {
+        return this.visible ? this.height : 0;
+    }
+    get maximumHeight() {
+        return this.visible ? this.height : 0;
+    }
+    get onDidChange() { return this._onDidChangeSize.event; }
+    constructor(themeService, layoutService, storageService, contextKeyService, instantiationService) {
+        super("workbench.parts.banner" , { hasTitle: false }, themeService, storageService, layoutService);
+        this.contextKeyService = contextKeyService;
+        this.instantiationService = instantiationService;
+        this.height = 26;
+        this.minimumWidth = 0;
+        this.maximumWidth = Number.POSITIVE_INFINITY;
+        this._onDidChangeSize = this._register(( new Emitter()));
+        this.visible = false;
+        this.focusedActionIndex = -1;
+        this.markdownRenderer = this.instantiationService.createInstance(MarkdownRenderer, {});
+    }
+    createContentArea(parent) {
+        this.element = parent;
+        this.element.tabIndex = 0;
+        this._register(addDisposableListener(this.element, EventType.FOCUS, () => {
+            if (this.focusedActionIndex !== -1) {
+                this.focusActionLink();
+            }
+        }));
+        const scopedContextKeyService = this._register(this.contextKeyService.createScoped(this.element));
+        BannerFocused.bindTo(scopedContextKeyService).set(true);
+        return this.element;
+    }
+    close(item) {
+        this.setVisibility(false);
+        clearNode(this.element);
+        if (typeof item.onClose === 'function') {
+            item.onClose();
+        }
+        this.item = undefined;
+    }
+    focusActionLink() {
+        const length = this.item?.actions?.length ?? 0;
+        if (this.focusedActionIndex < length) {
+            const actionLink = this.messageActionsContainer?.children[this.focusedActionIndex];
+            if (actionLink instanceof HTMLElement) {
+                this.actionBar?.setFocusable(false);
+                actionLink.focus();
+            }
+        }
+        else {
+            this.actionBar?.focus(0);
+        }
+    }
+    getAriaLabel(item) {
+        if (item.ariaLabel) {
+            return item.ariaLabel;
+        }
+        if (typeof item.message === 'string') {
+            return item.message;
+        }
+        return undefined;
+    }
+    getBannerMessage(message) {
+        if (typeof message === 'string') {
+            const element = $('span');
+            element.innerText = message;
+            return element;
+        }
+        return this.markdownRenderer.render(message).element;
+    }
+    setVisibility(visible) {
+        if (visible !== this.visible) {
+            this.visible = visible;
+            this.focusedActionIndex = -1;
+            this.layoutService.setPartHidden(!visible, "workbench.parts.banner" );
+            this._onDidChangeSize.fire(undefined);
+        }
+    }
+    focus() {
+        this.focusedActionIndex = -1;
+        this.element.focus();
+    }
+    focusNextAction() {
+        const length = this.item?.actions?.length ?? 0;
+        this.focusedActionIndex = this.focusedActionIndex < length ? this.focusedActionIndex + 1 : 0;
+        this.focusActionLink();
+    }
+    focusPreviousAction() {
+        const length = this.item?.actions?.length ?? 0;
+        this.focusedActionIndex = this.focusedActionIndex > 0 ? this.focusedActionIndex - 1 : length;
+        this.focusActionLink();
+    }
+    hide(id) {
+        if (this.item?.id !== id) {
+            return;
+        }
+        this.setVisibility(false);
+    }
+    show(item) {
+        if (item.id === this.item?.id) {
+            this.setVisibility(true);
+            return;
+        }
+        clearNode(this.element);
+        const ariaLabel = this.getAriaLabel(item);
+        if (ariaLabel) {
+            this.element.setAttribute('aria-label', ariaLabel);
+        }
+        const iconContainer = append(this.element, $('div.icon-container'));
+        iconContainer.setAttribute('aria-hidden', 'true');
+        if (ThemeIcon.isThemeIcon(item.icon)) {
+            iconContainer.appendChild($(`div${ThemeIcon.asCSSSelector(item.icon)}`));
+        }
+        else {
+            iconContainer.classList.add('custom-icon');
+            if (URI.isUri(item.icon)) {
+                iconContainer.style.backgroundImage = asCSSUrl(item.icon);
+            }
+        }
+        const messageContainer = append(this.element, $('div.message-container'));
+        messageContainer.setAttribute('aria-hidden', 'true');
+        messageContainer.appendChild(this.getBannerMessage(item.message));
+        this.messageActionsContainer = append(this.element, $('div.message-actions-container'));
+        if (item.actions) {
+            for (const action of item.actions) {
+                this._register(this.instantiationService.createInstance(Link, this.messageActionsContainer, { ...action, tabIndex: -1 }, {}));
+            }
+        }
+        const actionBarContainer = append(this.element, $('div.action-container'));
+        this.actionBar = this._register(( new ActionBar(actionBarContainer)));
+        const label = item.closeLabel ?? 'Close Banner';
+        const closeAction = this._register(( new Action(
+            'banner.close',
+            label,
+            ThemeIcon.asClassName(widgetClose),
+            true,
+            () => this.close(item)
+        )));
+        this.actionBar.push(closeAction, { icon: true, label: false });
+        this.actionBar.setFocusable(false);
+        this.setVisibility(true);
+        this.item = item;
+    }
+    toJSON() {
+        return {
+            type: "workbench.parts.banner"
+        };
+    }
+};
+BannerPart = ( __decorate([
+    ( __param(0, IThemeService)),
+    ( __param(1, IWorkbenchLayoutService)),
+    ( __param(2, IStorageService)),
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IInstantiationService))
+], BannerPart));
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'workbench.banner.focusBanner',
+    weight: 200 ,
+    primary: 9 ,
+    when: BannerFocused,
+    handler: (accessor) => {
+        const bannerService = accessor.get(IBannerService);
+        bannerService.focus();
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'workbench.banner.focusNextAction',
+    weight: 200 ,
+    primary: 17 ,
+    secondary: [18 ],
+    when: BannerFocused,
+    handler: (accessor) => {
+        const bannerService = accessor.get(IBannerService);
+        bannerService.focusNextAction();
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'workbench.banner.focusPreviousAction',
+    weight: 200 ,
+    primary: 15 ,
+    secondary: [16 ],
+    when: BannerFocused,
+    handler: (accessor) => {
+        const bannerService = accessor.get(IBannerService);
+        bannerService.focusPreviousAction();
+    }
+});
+class FocusBannerAction extends Action2 {
+    static { this.ID = 'workbench.action.focusBanner'; }
+    static { this.LABEL = ( localize2WithPath(
+        'vs/workbench/browser/parts/banner/bannerPart',
+        'focusBanner',
+        "Focus Banner"
+    )); }
+    constructor() {
+        super({
+            id: FocusBannerAction.ID,
+            title: FocusBannerAction.LABEL,
+            category: Categories.View,
+            f1: true
+        });
+    }
+    async run(accessor) {
+        const layoutService = accessor.get(IWorkbenchLayoutService);
+        layoutService.focusPart("workbench.parts.banner" );
+    }
+}
+registerAction2(FocusBannerAction);
+export { BannerPart };

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

@@ -0,0 +1,4 @@
+import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+var css = ".monaco-workbench .part.banner{background-color:var(--vscode-banner-background);box-sizing:border-box;color:var(--vscode-banner-foreground);cursor:default;display:flex;font-size:12px;height:100%;overflow:visible;width:100%}.monaco-workbench .part.banner .icon-container{align-items:center;display:flex;flex-shrink:0;padding:0 6px 0 10px}.monaco-workbench .part.banner .icon-container .codicon{color:var(--vscode-banner-iconForeground)}.monaco-workbench .part.banner .icon-container.custom-icon{background-image:url(\"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiPjxwYXRoIGQ9Ik0xMDI0IDEwMjRIMFYwaDEwMjR2MTAyNHoiIHN0eWxlPSJmaWxsOiNmNmY2ZjY7ZmlsbC1vcGFjaXR5OjAiIGZpbGw9Im5vbmUiLz48cGF0aCBkPSJNMTAyNCA4NS4zMzN2ODUzLjMzM0gwVjg1LjMzM2gxMDI0eiIgc3R5bGU9ImZpbGw6I2ZmZiIvPjxwYXRoIGQ9Ik0wIDg1LjMzM2gyOTguNjY3djg1My4zMzNIMFY4NS4zMzN6bTEwMjQgMHY4NTMuMzMzSDM4NFY4NS4zMzNoNjQwem0tNTU0LjY2NyAxNjBoMzQxLjMzM3YtNjRINDY5LjMzM3Y2NHptMzQxLjMzNCA1MzMuMzM0SDQ2OS4zMzN2NjRoMzQxLjMzM2wuMDAxLTY0em0xMjgtMTQ5LjMzNEg1OTcuMzMzdjY0aDM0MS4zMzNsLjAwMS02NHptMC0xNDkuMzMzSDU5Ny4zMzN2NjRoMzQxLjMzM2wuMDAxLTY0em0wLTE0OS4zMzNINTk3LjMzM3Y2NGgzNDEuMzMzbC4wMDEtNjR6IiBzdHlsZT0iZmlsbDojMTY3YWJmIi8+PC9zdmc+\");background-position:50%;background-repeat:no-repeat;background-size:16px;margin:0 6px 0 10px;padding:0;width:16px}.monaco-workbench .part.banner .message-container{line-height:26px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .part.banner .message-container a{color:var(--vscode-banner-foreground)}.monaco-workbench .part.banner .message-container p{margin-block-end:0;margin-block-start:0}.monaco-workbench .part.banner .message-actions-container{flex-grow:1;flex-shrink:0;line-height:26px}.monaco-workbench .part.banner .message-actions-container a{color:var(--vscode-banner-foreground);cursor:pointer;margin-left:12px;padding:3px;text-decoration:underline}.monaco-workbench .part.banner .message-container a{cursor:pointer;text-decoration:underline}.monaco-workbench .part.banner .action-container{padding:0 10px 0 6px}.monaco-workbench .part.banner .action-container .codicon{color:var(--vscode-banner-foreground)}";
+n(css,{});
+export { css, css as default };

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

@@ -14,9 +14,10 @@ import { IViewDescriptorService } from '../../common/views.js';
 import { CompositeDragAndDropObserver, toggleDropEffect } from '../dnd.js';
 import { Gesture, EventType as EventType$1 } from '../../../base/browser/touch.js';
 class CompositeDragAndDrop {
-    constructor(viewDescriptorService, targetContainerLocation, openComposite, moveComposite, getItems) {
+    constructor(viewDescriptorService, targetContainerLocation, orientation, openComposite, moveComposite, getItems) {
         this.viewDescriptorService = viewDescriptorService;
         this.targetContainerLocation = targetContainerLocation;
+        this.orientation = orientation;
         this.openComposite = openComposite;
         this.moveComposite = moveComposite;
         this.getItems = getItems;
@@ -60,7 +61,7 @@ class CompositeDragAndDrop {
             return undefined;
         }
         const items = this.getItems();
-        const before = this.targetContainerLocation === 1  ? before2d?.horizontallyBefore : before2d?.verticallyBefore;
+        const before = this.orientation === 0  ? before2d?.horizontallyBefore : before2d?.verticallyBefore;
         return items.filter(item => item.visible).findIndex(item => item.id === targetId) + (before ? 0 : 1);
     }
     canDrop(data, targetCompositeId) {
@@ -112,12 +113,12 @@ let CompositeBar = class CompositeBar extends Widget {
     create(parent) {
         const actionBarDiv = parent.appendChild($('.composite-bar'));
         this.compositeSwitcherBar = this._register(( new ActionBar(actionBarDiv, {
-            actionViewItemProvider: action => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof CompositeOverflowActivityAction) {
                     return this.compositeOverflowActionViewItem;
                 }
                 const item = this.model.findItem(action.id);
-                return item && this.instantiationService.createInstance(CompositeActionViewItem, { draggable: true, colors: this.options.colors, icon: this.options.icon, hoverOptions: this.options.activityHoverOptions, compact: this.options.compact }, action, item.pinnedAction, item.toggleBadgeAction, compositeId => this.options.getContextMenuActionsForComposite(compositeId), () => this.getContextMenuActions(), this.options.dndHandler, this);
+                return item && this.instantiationService.createInstance(CompositeActionViewItem, { ...options, draggable: true, colors: this.options.colors, icon: this.options.icon, hoverOptions: this.options.activityHoverOptions, compact: this.options.compact }, action, item.pinnedAction, item.toggleBadgeAction, compositeId => this.options.getContextMenuActionsForComposite(compositeId), () => this.getContextMenuActions(), this.options.dndHandler, this);
             },
             orientation: this.options.orientation,
             ariaLabel: ( localizeWithPath(

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

@@ -18,7 +18,17 @@ import { ThemeIcon } from '../../../base/common/themables.js';
 import { IHoverService } from '../../../platform/hover/browser/hover.js';
 import { RunOnceScheduler } from '../../../base/common/async.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
-import { badgeForeground, badgeBackground, contrastBorder } from '../../../platform/theme/common/colorRegistry.js';
+import '../../../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 { badgeForeground, badgeBackground } from '../../../platform/theme/common/colors/miscColors.js';
+import '../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../platform/theme/common/colors/searchColors.js';
 var CompositeBarActionViewItem_1, CompositeActionViewItem_1;
 class CompositeBarAction extends Action {
     constructor(item) {
@@ -539,13 +549,13 @@ let CompositeActionViewItem = class CompositeActionViewItem extends CompositeBar
     updateChecked() {
         if (this.action.checked) {
             this.container.classList.add('checked');
-            this.container.setAttribute('aria-label', this.container.title);
+            this.container.setAttribute('aria-label', this.getTooltip() ?? this.container.title);
             this.container.setAttribute('aria-expanded', 'true');
             this.container.setAttribute('aria-selected', 'true');
         }
         else {
             this.container.classList.remove('checked');
-            this.container.setAttribute('aria-label', this.container.title);
+            this.container.setAttribute('aria-label', this.getTooltip() ?? this.container.title);
             this.container.setAttribute('aria-expanded', 'false');
             this.container.setAttribute('aria-selected', 'false');
         }

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

@@ -15,7 +15,8 @@ import { createActionViewItem } from '../../../platform/actions/browser/menuEntr
 import { ScopedProgressIndicator, AbstractProgressScope } from '../../services/progress/browser/progressIndicator.js';
 import { WorkbenchToolBar } from '../../../platform/actions/browser/toolbar.js';
 import { defaultProgressBarStyles } from '../../../platform/theme/browser/defaultStyles.js';
-import { getDefaultHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js';
+import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { setupCustomHover } from '../../../base/browser/ui/hover/updatableHoverWidget.js';
 class CompositePart extends Part {
     constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, registry, activeCompositeSettingsKey, defaultCompositeId, nameForTelemetry, compositeCSSClass, titleForegroundColor, id, options) {
         super(id, options, themeService, storageService, layoutService);
@@ -37,7 +38,7 @@ class CompositePart extends Part {
         this.instantiatedCompositeItems = ( new Map());
         this.actionsListener = this._register(( new MutableDisposable()));
         this.lastActiveCompositeId = storageService.get(activeCompositeSettingsKey, 1 , this.defaultCompositeId);
-        this.hoverDelegate = this._register(getDefaultHoverDelegate('element', true));
+        this.toolbarHoverDelegate = this._register(createInstantHoverDelegate());
     }
     openComposite(id, focus) {
         if (this.activeComposite?.getId() === id) {
@@ -241,7 +242,7 @@ class CompositePart extends Part {
                 "Views and More Actions..."
             )),
             telemetrySource: this.nameForTelemetry,
-            hoverDelegate: this.hoverDelegate
+            hoverDelegate: this.toolbarHoverDelegate
         }));
         this.collectCompositeActions()();
         return titleArea;
@@ -250,18 +251,19 @@ class CompositePart extends Part {
         const titleContainer = append(parent, $('.title-label'));
         const titleLabel = append(titleContainer, $('h2'));
         this.titleLabelElement = titleLabel;
+        const hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), titleLabel, ''));
         const $this = this;
         return {
             updateTitle: (id, title, keybinding) => {
                 if (!this.activeComposite || this.activeComposite.getId() === id) {
                     titleLabel.innerText = title;
-                    titleLabel.title = keybinding ? ( localizeWithPath(
+                    hover.update(keybinding ? ( localizeWithPath(
                         'vs/workbench/browser/parts/compositePart',
                         'titleTooltip',
                         "{0} ({1})",
                         title,
                         keybinding
-                    )) : title;
+                    )) : title);
                 }
             },
             updateStyles: () => {
@@ -269,6 +271,12 @@ class CompositePart extends Part {
             }
         };
     }
+    createHeaderArea() {
+        return $('.composite');
+    }
+    createFooterArea() {
+        return $('.composite');
+    }
     updateStyles() {
         super.updateStyles();
         const titleLabel = assertIsDefined(this.titleLabel);

package/vscode/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.js

@@ -0,0 +1,74 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { BrowserDialogHandler } from './dialogHandler.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+let DialogHandlerContribution = class DialogHandlerContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.dialogHandler'; }
+    constructor(dialogService, logService, layoutService, keybindingService, instantiationService, productService, clipboardService) {
+        super();
+        this.dialogService = dialogService;
+        this.impl = ( new Lazy(() => ( new BrowserDialogHandler(
+            logService,
+            layoutService,
+            keybindingService,
+            instantiationService,
+            productService,
+            clipboardService
+        ))));
+        this.model = this.dialogService.model;
+        this._register(this.model.onWillShowDialog(() => {
+            if (!this.currentDialog) {
+                this.processDialogs();
+            }
+        }));
+        this.processDialogs();
+    }
+    async processDialogs() {
+        while (this.model.dialogs.length) {
+            this.currentDialog = this.model.dialogs[0];
+            let result = undefined;
+            try {
+                if (this.currentDialog.args.confirmArgs) {
+                    const args = this.currentDialog.args.confirmArgs;
+                    result = await this.impl.value.confirm(args.confirmation);
+                }
+                else if (this.currentDialog.args.inputArgs) {
+                    const args = this.currentDialog.args.inputArgs;
+                    result = await this.impl.value.input(args.input);
+                }
+                else if (this.currentDialog.args.promptArgs) {
+                    const args = this.currentDialog.args.promptArgs;
+                    result = await this.impl.value.prompt(args.prompt);
+                }
+                else {
+                    await this.impl.value.about();
+                }
+            }
+            catch (error) {
+                result = error;
+            }
+            this.currentDialog.close(result);
+            this.currentDialog = undefined;
+        }
+    }
+};
+DialogHandlerContribution = ( __decorate([
+    ( __param(0, IDialogService)),
+    ( __param(1, ILogService)),
+    ( __param(2, ILayoutService)),
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IProductService)),
+    ( __param(6, IClipboardService))
+], DialogHandlerContribution));
+registerWorkbenchContribution2(DialogHandlerContribution.ID, DialogHandlerContribution, 1 );
+export { DialogHandlerContribution };

package/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.js

@@ -0,0 +1,132 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { localizeWithPath } from '../../../../nls.js';
+import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import Severity$1 from '../../../../base/common/severity.js';
+import { Dialog } from '../../../../base/browser/ui/dialog/dialog.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { EventHelper } from '../../../../base/browser/dom.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { fromNow } from '../../../../base/common/date.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { AbstractDialogHandler } from '../../../../platform/dialogs/common/dialogs.js';
+var BrowserDialogHandler_1;
+let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHandler {
+    static { BrowserDialogHandler_1 = this; }
+    static { this.ALLOWABLE_COMMANDS = [
+        'copy',
+        'cut',
+        'editor.action.selectAll',
+        'editor.action.clipboardCopyAction',
+        'editor.action.clipboardCutAction',
+        'editor.action.clipboardPasteAction'
+    ]; }
+    constructor(logService, layoutService, keybindingService, instantiationService, productService, clipboardService) {
+        super();
+        this.logService = logService;
+        this.layoutService = layoutService;
+        this.keybindingService = keybindingService;
+        this.instantiationService = instantiationService;
+        this.productService = productService;
+        this.clipboardService = clipboardService;
+        this.markdownRenderer = this.instantiationService.createInstance(MarkdownRenderer, {});
+    }
+    async prompt(prompt) {
+        this.logService.trace('DialogService#prompt', prompt.message);
+        const buttons = this.getPromptButtons(prompt);
+        const { button, checkboxChecked } = await this.doShow(prompt.type, prompt.message, buttons, prompt.detail, prompt.cancelButton ? buttons.length - 1 : -1 , prompt.checkbox, undefined, typeof prompt?.custom === 'object' ? prompt.custom : undefined);
+        return this.getPromptResult(prompt, button, checkboxChecked);
+    }
+    async confirm(confirmation) {
+        this.logService.trace('DialogService#confirm', confirmation.message);
+        const buttons = this.getConfirmationButtons(confirmation);
+        const { button, checkboxChecked } = await this.doShow(confirmation.type ?? 'question', confirmation.message, buttons, confirmation.detail, buttons.length - 1, confirmation.checkbox, undefined, typeof confirmation?.custom === 'object' ? confirmation.custom : undefined);
+        return { confirmed: button === 0, checkboxChecked };
+    }
+    async input(input) {
+        this.logService.trace('DialogService#input', input.message);
+        const buttons = this.getInputButtons(input);
+        const { button, checkboxChecked, values } = await this.doShow(input.type ?? 'question', input.message, buttons, input.detail, buttons.length - 1, input?.checkbox, input.inputs, typeof input.custom === 'object' ? input.custom : undefined);
+        return { confirmed: button === 0, checkboxChecked, values };
+    }
+    async about() {
+        const detailString = (useAgo) => {
+            return ( localizeWithPath(
+                'vs/workbench/browser/parts/dialogs/dialogHandler',
+                'aboutDetail',
+                "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
+                this.productService.version || 'Unknown',
+                this.productService.commit || 'Unknown',
+                this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(( new Date(this.productService.date)), true) + ')' : ''}` : 'Unknown',
+                navigator.userAgent
+            ));
+        };
+        const detail = detailString(true);
+        const detailToCopy = detailString(false);
+        const { button } = await this.doShow(Severity$1.Info, this.productService.nameLong, [
+            ( localizeWithPath(
+                'vs/workbench/browser/parts/dialogs/dialogHandler',
+                { key: 'copy', comment: ['&& denotes a mnemonic'] },
+                "&&Copy"
+            )),
+            ( localizeWithPath('vs/workbench/browser/parts/dialogs/dialogHandler', 'ok', "OK"))
+        ], detail, 1);
+        if (button === 0) {
+            this.clipboardService.writeText(detailToCopy);
+        }
+    }
+    async doShow(type, message, buttons, detail, cancelId, checkbox, inputs, customOptions) {
+        const dialogDisposables = ( new DisposableStore());
+        const renderBody = customOptions ? (parent) => {
+            parent.classList.add(...(customOptions.classes || []));
+            customOptions.markdownDetails?.forEach(markdownDetail => {
+                const result = this.markdownRenderer.render(markdownDetail.markdown);
+                parent.appendChild(result.element);
+                result.element.classList.add(...(markdownDetail.classes || []));
+                dialogDisposables.add(result);
+            });
+        } : undefined;
+        const dialog = ( new Dialog(this.layoutService.activeContainer, message, buttons, {
+            detail,
+            cancelId,
+            type: this.getDialogType(type),
+            keyEventProcessor: (event) => {
+                const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
+                if (resolved.kind === 2  && resolved.commandId) {
+                    if (BrowserDialogHandler_1.ALLOWABLE_COMMANDS.indexOf(resolved.commandId) === -1) {
+                        EventHelper.stop(event, true);
+                    }
+                }
+            },
+            renderBody,
+            icon: customOptions?.icon,
+            disableCloseAction: customOptions?.disableCloseAction,
+            buttonDetails: customOptions?.buttonDetails,
+            checkboxLabel: checkbox?.label,
+            checkboxChecked: checkbox?.checked,
+            inputs,
+            buttonStyles: defaultButtonStyles,
+            checkboxStyles: defaultCheckboxStyles,
+            inputBoxStyles: defaultInputBoxStyles,
+            dialogStyles: defaultDialogStyles
+        }));
+        dialogDisposables.add(dialog);
+        const result = await dialog.show();
+        dialogDisposables.dispose();
+        return result;
+    }
+};
+BrowserDialogHandler = BrowserDialogHandler_1 = ( __decorate([
+    ( __param(0, ILogService)),
+    ( __param(1, ILayoutService)),
+    ( __param(2, IKeybindingService)),
+    ( __param(3, IInstantiationService)),
+    ( __param(4, IProductService)),
+    ( __param(5, IClipboardService))
+], BrowserDialogHandler));
+export { BrowserDialogHandler };

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

@@ -126,6 +126,18 @@ let AuxiliaryEditorPart = class AuxiliaryEditorPart {
             disposables.dispose();
         }));
         disposables.add(Event.once(this.lifecycleService.onDidShutdown)(() => disposables.dispose()));
+        disposables.add(auxiliaryWindow.onBeforeUnload(event => {
+            for (const group of editorPart.groups) {
+                for (const editor of group.editors) {
+                    const canMoveVeto = editor.canMove(group.id, this.editorPartsView.mainPart.activeGroup.id);
+                    if (typeof canMoveVeto === 'string') {
+                        group.openEditor(editor);
+                        event.veto(canMoveVeto);
+                        break;
+                    }
+                }
+            }
+        }));
         disposables.add(auxiliaryWindow.onWillLayout(dimension => {
             const titlebarPartHeight = titlebarPart?.height ?? 0;
             titlebarPart?.layout(dimension.width, titlebarPartHeight, 0, 0);

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

@@ -13,8 +13,8 @@ import { IEditorGroupsService } from '../../../services/editor/common/editorGrou
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 let BinaryResourceDiffEditor = class BinaryResourceDiffEditor extends SideBySideEditor {
     static { this.ID = BINARY_DIFF_EDITOR_ID; }
-    constructor(telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService) {
-        super(telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService);
+    constructor(group, telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService) {
+        super(group, telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService);
     }
     getMetadata() {
         const primary = this.getPrimaryEditorPane();
@@ -32,13 +32,13 @@ let BinaryResourceDiffEditor = class BinaryResourceDiffEditor extends SideBySide
     }
 };
 BinaryResourceDiffEditor = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IStorageService)),
-    ( __param(4, IConfigurationService)),
-    ( __param(5, ITextResourceConfigurationService)),
-    ( __param(6, IEditorService)),
-    ( __param(7, IEditorGroupsService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IThemeService)),
+    ( __param(4, IStorageService)),
+    ( __param(5, IConfigurationService)),
+    ( __param(6, ITextResourceConfigurationService)),
+    ( __param(7, IEditorService)),
+    ( __param(8, IEditorGroupsService))
 ], BinaryResourceDiffEditor));
 export { BinaryResourceDiffEditor };

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

@@ -6,8 +6,8 @@ import { IStorageService } from '../../../../platform/storage/common/storage.js'
 import { ByteSize } from '../../../../platform/files/common/files.js';
 import { EditorPlaceholder } from './editorPlaceholder.js';
 let BaseBinaryResourceEditor = class BaseBinaryResourceEditor extends EditorPlaceholder {
-    constructor(id, callbacks, telemetryService, themeService, storageService) {
-        super(id, telemetryService, themeService, storageService);
+    constructor(id, group, callbacks, telemetryService, themeService, storageService) {
+        super(id, group, telemetryService, themeService, storageService);
         this.callbacks = callbacks;
         this._onDidChangeMetadata = this._register(( new Emitter()));
         this.onDidChangeMetadata = this._onDidChangeMetadata.event;
@@ -59,6 +59,6 @@ let BaseBinaryResourceEditor = class BaseBinaryResourceEditor extends EditorPlac
     }
 };
 BaseBinaryResourceEditor = ( __decorate([
-    ( __param(4, IStorageService))
+    ( __param(5, IStorageService))
 ], BaseBinaryResourceEditor));
 export { BaseBinaryResourceEditor };