@codingame/monaco-vscode-api 1.83.1 → 1.83.3-next.0

package/vscode/src/vs/workbench/api/common/extHostWorkspace.js

@@ -10,7 +10,7 @@ import { Counter } from 'monaco-editor/esm/vs/base/common/numbers.js';
 import { basename, dirname, basenameOrAuthority, relativePath, ExtUri } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { compare } from 'monaco-editor/esm/vs/base/common/strings.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { Severity } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
@@ -238,12 +238,7 @@ let ExtHostWorkspace = class ExtHostWorkspace {
             this._proxy.$updateWorkspaceFolders(extName, index, deleteCount, validatedDistinctWorkspaceFoldersToAdd).then(undefined, error => {
                 this._unconfirmedWorkspace = undefined;
                 const options = { source: { identifier: extension.identifier, label: extension.displayName || extension.name } };
-                this._messageService.$showMessage(Severity.Error, ( localize(
-                    'updateerror',
-                    "Extension '{0}' failed to update workspace folders: {1}",
-                    extName,
-                    ( error.toString())
-                )), options, []);
+                this._messageService.$showMessage(Severity.Error, localizeWithPath('vs/workbench/api/common/extHostWorkspace', 'updateerror', "Extension '{0}' failed to update workspace folders: {1}", extName, ( error.toString())), options, []);
             });
         }
         this.trySetWorkspaceFolders(newWorkspaceFolders);

package/vscode/src/vs/workbench/api/common/extensionHostMain.js

