@codingame/monaco-vscode-host-service-override 2.2.1 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-host-service-override",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0"
   }
 }

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

@@ -8,7 +8,7 @@ import { pathsToEditors, isResourceEditorInput } from 'vscode/vscode/vs/workbenc
 import { whenEditorClosed } from 'vscode/vscode/vs/workbench/browser/editor';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { ModifierKeyEmitter, onDidRegisterWindow, trackFocus, getActiveDocument, getWindowId, disposableWindowInterval, EventType, addDisposableListener, detectFullscreen, addDisposableThrottledListener } from 'vscode/vscode/vs/base/browser/dom';
+import { ModifierKeyEmitter, onDidRegisterWindow, trackFocus, getActiveDocument, getWindowId, disposableWindowInterval, EventType, addDisposableListener, addDisposableThrottledListener, detectFullscreen } from 'vscode/vscode/vs/base/browser/dom';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
 import { memoize } from 'vscode/vscode/vs/base/common/decorators';
@@ -135,10 +135,14 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => {
             const windowId = getWindowId(window);
             const viewport = isIOS && window.visualViewport ? window.visualViewport  : window ;
+            const isFullScreen = () => {
+                const fullScreen = detectFullscreen(window);
+                return fullScreen !== null && !fullScreen.guess;
+            };
             for (const event of [EventType.FULLSCREEN_CHANGE, EventType.WK_FULLSCREEN_CHANGE]) {
-                disposables.add(addDisposableListener(window.document, event, () => emitter.fire({ windowId, fullscreen: !!detectFullscreen(window) })));
+                disposables.add(addDisposableListener(window.document, event, () => emitter.fire({ windowId, fullscreen: isFullScreen() })));
             }
-            disposables.add(addDisposableThrottledListener(viewport, EventType.RESIZE, () => emitter.fire({ windowId, fullscreen: !!detectFullscreen(window) }), undefined, isMacintosh ? 2000  : 800 ));
+            disposables.add(addDisposableThrottledListener(viewport, EventType.RESIZE, () => emitter.fire({ windowId, fullscreen: isFullScreen() }), undefined, isMacintosh ? 2000  : 800 ));
         }, { window: mainWindow, disposables: this._store }));
         return emitter.event;
     }
@@ -201,7 +205,7 @@ let BrowserHostService = class BrowserHostService extends Disposable {
                         this.doOpen(undefined, { payload: Array.from(environment.entries()) });
                     }
                 }
-                if (options?.diffMode && fileOpenables.length === 2) {
+                else if (options?.diffMode && fileOpenables.length === 2) {
                     const editors = coalesce(await pathsToEditors(fileOpenables, this.fileService, this.logService));
                     if (editors.length !== 2 || !isResourceEditorInput(editors[0]) || !isResourceEditorInput(editors[1])) {
                         return;