@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath } from '../../../../nls.js';
 import { mark } from '../../../../base/common/performance.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { getWindowId, registerWindow, getActiveWindow, createMetaElement, copyAttributes, cloneGlobalStylesheets, sharedMutationObserver, trackAttributes, addDisposableListener, EventType, getClientArea, position, size, EventHelper, ModifierKeyEmitter, isGlobalStylesheet } from '../../../../base/browser/dom.js';
+import { getWindowId, registerWindow, getActiveWindow, createMetaElement, copyAttributes, createLinkElement, cloneGlobalStylesheets, sharedMutationObserver, trackAttributes, addDisposableListener, EventType, EventHelper, ModifierKeyEmitter, getClientArea, position, size, isGlobalStylesheet } from '../../../../base/browser/dom.js';
 import { mainWindow, ensureCodeWindow } from '../../../../base/browser/window.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
@@ -15,36 +15,36 @@ import Severity from '../../../../base/common/severity.js';
 import { BaseWindow } from '../../../browser/window.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { Barrier } from '../../../../base/common/async.js';
+import { IHostService } from '../../host/browser/host.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var BrowserAuxiliaryWindowService_1;
 const IAuxiliaryWindowService = ( createDecorator('auxiliaryWindowService'));
 let AuxiliaryWindow = class AuxiliaryWindow extends BaseWindow {
-    constructor(window, container, configurationService) {
-        super(window);
+    constructor(window, container, stylesHaveLoaded, configurationService, hostService) {
+        super(window, undefined, hostService);
         this.window = window;
         this.container = container;
         this.configurationService = configurationService;
         this._onDidLayout = this._register(( new Emitter()));
         this.onDidLayout = this._onDidLayout.event;
-        this._onWillClose = this._register(( new Emitter()));
-        this.onWillClose = this._onWillClose.event;
+        this._onBeforeUnload = this._register(( new Emitter()));
+        this.onBeforeUnload = this._onBeforeUnload.event;
+        this._onUnload = this._register(( new Emitter()));
+        this.onUnload = this._onUnload.event;
         this._onWillDispose = this._register(( new Emitter()));
         this.onWillDispose = this._onWillDispose.event;
+        this.whenStylesHaveLoaded = stylesHaveLoaded.wait().then(() => { });
         this.registerListeners();
     }
     registerListeners() {
-        this._register(addDisposableListener(this.window, EventType.BEFORE_UNLOAD, (e) => this.onBeforeUnload(e)));
-        this._register(addDisposableListener(this.window, EventType.UNLOAD, () => this._onWillClose.fire()));
+        this._register(addDisposableListener(this.window, EventType.BEFORE_UNLOAD, (e) => this.handleBeforeUnload(e)));
+        this._register(addDisposableListener(this.window, EventType.UNLOAD, () => this.handleUnload()));
         this._register(addDisposableListener(this.window, 'unhandledrejection', e => {
             onUnexpectedError(e.reason);
             e.preventDefault();
         }));
-        this._register(addDisposableListener(this.window, EventType.RESIZE, () => {
-            const dimension = getClientArea(this.window.document.body, this.container);
-            position(this.container, 0, 0, 0, 0, 'relative');
-            size(this.container, dimension.width, dimension.height);
-            this._onDidLayout.fire(dimension);
-        }));
+        this._register(addDisposableListener(this.window, EventType.RESIZE, () => this.layout()));
         this._register(addDisposableListener(this.container, EventType.SCROLL, () => this.container.scrollTop = 0));
         if (isWeb) {
             this._register(addDisposableListener(this.container, EventType.DROP, e => EventHelper.stop(e, true)));
@@ -56,7 +56,8 @@ let AuxiliaryWindow = class AuxiliaryWindow extends BaseWindow {
             this._register(addDisposableListener(this.window.document.body, EventType.DROP, (e) => EventHelper.stop(e)));
         }
     }
-    onBeforeUnload(e) {
+    handleBeforeUnload(e) {
+        this._onBeforeUnload.fire();
         const confirmBeforeCloseSetting = this.configurationService.getValue('window.confirmBeforeClose');
         const confirmBeforeClose = confirmBeforeCloseSetting === 'always' || (confirmBeforeCloseSetting === 'keyboardOnly' && ModifierKeyEmitter.getInstance().isModifierPressed);
         if (confirmBeforeClose) {
@@ -71,8 +72,14 @@ let AuxiliaryWindow = class AuxiliaryWindow extends BaseWindow {
             "Changes that you made may not be saved. Please check press 'Cancel' and try again."
         ));
     }
+    handleUnload() {
+        this._onUnload.fire();
+    }
     layout() {
-        this._onDidLayout.fire(getClientArea(this.window.document.body, this.container));
+        const dimension = getClientArea(this.window.document.body, this.container);
+        position(this.container, 0, 0, 0, 0, 'relative');
+        size(this.container, dimension.width, dimension.height);
+        this._onDidLayout.fire(dimension);
     }
     dispose() {
         if (this._store.isDisposed) {
@@ -83,18 +90,20 @@ let AuxiliaryWindow = class AuxiliaryWindow extends BaseWindow {
     }
 };
 AuxiliaryWindow = ( __decorate([
-    ( __param(2, IConfigurationService))
+    ( __param(3, IConfigurationService)),
+    ( __param(4, IHostService))
 ], AuxiliaryWindow));
 let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends Disposable {
     static { BrowserAuxiliaryWindowService_1 = this; }
     static { this.DEFAULT_SIZE = { width: 800, height: 600 }; }
     static { this.WINDOW_IDS = getWindowId(mainWindow) + 1; }
-    constructor(layoutService, dialogService, configurationService, telemetryService) {
+    constructor(layoutService, dialogService, configurationService, telemetryService, hostService) {
         super();
         this.layoutService = layoutService;
         this.dialogService = dialogService;
         this.configurationService = configurationService;
         this.telemetryService = telemetryService;
+        this.hostService = hostService;
         this._onDidOpenAuxiliaryWindow = this._register(( new Emitter()));
         this.onDidOpenAuxiliaryWindow = this._onDidOpenAuxiliaryWindow.event;
         this.windows = ( new Map());
@@ -108,8 +117,8 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
         const resolvedWindowId = await this.resolveWindowId(targetWindow);
         ensureCodeWindow(targetWindow, resolvedWindowId);
         const containerDisposables = ( new DisposableStore());
-        const container = this.createContainer(targetWindow, containerDisposables);
-        const auxiliaryWindow = this.createAuxiliaryWindow(targetWindow, container);
+        const { container, stylesLoaded } = this.createContainer(targetWindow, containerDisposables, options);
+        const auxiliaryWindow = this.createAuxiliaryWindow(targetWindow, container, stylesLoaded);
         const registryDisposables = ( new DisposableStore());
         this.windows.set(targetWindow.vscodeWindowId, auxiliaryWindow);
         registryDisposables.add(toDisposable(() => this.windows.delete(targetWindow.vscodeWindowId)));
@@ -126,8 +135,14 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
         this.telemetryService.publicLog2('auxiliaryWindowOpen', { bounds: !!options?.bounds });
         return auxiliaryWindow;
     }
-    createAuxiliaryWindow(targetWindow, container) {
-        return ( new AuxiliaryWindow(targetWindow, container, this.configurationService));
+    createAuxiliaryWindow(targetWindow, container, stylesLoaded) {
+        return ( new AuxiliaryWindow(
+            targetWindow,
+            container,
+            stylesLoaded,
+            this.configurationService,
+            this.hostService
+        ));
     }
     async openWindow(options) {
         const activeWindow = getActiveWindow();
@@ -140,8 +155,8 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
         const width = Math.max(options?.bounds?.width ?? BrowserAuxiliaryWindowService_1.DEFAULT_SIZE.width, WindowMinimumSize.WIDTH);
         const height = Math.max(options?.bounds?.height ?? BrowserAuxiliaryWindowService_1.DEFAULT_SIZE.height, WindowMinimumSize.HEIGHT);
         let newWindowBounds = {
-            x: options?.bounds?.x ?? (activeWindowBounds.x + activeWindowBounds.width / 2 - width / 2),
-            y: options?.bounds?.y ?? (activeWindowBounds.y + activeWindowBounds.height / 2 - height / 2),
+            x: options?.bounds?.x ?? Math.max(activeWindowBounds.x + activeWindowBounds.width / 2 - width / 2, 0),
+            y: options?.bounds?.y ?? Math.max(activeWindowBounds.y + activeWindowBounds.height / 2 - height / 2, 0),
             width,
             height
         };
@@ -184,11 +199,12 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
     async resolveWindowId(auxiliaryWindow) {
         return BrowserAuxiliaryWindowService_1.WINDOW_IDS++;
     }
-    createContainer(auxiliaryWindow, disposables) {
+    createContainer(auxiliaryWindow, disposables, options) {
         this.patchMethods(auxiliaryWindow);
         this.applyMeta(auxiliaryWindow);
-        this.applyCSS(auxiliaryWindow, disposables);
-        return this.applyHTML(auxiliaryWindow, disposables);
+        const { stylesLoaded } = this.applyCSS(auxiliaryWindow, disposables);
+        const container = this.applyHTML(auxiliaryWindow, disposables);
+        return { stylesLoaded, container };
     }
     patchMethods(auxiliaryWindow) {
         auxiliaryWindow.document.createElement = function () {
@@ -196,31 +212,53 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
         };
     }
     applyMeta(auxiliaryWindow) {
-        const metaCharset = createMetaElement(auxiliaryWindow.document.head);
-        metaCharset.setAttribute('charset', 'utf-8');
-        const originalCSPMetaTag = mainWindow.document.querySelector('meta[http-equiv="Content-Security-Policy"]');
-        if (originalCSPMetaTag) {
-            const csp = createMetaElement(auxiliaryWindow.document.head);
-            copyAttributes(originalCSPMetaTag, csp);
-            const content = csp.getAttribute('content');
-            if (content) {
-                csp.setAttribute('content', content.replace(/(script-src[^\;]*)/, `script-src 'none'`));
+        for (const metaTag of ['meta[charset="utf-8"]', 'meta[http-equiv="Content-Security-Policy"]', 'meta[name="viewport"]', 'meta[name="theme-color"]']) {
+            const metaElement = mainWindow.document.querySelector(metaTag);
+            if (metaElement) {
+                const clonedMetaElement = createMetaElement(auxiliaryWindow.document.head);
+                copyAttributes(metaElement, clonedMetaElement);
+                if (metaTag === 'meta[http-equiv="Content-Security-Policy"]') {
+                    const content = clonedMetaElement.getAttribute('content');
+                    if (content) {
+                        clonedMetaElement.setAttribute('content', content.replace(/(script-src[^\;]*)/, `script-src 'none'`));
+                    }
+                }
             }
         }
+        const originalIconLinkTag = mainWindow.document.querySelector('link[rel="icon"]');
+        if (originalIconLinkTag) {
+            const icon = createLinkElement(auxiliaryWindow.document.head);
+            copyAttributes(originalIconLinkTag, icon);
+        }
     }
     applyCSS(auxiliaryWindow, disposables) {
         mark('code/auxiliaryWindow/willApplyCSS');
         const mapOriginalToClone = ( new Map());
+        const stylesLoaded = ( new Barrier());
+        stylesLoaded.wait().then(() => mark('code/auxiliaryWindow/didLoadCSSStyles'));
+        let pendingLinkSettles = 0;
+        function onLinkSettled(_event) {
+            if (!--pendingLinkSettles) {
+                stylesLoaded.open();
+            }
+        }
         function cloneNode(originalNode) {
             if (isGlobalStylesheet(originalNode)) {
                 return;
             }
             const clonedNode = auxiliaryWindow.document.head.appendChild(originalNode.cloneNode(true));
+            if (originalNode.tagName === 'LINK') {
+                pendingLinkSettles++;
+                disposables.add(addDisposableListener(clonedNode, 'load', onLinkSettled));
+                disposables.add(addDisposableListener(clonedNode, 'error', onLinkSettled));
+            }
             mapOriginalToClone.set(originalNode, clonedNode);
         }
+        pendingLinkSettles++;
         for (const originalNode of mainWindow.document.head.querySelectorAll('link[rel="stylesheet"], style')) {
             cloneNode(originalNode);
         }
+        onLinkSettled();
         disposables.add(cloneGlobalStylesheets(auxiliaryWindow));
         disposables.add(sharedMutationObserver.observe(mainWindow.document.head, disposables, { childList: true, subtree: true })(mutations => {
             for (const mutation of mutations) {
@@ -252,6 +290,7 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
             }
         }));
         mark('code/auxiliaryWindow/didApplyCSS');
+        return { stylesLoaded };
     }
     applyHTML(auxiliaryWindow, disposables) {
         mark('code/auxiliaryWindow/willApplyHTML');
@@ -268,6 +307,7 @@ BrowserAuxiliaryWindowService = BrowserAuxiliaryWindowService_1 = ( __decorate([
     ( __param(0, IWorkbenchLayoutService)),
     ( __param(1, IDialogService)),
     ( __param(2, IConfigurationService)),
-    ( __param(3, ITelemetryService))
+    ( __param(3, ITelemetryService)),
+    ( __param(4, IHostService))
 ], BrowserAuxiliaryWindowService));
 export { AuxiliaryWindow, BrowserAuxiliaryWindowService, IAuxiliaryWindowService };

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolver.js

@@ -27,6 +27,7 @@ var VariableKind;
     VariableKind["ExecPath"] = "execPath";
     VariableKind["ExecInstallFolder"] = "execInstallFolder";
     VariableKind["PathSeparator"] = "pathSeparator";
+    VariableKind["PathSeparatorAlias"] = "/";
 })(VariableKind || (VariableKind = {})));
 class VariableError extends Error {
     constructor(variable, message) {

package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js

@@ -274,6 +274,7 @@ class AbstractVariableResolverService {
                         return match;
                     }
                     case 'pathSeparator':
+                    case '/':
                         return sep;
                     default:
                         try {

package/vscode/src/vs/workbench/services/editor/browser/editorService.js

@@ -77,7 +77,7 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
     }
     registerListeners() {
         if (this.editorGroupsContainer === this.editorGroupService.mainPart || this.editorGroupsContainer === this.editorGroupService) {
-            this.editorGroupService.mainPart.whenReady.then(() => this.onEditorGroupsReady());
+            this.editorGroupService.whenReady.then(() => this.onEditorGroupsReady());
         }
         else {
             this.onEditorGroupsReady();
@@ -385,7 +385,13 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
         }
         if (!group) {
             let activation = undefined;
-            ([group, activation] = this.instantiationService.invokeFunction(findGroup, { editor: typedEditor, options }, preferredGroup));
+            const findGroupResult = this.instantiationService.invokeFunction(findGroup, { editor: typedEditor, options }, preferredGroup);
+            if (findGroupResult instanceof Promise) {
+                ([group, activation] = await findGroupResult);
+            }
+            else {
+                ([group, activation] = findGroupResult);
+            }
             if (activation) {
                 options = { ...options, activation };
             }
@@ -417,7 +423,13 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
                 typedEditor = isEditorInputWithOptions(editor) ? editor : { editor: await this.textEditorService.resolveTextEditor(editor), options: editor.options };
             }
             if (!group) {
-                [group] = this.instantiationService.invokeFunction(findGroup, typedEditor, preferredGroup);
+                const findGroupResult = this.instantiationService.invokeFunction(findGroup, typedEditor, preferredGroup);
+                if (findGroupResult instanceof Promise) {
+                    ([group] = await findGroupResult);
+                }
+                else {
+                    ([group] = findGroupResult);
+                }
             }
             let targetGroupEditors = mapGroupToTypedEditors.get(group);
             if (!targetGroupEditors) {

package/vscode/src/vs/workbench/services/editor/common/editorGroupFinder.js

@@ -2,11 +2,17 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { EditorActivation } from '../../../../platform/editor/common/editor.js';
 import { isEditorInput, isEditorInputWithOptions } from '../../../common/editor.js';
 import { IEditorGroupsService, preferredSideBySideGroupDirection } from './editorGroupsService.js';
-import { SIDE_GROUP } from './editorService.js';
+import { SIDE_GROUP, AUX_WINDOW_GROUP } from './editorService.js';
 function findGroup(accessor, editor, preferredGroup) {
     const editorGroupService = accessor.get(IEditorGroupsService);
     const configurationService = accessor.get(IConfigurationService);
     const group = doFindGroup(editor, preferredGroup, editorGroupService, configurationService);
+    if (group instanceof Promise) {
+        return group.then(group => handleGroupActivation(group, editor, preferredGroup, editorGroupService));
+    }
+    return handleGroupActivation(group, editor, preferredGroup, editorGroupService);
+}
+function handleGroupActivation(group, editor, preferredGroup, editorGroupService) {
     let activation = undefined;
     if (editorGroupService.activeGroup !== group &&
         editor.options && !editor.options.inactive &&
@@ -36,6 +42,9 @@ function doFindGroup(input, preferredGroup, editorGroupService, configurationSer
         }
         group = candidateGroup;
     }
+    else if (preferredGroup === AUX_WINDOW_GROUP) {
+        group = editorGroupService.createAuxiliaryEditorPart().then(group => group.activeGroup);
+    }
     else if (!options || typeof options.index !== 'number') {
         const groupsByLastActive = editorGroupService.getGroups(1 );
         if (options?.revealIfVisible) {

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts

@@ -1,6 +1,6 @@
 import { ServiceIdentifier, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Event } from '../../../../base/common/event.js';
-import { CloseDirection, IEditorPane, GroupIdentifier, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorWillMoveEvent, IEditorWillOpenEvent, IVisibleEditorPane, EditorsOrder, IFindEditorOptions, EditorInputWithOptions, IUntypedEditorInput, IMatchEditorOptions, IEditorPartOptions, IEditorPartOptionsChangeEvent, IToolbarActions } from '../../../common/editor.js';
+import { CloseDirection, IEditorPane, GroupIdentifier, IEditorPartOptions, IEditorPartOptionsChangeEvent, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorWillMoveEvent, IEditorWillOpenEvent, IVisibleEditorPane, EditorsOrder, IFindEditorOptions, EditorInputWithOptions, IUntypedEditorInput, IMatchEditorOptions, IToolbarActions } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -170,6 +170,38 @@ interface IEditorGroupsContainer {
      * An event for when the maximized state of a group changes.
      */
     readonly onDidChangeGroupMaximized: Event<boolean>;
+    /**
+     * A property that indicates when groups have been created
+     * and are ready to be used in the editor part.
+     */
+    readonly isReady: boolean;
+    /**
+     * A promise that resolves when groups have been created
+     * and are ready to be used in the editor part.
+     *
+     * Await this promise to safely work on the editor groups model
+     * (for example, install editor group listeners).
+     *
+     * Use the `whenRestored` property to await visible editors
+     * having fully resolved.
+     */
+    readonly whenReady: Promise<void>;
+    /**
+     * A promise that resolves when groups have been restored in
+     * the editor part.
+     *
+     * For groups with active editor, the promise will resolve
+     * when the visible editor has finished to resolve.
+     *
+     * Use the `whenReady` property to not await editors to
+     * resolve.
+     */
+    readonly whenRestored: Promise<void>;
+    /**
+     * Find out if the editor part has UI state to restore
+     * from a previous session.
+     */
+    readonly hasRestorableState: boolean;
     /**
      * An active group is the default location for new editors to open.
      */
@@ -306,14 +338,6 @@ interface IEditorGroupsContainer {
      * @param direction the direction of where to split to
      */
     copyGroup(group: IEditorGroup | GroupIdentifier, location: IEditorGroup | GroupIdentifier, direction: GroupDirection): IEditorGroup;
-    /**
-     * Access the options of the editor part.
-     */
-    readonly partOptions: IEditorPartOptions;
-    /**
-     * An event that notifies when editor part options change.
-     */
-    readonly onDidChangeEditorPartOptions: Event<IEditorPartOptionsChangeEvent>;
     /**
      * Allows to register a drag and drop target for editors
      * on the provided `container`.
@@ -334,41 +358,17 @@ interface IEditorPart extends IEditorGroupsContainer {
      */
     readonly onDidScroll: Event<void>;
     /**
-     * The size of the editor part.
+     * The identifier of the window the editor part is contained in.
      */
-    readonly contentDimension: IDimension;
-    /**
-     * A property that indicates when groups have been created
-     * and are ready to be used in the editor part.
-     */
-    readonly isReady: boolean;
-    /**
-     * A promise that resolves when groups have been created
-     * and are ready to be used in the editor part.
-     *
-     * Await this promise to safely work on the editor groups model
-     * (for example, install editor group listeners).
-     *
-     * Use the `whenRestored` property to await visible editors
-     * having fully resolved.
-     */
-    readonly whenReady: Promise<void>;
+    readonly windowId: number;
     /**
-     * A promise that resolves when groups have been restored in
-     * the editor part.
-     *
-     * For groups with active editor, the promise will resolve
-     * when the visible editor has finished to resolve.
-     *
-     * Use the `whenReady` property to not await editors to
-     * resolve.
+     * The size of the editor part.
      */
-    readonly whenRestored: Promise<void>;
+    readonly contentDimension: IDimension;
     /**
-     * Find out if the editor part has UI state to restore
-     * from a previous session.
+     * Find out if an editor group is currently maximized.
      */
-    readonly hasRestorableState: boolean;
+    hasMaximizedGroup(): boolean;
     /**
      * Enable or disable centered editor layout.
      */
@@ -383,10 +383,6 @@ interface IEditorPart extends IEditorGroupsContainer {
     enforcePartOptions(options: DeepPartial<IEditorPartOptions>): IDisposable;
 }
 interface IAuxiliaryEditorPart extends IEditorPart {
-    /**
-     * The identifier of the window the auxiliary editor part is contained in.
-     */
-    readonly windowId: number;
     /**
      * Close this auxiliary editor part after moving all
      * editors of all groups back to the main editor part.
@@ -429,6 +425,14 @@ interface IEditorGroupsService extends IEditorGroupsContainer {
      * Get the editor part that is rooted in the provided container.
      */
     getPart(container: unknown): IEditorPart;
+    /**
+     * Access the options of the editor part.
+     */
+    readonly partOptions: IEditorPartOptions;
+    /**
+     * An event that notifies when editor part options change.
+     */
+    readonly onDidChangeEditorPartOptions: Event<IEditorPartOptionsChangeEvent>;
     /**
      * Opens a new window with a full editor part instantiated
      * in there at the optional position and size on screen.
@@ -477,6 +481,10 @@ interface IEditorGroup {
      * group is moved to different locations.
      */
     readonly id: GroupIdentifier;
+    /**
+     * The identifier of the window this editor group is part of.
+     */
+    readonly windowId: number;
     /**
      * A number that indicates the position of this group in the visual
      * order of groups from left to right and top to bottom. The lowest

package/vscode/src/vs/workbench/services/editor/common/editorService.d.ts

@@ -19,7 +19,12 @@ type ACTIVE_GROUP_TYPE = typeof ACTIVE_GROUP;
  */
 declare const SIDE_GROUP = -2;
 type SIDE_GROUP_TYPE = typeof SIDE_GROUP;
-type PreferredGroup = IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE;
+/**
+ * Open an editor in a new auxiliary window.
+ */
+declare const AUX_WINDOW_GROUP = -3;
+type AUX_WINDOW_GROUP_TYPE = typeof AUX_WINDOW_GROUP;
+type PreferredGroup = IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE;
 interface ISaveEditorsOptions extends ISaveOptions {
     /**
      * If true, will ask for a location of the editor to save to.
@@ -185,10 +190,10 @@ interface IEditorService {
      * @returns the editor that opened or `undefined` if the operation failed or the editor was not
      * opened to be active.
      */
-    openEditor(editor: IResourceEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditorPane | undefined>;
-    openEditor(editor: ITextResourceEditorInput | IUntitledTextResourceEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditorPane | undefined>;
-    openEditor(editor: IResourceDiffEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextDiffEditorPane | undefined>;
-    openEditor(editor: IUntypedEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditorPane | undefined>;
+    openEditor(editor: IResourceEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
+    openEditor(editor: ITextResourceEditorInput | IUntitledTextResourceEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
+    openEditor(editor: IResourceDiffEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<ITextDiffEditorPane | undefined>;
+    openEditor(editor: IUntypedEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
     /**
      * @deprecated using this method is a sign that your editor has not adopted the editor
      * resolver yet. Please use `IEditorResolverService.registerEditor` to make your editor
@@ -201,7 +206,7 @@ interface IEditorService {
      * If you already have an `EditorInput` in hand and must use it for opening, use `group.openEditor`
      * instead, via `IEditorGroupsService`.
      */
-    openEditor(editor: EditorInput, options?: IEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditorPane | undefined>;
+    openEditor(editor: EditorInput, options?: IEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
     /**
      * Open editors in an editor group.
      *
@@ -213,7 +218,7 @@ interface IEditorService {
      * @returns the editors that opened. The array can be empty or have less elements for editors
      * that failed to open or were instructed to open as inactive.
      */
-    openEditors(editors: IUntypedEditorInput[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE, options?: IOpenEditorsOptions): Promise<readonly IEditorPane[]>;
+    openEditors(editors: IUntypedEditorInput[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE, options?: IOpenEditorsOptions): Promise<readonly IEditorPane[]>;
     /**
      * Replaces editors in an editor group with the provided replacement.
      *
@@ -284,4 +289,4 @@ interface IEditorService {
     createScoped(editorGroupsContainer: IEditorGroupsContainer | 'main', disposables: DisposableStore): IEditorService;
 }
 
-export { ACTIVE_GROUP, type ACTIVE_GROUP_TYPE, type IBaseSaveRevertAllEditorOptions, IEditorService, type IEditorsChangeEvent, type IOpenEditorsOptions, type IRevertAllEditorsOptions, type ISaveAllEditorsOptions, type ISaveEditorsOptions, type ISaveEditorsResult, type IUntypedEditorReplacement, type PreferredGroup, SIDE_GROUP, type SIDE_GROUP_TYPE };
+export { ACTIVE_GROUP, type ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP, type AUX_WINDOW_GROUP_TYPE, type IBaseSaveRevertAllEditorOptions, IEditorService, type IEditorsChangeEvent, type IOpenEditorsOptions, type IRevertAllEditorsOptions, type ISaveAllEditorsOptions, type ISaveEditorsOptions, type ISaveEditorsResult, type IUntypedEditorReplacement, type PreferredGroup, SIDE_GROUP, type SIDE_GROUP_TYPE };

package/vscode/src/vs/workbench/services/editor/common/editorService.js

@@ -3,8 +3,9 @@ import { isEditorGroup } from './editorGroupsService.js';
 const IEditorService = ( createDecorator('editorService'));
 const ACTIVE_GROUP = -1;
 const SIDE_GROUP = -2;
+const AUX_WINDOW_GROUP = -3;
 function isPreferredGroup(obj) {
     const candidate = obj;
     return typeof obj === 'number' || isEditorGroup(candidate);
 }
-export { ACTIVE_GROUP, IEditorService, SIDE_GROUP, isPreferredGroup };
+export { ACTIVE_GROUP, AUX_WINDOW_GROUP, IEditorService, SIDE_GROUP, isPreferredGroup };

package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { IExtensionManagementService, IGlobalExtensionEnablementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { isResolverExtension } from '../../../../platform/extensions/common/extensions.js';
@@ -180,11 +180,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.start',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/services/extensionManagement/browser/extensionBisect',
                 'title.start',
-                "Start Extension Bisect"
-            )), original: 'Start Extension Bisect' },
+                'Start Extension Bisect'
+            )),
             category: Categories.Help,
             f1: true,
             precondition: ( ExtensionBisectUi.ctxIsBisectActive.negate()),
@@ -231,11 +231,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.next',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/services/extensionManagement/browser/extensionBisect',
                 'title.isBad',
-                "Continue Extension Bisect"
-            )), original: 'Continue Extension Bisect' },
+                'Continue Extension Bisect'
+            )),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive
@@ -376,11 +376,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.stop',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/services/extensionManagement/browser/extensionBisect',
                 'title.stop',
-                "Stop Extension Bisect"
-            )), original: 'Stop Extension Bisect' },
+                'Stop Extension Bisect'
+            )),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive

package/vscode/src/vs/workbench/services/extensions/browser/extensionUrlHandler.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { combinedDisposable } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
@@ -126,7 +126,7 @@ let ExtensionUrlHandler = class ExtensionUrlHandler {
                     label: ( localizeWithPath(
                         'vs/workbench/services/extensions/browser/extensionUrlHandler',
                         'rememberConfirmUrl',
-                        "Don't ask again for this extension."
+                        "Do not ask me again for this extension"
                     )),
                 },
                 detail: uriString,
@@ -375,16 +375,16 @@ class ManageAuthorizedExtensionURIsAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.extensions.action.manageAuthorizedExtensionURIs',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/services/extensions/browser/extensionUrlHandler',
                 'manage',
-                "Manage Authorized Extension URIs..."
-            )), original: 'Manage Authorized Extension URIs...' },
-            category: { value: ( localizeWithPath(
+                'Manage Authorized Extension URIs...'
+            )),
+            category: ( localize2WithPath(
                 'vs/workbench/services/extensions/browser/extensionUrlHandler',
                 'extensions',
-                "Extensions"
-            )), original: 'Extensions' },
+                'Extensions'
+            )),
             menu: {
                 id: MenuId.CommandPalette,
                 when: ( IsWebContext.toNegated())