@codingame/monaco-vscode-host-service-override 23.2.2 → 24.1.0

package/index.js

@@ -11,7 +11,7 @@ import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { BrowserHostService } from './vscode/src/vs/workbench/services/host/browser/browserHostService.js';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-host-service-override",
-  "version": "23.2.2",
+  "version": "24.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - host service-override",
   "keywords": [],
@@ -15,10 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "23.2.2",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.2.2",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.2.2",
-    "@codingame/monaco-vscode-api": "23.2.2"
+    "@codingame/monaco-vscode-api": "24.1.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/services/host/browser/browserHostService.d.ts

@@ -2,11 +2,11 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { ILayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IWindowOpenable, IOpenWindowOptions, IOpenEmptyWindowOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window";
+import { IWindowOpenable, IOpenWindowOptions, IOpenEmptyWindowOptions, IOpenedMainWindow, IOpenedAuxiliaryWindow } from "@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { BrowserLifecycleService } from "@codingame/monaco-vscode-lifecycle-service-override/vscode/vs/workbench/services/lifecycle/browser/lifecycleService";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
@@ -54,6 +54,12 @@ export declare class BrowserHostService extends Disposable implements IHostServi
     toggleFullScreen(targetWindow: Window): Promise<void>;
     moveTop(targetWindow: Window): Promise<void>;
     getCursorScreenPoint(): Promise<undefined>;
+    getWindows(options: {
+        includeAuxiliaryWindows: true;
+    }): Promise<Array<IOpenedMainWindow | IOpenedAuxiliaryWindow>>;
+    getWindows(options: {
+        includeAuxiliaryWindows: false;
+    }): Promise<Array<IOpenedMainWindow>>;
     restart(): Promise<void>;
     reload(): Promise<void>;
     close(): Promise<void>;

package/vscode/src/vs/workbench/services/host/browser/browserHostService.js

@@ -8,13 +8,13 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { isFolderToOpen, isWorkspaceToOpen, isFileToOpen } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
 import { pathsToEditors, isResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { whenEditorClosed } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
+import { whenEditorClosed } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/editor';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { Verbosity } from '@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common/vscode/vs/platform/label/common/label';
+import { Verbosity } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
-import { ModifierKeyEmitter, onDidRegisterWindow, trackFocus, getActiveDocument, getWindowId, disposableWindowInterval, detectFullscreen, EventType, addDisposableListener, addDisposableThrottledListener, createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { ModifierKeyEmitter, onDidRegisterWindow, trackFocus, getActiveDocument, getWindowId, disposableWindowInterval, detectFullscreen, EventType, addDisposableListener, addDisposableThrottledListener, getActiveWindow, getWindows, createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { memoize } from '@codingame/monaco-vscode-api/vscode/vs/base/common/decorators';
 import { parseLineAndColumnAware } from '@codingame/monaco-vscode-api/vscode/vs/base/common/extpath';
 import { IWorkspaceEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workspaces/common/workspaceEditing.service';
@@ -27,7 +27,7 @@ import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severit
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { DomEmitter } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/event';
 import { isUndefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { isTemporaryWorkspace } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
+import { isTemporaryWorkspace, toWorkspaceIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
@@ -350,24 +350,24 @@ let BrowserHostService = class BrowserHostService extends Disposable {
                 type: Severity.Warning,
                 message: workspace ?
                     ( localize(
-                    13915,
+                    14056,
                     "The browser blocked opening a new tab or window for '{0}'. Press 'Retry' to try again.",
                     this.getRecentLabel(workspace)
                 )) :
                     ( localize(
-                    13916,
+                    14057,
                     "The browser blocked opening a new tab or window. Press 'Retry' to try again."
                 )),
                 custom: {
                     markdownDetails: [{ markdown: ( new MarkdownString(( localize(
-                        13917,
+                        14058,
                         "Please allow pop-ups for this website in your [browser settings]({0}).",
                         'https://aka.ms/allow-vscode-popup'
                     )), true)) }]
                 },
                 buttons: [
                     {
-                        label: ( localize(13918, "&&Retry")),
+                        label: ( localize(14059, "&&Retry")),
                         run: () => this.workspaceProvider.open(workspace, options)
                     }
                 ],
@@ -416,6 +416,29 @@ let BrowserHostService = class BrowserHostService extends Disposable {
     async getCursorScreenPoint() {
         return undefined;
     }
+    async getWindows(options) {
+        const activeWindow = getActiveWindow();
+        const activeWindowId = getWindowId(activeWindow);
+        const result = [{
+                id: activeWindowId,
+                title: activeWindow.document.title,
+                workspace: toWorkspaceIdentifier(this.contextService.getWorkspace()),
+                dirty: false
+            }];
+        if (options.includeAuxiliaryWindows) {
+            for (const { window } of getWindows()) {
+                const windowId = getWindowId(window);
+                if (windowId !== activeWindowId && isAuxiliaryWindow(window)) {
+                    result.push({
+                        id: windowId,
+                        title: window.document.title,
+                        parentId: activeWindowId
+                    });
+                }
+            }
+        }
+        return result;
+    }
     async restart() {
         this.reload();
     }
@@ -447,7 +470,7 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         store.add(toDisposable(() => video.remove()));
         let stream;
         try {
-            stream = await navigator.mediaDevices.getDisplayMedia({
+            stream = await mainWindow.navigator.mediaDevices.getDisplayMedia({
                 audio: false,
                 video: true
             });