@@ -21,7 +21,7 @@ class ErrorHandler {
         Error.stackTraceLimit = 100;
         const logService = accessor.get(ILogService);
         const rpcService = accessor.get(IExtHostRpcService);
-        const mainThreadErrors = ( (rpcService.getProxy(MainContext.MainThreadErrors)));
+        const mainThreadErrors = ( rpcService.getProxy(MainContext.MainThreadErrors));
         errors.setUnexpectedErrorHandler(err => {
             logService.error(err);
             const data = errors.transformErrorForSerialization(err);
@@ -33,19 +33,19 @@ class ErrorHandler {
         const rpcService = accessor.get(IExtHostRpcService);
         const extensionService = accessor.get(IExtHostExtensionService);
         const extensionTelemetry = accessor.get(IExtHostTelemetry);
-        const mainThreadExtensions = ( (rpcService.getProxy(MainContext.MainThreadExtensionService)));
-        const mainThreadErrors = ( (rpcService.getProxy(MainContext.MainThreadErrors)));
+        const mainThreadExtensions = ( rpcService.getProxy(MainContext.MainThreadExtensionService));
+        const mainThreadErrors = ( rpcService.getProxy(MainContext.MainThreadErrors));
         const map = await extensionService.getExtensionPathIndex();
-        const extensionErrors = ( (new WeakMap()));
+        const extensionErrors = ( new WeakMap());
         function prepareStackTraceAndFindExtension(error, stackTrace) {
-            if (( (extensionErrors.has(error)))) {
+            if (( extensionErrors.has(error))) {
                 return extensionErrors.get(error).stack;
             }
             let stackTraceMessage = '';
             let extension;
             let fileName;
             for (const call of stackTrace) {
-                stackTraceMessage += `\n\tat ${( ( call.toString()))}`;
+                stackTraceMessage += `\n\tat ${( call.toString())}`;
                 fileName = call.getFileName();
                 if (!extension && fileName) {
                     extension = map.findSubstr(URI.file(fileName));
@@ -91,16 +91,16 @@ class ErrorHandler {
 class ExtensionHostMain {
     constructor(protocol, initData, hostUtils, uriTransformer, messagePorts) {
         this._hostUtils = hostUtils;
-        this._rpcProtocol = ( (new RPCProtocol(protocol, null, uriTransformer)));
+        this._rpcProtocol = ( new RPCProtocol(protocol, null, uriTransformer));
         initData = ExtensionHostMain._transform(initData, this._rpcProtocol);
-        const services = ( (new ServiceCollection(...getSingletonServiceDescriptors())));
+        const services = ( new ServiceCollection(...getSingletonServiceDescriptors()));
         services.set(IExtHostInitDataService, { _serviceBrand: undefined, ...initData, messagePorts });
-        services.set(IExtHostRpcService, ( (new ExtHostRpcService(this._rpcProtocol))));
-        services.set(IURITransformerService, ( (new URITransformerService(uriTransformer))));
+        services.set(IExtHostRpcService, ( new ExtHostRpcService(this._rpcProtocol)));
+        services.set(IURITransformerService, ( new URITransformerService(uriTransformer)));
         services.set(IHostUtils, hostUtils);
-        services.set(ILogService, ( (new SyncDescriptor(ExtHostLogService, [true], true))));
-        services.set(ILoggerService, ( (new SyncDescriptor(ExtHostLoggerService, [], true))));
-        const instaService = ( (new InstantiationService(services, true)));
+        services.set(ILogService, ( new SyncDescriptor(ExtHostLogService, [true], true)));
+        services.set(ILoggerService, ( new SyncDescriptor(ExtHostLoggerService, [], true)));
+        const instaService = ( new InstantiationService(services, true));
         if (isWebWorker) {
             instaService.invokeFunction(ErrorHandler.installEarlyHandler);
         }
@@ -120,14 +120,12 @@ class ExtensionHostMain {
         }
     }
     async asBrowserUri(uri) {
-        const mainThreadExtensionsProxy = ( (this._rpcProtocol.getProxy(MainContext.MainThreadExtensionService)));
+        const mainThreadExtensionsProxy = ( this._rpcProtocol.getProxy(MainContext.MainThreadExtensionService));
         return URI.revive(await mainThreadExtensionsProxy.$asBrowserUri(uri));
     }
     async getAllStaticBrowserUris() {
-        const mainThreadExtensionsProxy = ( (this._rpcProtocol.getProxy(MainContext.MainThreadExtensionService)));
-        return (
-             ((await mainThreadExtensionsProxy.$getAllStaticBrowserUris()).map(([from, to]) => [URI.revive(from), URI.revive(to)]))
-        );
+        const mainThreadExtensionsProxy = ( this._rpcProtocol.getProxy(MainContext.MainThreadExtensionService));
+        return ( (await mainThreadExtensionsProxy.$getAllStaticBrowserUris()).map(([from, to]) => [URI.revive(from), URI.revive(to)]));
     }
     terminate(reason) {
         this._extensionService.terminate(reason);
@@ -142,7 +140,7 @@ class ExtensionHostMain {
         initData.environment.appRoot = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.appRoot));
         const extDevLocs = initData.environment.extensionDevelopmentLocationURI;
         if (extDevLocs) {
-            initData.environment.extensionDevelopmentLocationURI = ( (extDevLocs.map(url => URI.revive(rpcProtocol.transformIncomingURIs(url)))));
+            initData.environment.extensionDevelopmentLocationURI = ( extDevLocs.map(url => URI.revive(rpcProtocol.transformIncomingURIs(url))));
         }
         initData.environment.extensionTestsLocationURI = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.extensionTestsLocationURI));
         initData.environment.globalStorageHome = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.globalStorageHome));

package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js

@@ -6,7 +6,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'jsonValidation',
     defaultExtensionKind: ['workspace', 'web'],
     jsonSchema: {
-        description: ( nls.localize('contributes.jsonValidation', 'Contributes json schema configuration.')),
+        description: nls.localizeWithPath('vs/workbench/api/common/jsonValidationExtensionPoint', 'contributes.jsonValidation', 'Contributes json schema configuration.'),
         type: 'array',
         defaultSnippets: [{ body: [{ fileMatch: '${1:file.json}', url: '${2:url}' }] }],
         items: {
@@ -15,19 +15,13 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 fileMatch: {
                     type: ['string', 'array'],
-                    description: ( nls.localize(
-                        'contributes.jsonValidation.fileMatch',
-                        'The file pattern (or an array of patterns) to match, for example "package.json" or "*.launch". Exclusion patterns start with \'!\''
-                    )),
+                    description: nls.localizeWithPath('vs/workbench/api/common/jsonValidationExtensionPoint', 'contributes.jsonValidation.fileMatch', 'The file pattern (or an array of patterns) to match, for example "package.json" or "*.launch". Exclusion patterns start with \'!\''),
                     items: {
                         type: ['string']
                     }
                 },
                 url: {
-                    description: ( nls.localize(
-                        'contributes.jsonValidation.url',
-                        'A schema URL (\'http:\', \'https:\') or relative path to the extension folder (\'./\').'
-                    )),
+                    description: nls.localizeWithPath('vs/workbench/api/common/jsonValidationExtensionPoint', 'contributes.jsonValidation.url', 'A schema URL (\'http:\', \'https:\') or relative path to the extension folder (\'./\').'),
                     type: 'string'
                 }
             }
@@ -42,51 +36,32 @@ class JSONValidationExtensionPoint {
                 const collector = extension.collector;
                 const extensionLocation = extension.description.extensionLocation;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( nls.localize('invalid.jsonValidation', "'configuration.jsonValidation' must be a array")));
+                    collector.error(nls.localizeWithPath('vs/workbench/api/common/jsonValidationExtensionPoint', 'invalid.jsonValidation', "'configuration.jsonValidation' must be a array"));
                     return;
                 }
                 extensionValue.forEach(extension => {
                     if (!isString(extension.fileMatch) && !(Array.isArray(extension.fileMatch) && extension.fileMatch.every(isString))) {
-                        collector.error(( nls.localize(
-                            'invalid.fileMatch',
-                            "'configuration.jsonValidation.fileMatch' must be defined as a string or an array of strings."
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/api/common/jsonValidationExtensionPoint', 'invalid.fileMatch', "'configuration.jsonValidation.fileMatch' must be defined as a string or an array of strings."));
                         return;
                     }
                     const uri = extension.url;
                     if (!isString(uri)) {
-                        collector.error(( nls.localize(
-                            'invalid.url',
-                            "'configuration.jsonValidation.url' must be a URL or relative path"
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/api/common/jsonValidationExtensionPoint', 'invalid.url', "'configuration.jsonValidation.url' must be a URL or relative path"));
                         return;
                     }
                     if (uri.startsWith('./')) {
                         try {
                             const colorThemeLocation = resources.joinPath(extensionLocation, uri);
                             if (!resources.isEqualOrParent(colorThemeLocation, extensionLocation)) {
-                                collector.warn(( nls.localize(
-                                    'invalid.path.1',
-                                    "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
-                                    configurationExtPoint.name,
-                                    ( colorThemeLocation.toString()),
-                                    extensionLocation.path
-                                )));
+                                collector.warn(nls.localizeWithPath('vs/workbench/api/common/jsonValidationExtensionPoint', 'invalid.path.1', "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", configurationExtPoint.name, ( colorThemeLocation.toString()), extensionLocation.path));
                             }
                         }
                         catch (e) {
-                            collector.error(( nls.localize(
-                                'invalid.url.fileschema',
-                                "'configuration.jsonValidation.url' is an invalid relative URL: {0}",
-                                e.message
-                            )));
+                            collector.error(nls.localizeWithPath('vs/workbench/api/common/jsonValidationExtensionPoint', 'invalid.url.fileschema', "'configuration.jsonValidation.url' is an invalid relative URL: {0}", e.message));
                         }
                     }
                     else if (!/^[^:/?#]+:\/\//.test(uri)) {
-                        collector.error(( nls.localize(
-                            'invalid.url.schema',
-                            "'configuration.jsonValidation.url' must be an absolute URL or start with './'  to reference schemas located in the extension."
-                        )));
+                        collector.error(nls.localizeWithPath('vs/workbench/api/common/jsonValidationExtensionPoint', 'invalid.url.schema', "'configuration.jsonValidation.url' must be an absolute URL or start with './'  to reference schemas located in the extension."));
                         return;
                     }
                 });

package/vscode/src/vs/workbench/api/worker/extHostExtensionService.js

@@ -16,7 +16,7 @@ class WorkerRequireInterceptor extends RequireInterceptor {
                 break;
             }
         }
-        if (( (this._factories.has(request)))) {
+        if (( this._factories.has(request))) {
             return this._factories.get(request).load(request, parent, () => { throw new Error('CANNOT LOAD MODULE from here.'); });
         }
         return undefined;
@@ -47,7 +47,7 @@ class ExtHostExtensionService extends AbstractExtHostExtensionService {
             performance.mark(`code/extHost/willFetchExtensionCode/${extensionId}`);
         }
         const browserUri = URI.revive(await this._mainThreadExtensionsProxy.$asBrowserUri(module));
-        const response = await fetch(( (browserUri.toString(true))));
+        const response = await fetch(( browserUri.toString(true)));
         if (extensionId) {
             performance.mark(`code/extHost/didFetchExtensionCode/${extensionId}`);
         }
@@ -55,11 +55,11 @@ class ExtHostExtensionService extends AbstractExtHostExtensionService {
             throw new Error(response.statusText);
         }
         const source = await response.text();
-        const sourceURL = `${( ( module.toString(true)))}#vscode-extension`;
+        const sourceURL = `${( module.toString(true))}#vscode-extension`;
         const fullSource = `${source}\n//# sourceURL=${sourceURL}`;
         let initFn;
         try {
-            initFn = ( (new Function('module', 'exports', 'require', fullSource)));
+            initFn = ( new Function('module', 'exports', 'require', fullSource));
         }
         catch (err) {
             if (extensionId) {
@@ -68,7 +68,7 @@ class ExtHostExtensionService extends AbstractExtHostExtensionService {
             else {
                 console.error(`Loading code failed: ${err.message}`);
             }
-            console.error(`${( ( module.toString(true)))}${typeof err.line === 'number' ? ` line ${err.line}` : ''}${typeof err.column === 'number' ? ` column ${err.column}` : ''}`);
+            console.error(`${( module.toString(true))}${typeof err.line === 'number' ? ` line ${err.line}` : ''}${typeof err.column === 'number' ? ` column ${err.column}` : ''}`);
             console.error(err);
             throw err;
         }