@codingame/monaco-vscode-host-service-override 26.2.2 → 27.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-host-service-override",
-  "version": "26.2.2",
+  "version": "27.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - host service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "26.2.2"
+    "@codingame/monaco-vscode-api": "27.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -1,4 +1,5 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { IToastOptions, IToastResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host";
 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";
@@ -14,6 +15,7 @@ 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 { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 export declare class BrowserHostService extends Disposable implements IHostService {
     private readonly layoutService;
     private readonly configurationService;
@@ -53,6 +55,7 @@ export declare class BrowserHostService extends Disposable implements IHostServi
     private doOpen;
     toggleFullScreen(targetWindow: Window): Promise<void>;
     moveTop(targetWindow: Window): Promise<void>;
+    setWindowDimmed(_targetWindow: Window, _dimmed: boolean): Promise<void>;
     getCursorScreenPoint(): Promise<undefined>;
     getWindows(options: {
         includeAuxiliaryWindows: true;
@@ -68,4 +71,7 @@ export declare class BrowserHostService extends Disposable implements IHostServi
     getScreenshot(): Promise<VSBuffer | undefined>;
     getBrowserId(): Promise<string | undefined>;
     getNativeWindowHandle(_windowId: number): Promise<undefined>;
+    private readonly activeToasts;
+    showToast(options: IToastOptions, token: CancellationToken): Promise<IToastResult>;
+    private clearToasts;
 }

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

@@ -13,7 +13,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 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, 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 { Disposable, DisposableSet, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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';
@@ -36,6 +36,7 @@ import { isIOS, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/
 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';
+import { showBrowserToast } from './toasts.js';
 
 var HostShutdownReason;
 (function(HostShutdownReason) {
@@ -70,6 +71,7 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         this.contextService = contextService;
         this.userDataProfilesService = userDataProfilesService;
         this.shutdownReason = HostShutdownReason.Unknown;
+        this.activeToasts = this._register(( new DisposableSet()));
         if (environmentService.options?.workspaceProvider) {
             this.workspaceProvider = environmentService.options.workspaceProvider;
         } else {
@@ -90,6 +92,11 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         this._register(
             ModifierKeyEmitter.getInstance().event(() => this.updateShutdownReasonFromEvent())
         );
+        this._register(this.onDidChangeFocus(focus => {
+            if (focus) {
+                this.clearToasts();
+            }
+        }));
     }
     onBeforeShutdown(e) {
         switch (this.shutdownReason) {
@@ -446,24 +453,24 @@ let BrowserHostService = class BrowserHostService extends Disposable {
             await this.dialogService.prompt({
                 type: Severity.Warning,
                 message: workspace ? ( localize(
-                    14692,
+                    15620,
                     "The browser blocked opening a new tab or window for '{0}'. Press 'Retry' to try again.",
                     this.getRecentLabel(workspace)
                 )) : ( localize(
-                    14693,
+                    15621,
                     "The browser blocked opening a new tab or window. Press 'Retry' to try again."
                 )),
                 custom: {
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            14694,
+                            15622,
                             "Please allow pop-ups for this website in your [browser settings]({0}).",
                             "https://aka.ms/allow-vscode-popup"
                         )), true))
                     }]
                 },
                 buttons: [{
-                    label: ( localize(14695, "&&Retry")),
+                    label: ( localize(15623, "&&Retry")),
                     run: () => this.workspaceProvider.open(workspace, options)
                 }],
                 cancelButton: true
@@ -502,6 +509,7 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         }
     }
     async moveTop(targetWindow) {}
+    async setWindowDimmed(_targetWindow, _dimmed) {}
     async getCursorScreenPoint() {
         return undefined;
     }
@@ -599,6 +607,15 @@ let BrowserHostService = class BrowserHostService extends Disposable {
     async getNativeWindowHandle(_windowId) {
         return undefined;
     }
+    async showToast(options, token) {
+        return showBrowserToast({
+            onDidCreateToast: disposable => this.activeToasts.add(disposable),
+            onDidDisposeToast: disposable => this.activeToasts.deleteAndDispose(disposable)
+        }, options, token);
+    }
+    async clearToasts() {
+        this.activeToasts.clearAndDisposeAll();
+    }
 };
 BrowserHostService.__decorator = ( __decorate([memoize], BrowserHostService.prototype, "onDidChangeFocus", null));
 BrowserHostService.__decorator = ( __decorate([memoize], BrowserHostService.prototype, "onDidChangeActiveWindow", null));

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

@@ -0,0 +1,8 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IToastOptions, IToastResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host";
+export interface IShowToastController {
+    onDidCreateToast: (toast: IDisposable) => void;
+    onDidDisposeToast: (toast: IDisposable) => void;
+}
+export declare function showBrowserToast(controller: IShowToastController, options: IToastOptions, token: CancellationToken): Promise<IToastResult>;

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

@@ -0,0 +1,74 @@
+
+import { addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+
+async function showBrowserToast(controller, options, token) {
+    const toast = await triggerBrowserToast(options.title, {
+        detail: options.body,
+        sticky: !options.silent
+    });
+    if (!toast) {
+        return {
+            supported: false,
+            clicked: false
+        };
+    }
+    const disposables = ( new DisposableStore());
+    controller.onDidCreateToast(toast);
+    const cts = ( new CancellationTokenSource(token));
+    disposables.add(toDisposable(() => {
+        controller.onDidDisposeToast(toast);
+        toast.dispose();
+        cts.dispose(true);
+    }));
+    return ( new Promise(r => {
+        const resolve = result => {
+            r(result);
+            disposables.dispose();
+        };
+        disposables.add(cts.token.onCancellationRequested(() => resolve({
+            supported: true,
+            clicked: false
+        })));
+        Event.once(toast.onClick)(() => resolve({
+            supported: true,
+            clicked: true
+        }));
+        Event.once(toast.onClose)(() => resolve({
+            supported: true,
+            clicked: false
+        }));
+        Event.once(toast.onError)(() => resolve({
+            supported: false,
+            clicked: false
+        }));
+    }));
+}
+async function triggerBrowserToast(message, options) {
+    const permission = await Notification.requestPermission();
+    if (permission !== "granted") {
+        return;
+    }
+    const disposables = ( new DisposableStore());
+    const notification = ( new Notification(message, {
+        body: options?.detail,
+        requireInteraction: options?.sticky
+    }));
+    const onClick = disposables.add(( new Emitter()));
+    const onClose = disposables.add(( new Emitter()));
+    const onError = disposables.add(( new Emitter()));
+    disposables.add(addDisposableListener(notification, "click", () => onClick.fire()));
+    disposables.add(addDisposableListener(notification, "close", () => onClose.fire()));
+    disposables.add(addDisposableListener(notification, "error", () => onError.fire()));
+    disposables.add(toDisposable(() => notification.close()));
+    return {
+        onClick: onClick.event,
+        onClose: onClose.event,
+        onError: onError.event,
+        dispose: () => disposables.dispose()
+    };
+}
+
+export { showBrowserToast };