@codingame/monaco-vscode-remote-agent-service-override 1.83.16 → 1.85.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-remote-agent-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0",
-    "@codingame/monaco-vscode-environment-service-override": "1.83.16"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0",
+    "@codingame/monaco-vscode-environment-service-override": "1.85.0-next.0"
   }
 }

package/vscode/src/vs/platform/files/common/diskFileSystemProviderClient.js

@@ -4,9 +4,9 @@ import { canceled } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable, DisposableStore, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { newWriteableStream } from 'monaco-editor/esm/vs/base/common/stream.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
 import { createFileSystemProviderError, FileSystemProviderErrorCode } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { reviveFileChanges } from 'vscode/vscode/vs/platform/files/common/watcher';
 
 class DiskFileSystemProviderClient extends Disposable {
     constructor(channel, extraCapabilities) {
@@ -121,7 +121,7 @@ class DiskFileSystemProviderClient extends Disposable {
         this._register(this.channel.listen('fileChange', [this.sessionId])(eventsOrError => {
             if (Array.isArray(eventsOrError)) {
                 const events = eventsOrError;
-                this._onDidChange.fire(( events.map(event => ({ resource: URI.revive(event.resource), type: event.type }))));
+                this._onDidChange.fire(reviveFileChanges(events));
             }
             else {
                 const error = eventsOrError;

package/vscode/src/vs/platform/remote/browser/browserSocketFactory.js

@@ -5,6 +5,7 @@ import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { SocketDiagnostics } from 'vscode/vscode/vs/base/parts/ipc/common/ipc.net';
 import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 
 class BrowserWebSocket extends Disposable {
     traceSocketEvent(type, data) {
@@ -75,7 +76,7 @@ class BrowserWebSocket extends Disposable {
             this.traceSocketEvent("close" , { code: e.code, reason: e.reason, wasClean: e.wasClean });
             this._isClosed = true;
             if (pendingErrorEvent) {
-                if (!window.navigator.onLine) {
+                if (!navigator.onLine) {
                     sendErrorNow(( new RemoteAuthorityResolverError(
                         'Browser is offline',
                         RemoteAuthorityResolverErrorCode.TemporarilyNotAvailable,
@@ -181,7 +182,7 @@ class BrowserSocketFactory {
     }
     connect({ host, port }, path, query, debugLabel) {
         return ( new Promise((resolve, reject) => {
-            const webSocketSchema = (/^https:/.test(window.location.href) ? 'wss' : 'ws');
+            const webSocketSchema = (/^https:/.test(mainWindow.location.href) ? 'wss' : 'ws');
             const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
             const errorListener = socket.onError(reject);
             socket.onOpen(() => {

package/vscode/src/vs/platform/remote/browser/remoteAuthorityResolverService.js

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 import { DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
 import * as errors from 'monaco-editor/esm/vs/base/common/errors.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
@@ -60,7 +61,7 @@ let RemoteAuthorityResolverService = class RemoteAuthorityResolverService extend
         const connectionToken = await Promise.resolve(this._connectionTokens.get(authority) || this._connectionToken);
         performance.mark(`code/didResolveConnectionToken/${authorityPrefix}`);
         this._logService.info(`Resolved connection token (${authorityPrefix}) after ${sw.elapsed()} ms`);
-        const defaultPort = (/^https:/.test(window.location.href) ? 443 : 80);
+        const defaultPort = (/^https:/.test(mainWindow.location.href) ? 443 : 80);
         const { host, port } = parseAuthorityWithOptionalPort(authority, defaultPort);
         const result = { authority: { authority, connectTo: ( new WebSocketRemoteConnection(host, port)), connectionToken } };
         RemoteAuthorities.set(authority, host, port);

package/vscode/src/vs/workbench/contrib/remote/common/remote.contribution.js

@@ -289,7 +289,7 @@ const extensionKindSchema = {
             markdownDescription: ( localizeWithPath(
                 'vs/workbench/contrib/remote/common/remote.contribution',
                 'remote.autoForwardPortsSource',
-                "Sets the source from which ports are automatically forwarded when {0} is true. On Windows and Mac remotes, the `process` and `hybrid` options have no effect and `output` will be used. Requires a reload to take effect.",
+                "Sets the source from which ports are automatically forwarded when {0} is true. On Windows and Mac remotes, the `process` and `hybrid` options have no effect and `output` will be used.",
                 '`#remote.autoForwardPorts#`'
             )),
             enum: ['process', 'output', 'hybrid'],