@codingame/monaco-vscode-host-service-override 17.2.1 → 18.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-host-service-override",
-  "version": "17.2.1",
+  "version": "18.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - host service-override",
   "keywords": [],
@@ -15,10 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "17.2.1",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "17.2.1",
-    "@codingame/monaco-vscode-api": "17.2.1",
-    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "17.2.1"
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "18.0.1",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "18.0.1",
+    "@codingame/monaco-vscode-api": "18.0.1",
+    "@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common": "18.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -14,7 +14,6 @@ import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
 import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
-import { IElementData } from "@codingame/monaco-vscode-api/vscode/vs/platform/native/common/native";
 export declare class BrowserHostService extends Disposable implements IHostService {
     private readonly layoutService;
     private readonly configurationService;
@@ -61,7 +60,6 @@ export declare class BrowserHostService extends Disposable implements IHostServi
     withExpectedShutdown<T>(expectedShutdownTask: () => Promise<T>): Promise<T>;
     private handleExpectedShutdown;
     getScreenshot(): Promise<VSBuffer | undefined>;
-    getElementData(): Promise<IElementData | undefined>;
     getBrowserId(): Promise<string | undefined>;
     getNativeWindowHandle(_windowId: number): Promise<undefined>;
 }

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

@@ -8,7 +8,7 @@ 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-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/editor';
+import { whenEditorClosed } from '@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common/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 { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
@@ -35,6 +35,7 @@ import { mainWindow, isAuxiliaryWindow } from '@codingame/monaco-vscode-api/vsco
 import { isIOS, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 
 var HostShutdownReason;
 (function (HostShutdownReason) {
@@ -269,7 +270,14 @@ let BrowserHostService = class BrowserHostService extends Disposable {
                 const waitMarkerFileURI = options?.waitMarkerFileURI;
                 if (waitMarkerFileURI) {
                     (async () => {
-                        await this.instantiationService.invokeFunction(accessor => whenEditorClosed(accessor, ( fileOpenables.map(fileOpenable => fileOpenable.fileUri))));
+                        const filesToWaitFor = [];
+                        if (options.mergeMode) {
+                            filesToWaitFor.push(fileOpenables[3].fileUri );
+                        }
+                        else {
+                            filesToWaitFor.push(...( fileOpenables.map(fileOpenable => fileOpenable.fileUri)));
+                        }
+                        await this.instantiationService.invokeFunction(accessor => whenEditorClosed(accessor, filesToWaitFor));
                         await this.fileService.del(waitMarkerFileURI);
                     })();
                 }
@@ -338,17 +346,33 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         }
         const opened = await this.workspaceProvider.open(workspace, options);
         if (!opened) {
-            const { confirmed } = await this.dialogService.confirm({
+            await this.dialogService.prompt({
                 type: Severity.Warning,
-                message: ( localize(
-                    12408,
-                    "The browser interrupted the opening of a new tab or window. Press 'Open' to open it anyway."
+                message: workspace ?
+                    ( localize(
+                    12688,
+                    "The browser blocked opening a new tab or window for '{0}'. Press 'Retry' to try again.",
+                    this.getRecentLabel(workspace)
+                )) :
+                    ( localize(
+                    12689,
+                    "The browser blocked opening a new tab or window. Press 'Retry' to try again."
                 )),
-                primaryButton: ( localize(12409, "&&Open"))
+                custom: {
+                    markdownDetails: [{ markdown: ( new MarkdownString(( localize(
+                        12690,
+                        "Please allow pop-ups for this website in your [browser settings]({0}).",
+                        'https://aka.ms/allow-vscode-popup'
+                    )), true)) }]
+                },
+                buttons: [
+                    {
+                        label: ( localize(12691, "&&Retry")),
+                        run: () => this.workspaceProvider.open(workspace, options)
+                    }
+                ],
+                cancelButton: true
             });
-            if (confirmed) {
-                await this.workspaceProvider.open(workspace, options);
-            }
         }
     }
     async toggleFullScreen(targetWindow) {
@@ -459,9 +483,6 @@ let BrowserHostService = class BrowserHostService extends Disposable {
             }
         }
     }
-    async getElementData() {
-        return undefined;
-    }
     async getBrowserId() {
         return undefined;
     }