@codingame/monaco-vscode-base-service-override 7.1.0 → 7.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.1.1"
   }
 }

package/vscode/src/vs/base/parts/request/browser/request.js

@@ -2,60 +2,92 @@ import { bufferToStream, VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { canceled } from 'vscode/vscode/vs/base/common/errors';
 import { OfflineError } from 'vscode/vscode/vs/base/parts/request/common/request';
 
-function request(options, token) {
-    if (options.proxyAuthorization) {
-        options.headers = {
-            ...(options.headers || {}),
-            'Proxy-Authorization': options.proxyAuthorization
-        };
+async function request(options, token) {
+    if (token.isCancellationRequested) {
+        throw canceled();
     }
-    const xhr = ( new XMLHttpRequest());
-    return ( new Promise((resolve, reject) => {
-        xhr.open(options.type || 'GET', options.url || '', true, options.user, options.password);
-        setRequestHeaders(xhr, options);
-        xhr.responseType = 'arraybuffer';
-        xhr.onerror = e => reject(navigator.onLine ? ( new Error(xhr.statusText && ('XHR failed: ' + xhr.statusText) || 'XHR failed')) : ( new OfflineError()));
-        xhr.onload = (e) => {
-            resolve({
-                res: {
-                    statusCode: xhr.status,
-                    headers: getResponseHeaders(xhr)
-                },
-                stream: bufferToStream(VSBuffer.wrap(( new Uint8Array(xhr.response))))
-            });
-        };
-        xhr.ontimeout = e => reject(( new Error(`XHR timeout: ${options.timeout}ms`)));
-        if (options.timeout) {
-            xhr.timeout = options.timeout;
-        }
-        xhr.send(options.data);
-        token.onCancellationRequested(() => {
-            xhr.abort();
-            reject(canceled());
+    const cancellation = ( new AbortController());
+    const disposable = token.onCancellationRequested(() => cancellation.abort());
+    const signal = options.timeout ? AbortSignal.any([
+        cancellation.signal,
+        AbortSignal.timeout(options.timeout),
+    ]) : cancellation.signal;
+    try {
+        const res = await fetch(options.url || '', {
+            method: options.type || 'GET',
+            headers: getRequestHeaders(options),
+            body: options.data,
+            signal,
         });
-    }));
+        return {
+            res: {
+                statusCode: res.status,
+                headers: getResponseHeaders(res),
+            },
+            stream: bufferToStream(VSBuffer.wrap(( new Uint8Array(await res.arrayBuffer())))),
+        };
+    }
+    catch (err) {
+        if (!navigator.onLine) {
+            throw ( new OfflineError());
+        }
+        if (err?.name === 'AbortError') {
+            throw canceled();
+        }
+        if (err?.name === 'TimeoutError') {
+            throw ( new Error(`Fetch timeout: ${options.timeout}ms`));
+        }
+        throw err;
+    }
+    finally {
+        disposable.dispose();
+    }
 }
-function setRequestHeaders(xhr, options) {
-    if (options.headers) {
+function getRequestHeaders(options) {
+    if (options.headers || options.user || options.password || options.proxyAuthorization) {
+        const headers = ( new Headers());
         outer: for (const k in options.headers) {
-            switch (k) {
-                case 'User-Agent':
-                case 'Accept-Encoding':
-                case 'Content-Length':
+            switch (k.toLowerCase()) {
+                case 'user-agent':
+                case 'accept-encoding':
+                case 'content-length':
                     continue outer;
             }
-            xhr.setRequestHeader(k, options.headers[k]);
+            const header = options.headers[k];
+            if (typeof header === 'string') {
+                headers.set(k, header);
+            }
+            else if (Array.isArray(header)) {
+                for (const h of header) {
+                    headers.append(k, h);
+                }
+            }
+        }
+        if (options.user || options.password) {
+            headers.set('Authorization', 'Basic ' + btoa(`${options.user || ''}:${options.password || ''}`));
+        }
+        if (options.proxyAuthorization) {
+            headers.set('Proxy-Authorization', options.proxyAuthorization);
         }
+        return headers;
     }
+    return undefined;
 }
-function getResponseHeaders(xhr) {
+function getResponseHeaders(res) {
     const headers = Object.create(null);
-    for (const line of xhr.getAllResponseHeaders().split(/\r\n|\n|\r/g)) {
-        if (line) {
-            const idx = line.indexOf(':');
-            headers[line.substr(0, idx).trim().toLowerCase()] = line.substr(idx + 1).trim();
+    res.headers.forEach((value, key) => {
+        if (headers[key]) {
+            if (Array.isArray(headers[key])) {
+                headers[key].push(value);
+            }
+            else {
+                headers[key] = [headers[key], value];
+            }
         }
-    }
+        else {
+            headers[key] = value;
+        }
+    });
     return headers;
 }
 

package/vscode/src/vs/platform/request/browser/requestService.js

@@ -18,6 +18,12 @@ let RequestService = class RequestService extends AbstractRequestService {
     async resolveProxy(url) {
         return undefined;
     }
+    async lookupAuthorization(authInfo) {
+        return undefined;
+    }
+    async lookupKerberosAuthorization(url) {
+        return undefined;
+    }
     async loadCertificates() {
         return [];
     }

package/vscode/src/vs/platform/request/common/requestIpc.js

@@ -12,6 +12,12 @@ class RequestChannelClient {
     async resolveProxy(url) {
         return this.channel.call('resolveProxy', [url]);
     }
+    async lookupAuthorization(authInfo) {
+        return this.channel.call('lookupAuthorization', [authInfo]);
+    }
+    async lookupKerberosAuthorization(url) {
+        return this.channel.call('lookupKerberosAuthorization', [url]);
+    }
     async loadCertificates() {
         return this.channel.call('loadCertificates');
     }

package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { parse } from 'vscode/vscode/vs/base/common/json';
 import { setProperty } from 'vscode/vscode/vs/base/common/jsonEdit';
 import { Queue } from 'vscode/vscode/vs/base/common/async';
@@ -13,7 +13,6 @@ import { JSONEditingErrorCode, JSONEditingError } from './jsonEditing.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
-const _moduleId = "vs/workbench/services/configuration/common/jsonEditingService";
 let JSONEditingService = class JSONEditingService {
     constructor(fileService, textModelResolverService, textFileService) {
         this.fileService = fileService;
@@ -107,9 +106,8 @@ let JSONEditingService = class JSONEditingService {
     toErrorMessage(error) {
         switch (error) {
             case JSONEditingErrorCode.ERROR_INVALID_FILE: {
-                return ( localizeWithPath(
-                    _moduleId,
-                    0,
+                return ( localize(
+                    1139,
                     "Unable to write into the file. Please open the file to correct errors/warnings in the file and try again."
                 ));
             }

package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js

@@ -9,7 +9,7 @@ import { createCSSRule, asCSSPropertyValue, removeCSSRulesContainingSelector, cr
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { isFalsyOrWhitespace } from 'vscode/vscode/vs/base/common/strings';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/platform/instantiation/common/extensions';
@@ -29,7 +29,6 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { getIconRegistry } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 
-const _moduleId = "vs/workbench/services/decorations/browser/decorationsService";
 class DecorationRule {
     static keyOf(data) {
         if (Array.isArray(data)) {
@@ -160,7 +159,7 @@ class DecorationStyles {
         const strikethrough = ( (data.some(d => d.strikethrough)));
         if (onlyChildren) {
             badgeClassName = rule.bubbleBadgeClassName;
-            tooltip = ( localizeWithPath(_moduleId, 0, "Contains emphasized items"));
+            tooltip = ( localize(1140, "Contains emphasized items"));
         }
         return {
             labelClassName,

package/vscode/src/vs/workbench/services/label/common/labelService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { dispose, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { sep, posix, win32 } from 'vscode/vscode/vs/base/common/path';
@@ -28,11 +28,10 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
 
-const _moduleId = "vs/workbench/services/label/common/labelService";
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'resourceLabelFormatters',
     jsonSchema: {
-        description: ( localizeWithPath(_moduleId, 0, 'Contributes resource label formatting rules.')),
+        description: ( localize(1141, 'Contributes resource label formatting rules.')),
         type: 'array',
         items: {
             type: 'object',
@@ -40,59 +39,53 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
             properties: {
                 scheme: {
                     type: 'string',
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        1,
+                    description: ( localize(
+                        1142,
                         'URI scheme on which to match the formatter on. For example "file". Simple glob patterns are supported.'
                     )),
                 },
                 authority: {
                     type: 'string',
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        2,
+                    description: ( localize(
+                        1143,
                         'URI authority on which to match the formatter on. Simple glob patterns are supported.'
                     )),
                 },
                 formatting: {
-                    description: ( localizeWithPath(_moduleId, 3, "Rules for formatting uri resource labels.")),
+                    description: ( localize(1144, "Rules for formatting uri resource labels.")),
                     type: 'object',
                     properties: {
                         label: {
                             type: 'string',
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                4,
+                            description: ( localize(
+                                1145,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: 'string',
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                5,
+                            description: ( localize(
+                                1146,
                                 "Separator to be used in the uri label display. '/' or '\' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: 'boolean',
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                6,
+                            description: ( localize(
+                                1147,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: 'boolean',
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                7,
+                            description: ( localize(
+                                1148,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: 'string',
-                            description: ( localizeWithPath(_moduleId, 8, "Suffix appended to the workspace label."))
+                            description: ( localize(1149, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -271,10 +264,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return ( localizeWithPath(_moduleId, 9, "Untitled (Workspace)"));
+            return ( localize(1150, "Untitled (Workspace)"));
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return ( localizeWithPath(_moduleId, 10, "Workspace"));
+            return ( localize(1151, "Workspace"));
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -286,16 +279,15 @@ let LabelService = class LabelService extends Disposable {
                 label = filename;
                 break;
             case Verbosity.LONG:
-                label = ( localizeWithPath(
-                    _moduleId,
-                    11,
+                label = ( localize(
+                    1152,
                     "{0} (Workspace)",
                     this.getUriLabel(joinPath(dirname(workspaceUri), filename))
                 ));
                 break;
             case Verbosity.MEDIUM:
             default:
-                label = ( localizeWithPath(_moduleId, 12, "{0} (Workspace)", filename));
+                label = ( localize(1153, "{0} (Workspace)", filename));
                 break;
         }
         if (options?.verbose === Verbosity.SHORT) {