@codingame/monaco-vscode-extensions-service-override 10.0.1 → 10.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "10.0.1",
+  "version": "10.0.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.0.1",
-    "@codingame/monaco-vscode-files-service-override": "10.0.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.2",
+    "@codingame/monaco-vscode-files-service-override": "10.0.2"
   }
 }

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js

@@ -11,9 +11,9 @@ import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vs
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 
-const notFound = (id) => ( localize(9904, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(9912, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    9905,
+    9913,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -50,7 +50,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(9906, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(9914, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -65,7 +65,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localize(9907, "Installing extensions on {0}...", this.location)) : ( localize(9908, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(9915, "Installing extensions on {0}...", this.location)) : ( localize(9916, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -108,11 +108,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(9909, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(9917, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( (new Error(localize(9910, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( (new Error(localize(9918, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -124,7 +124,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            9911,
+            9919,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -141,11 +141,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(9912, "No extension to update")));
+            this.logger.info(( localize(9920, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            9913,
+            9921,
             "Updating extensions: {0}",
             ( (extensionsToUpdate.map(ext => ext.extension.identifier.id))).join(', ')
         )));
@@ -153,7 +153,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
                 this.logger.error(( localize(
-                    9914,
+                    9922,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
@@ -161,7 +161,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             else {
                 this.logger.info(( localize(
-                    9915,
+                    9923,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -175,7 +175,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        9916,
+                        9924,
                         "Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.",
                         id,
                         installedExtension.manifest.version,
@@ -184,7 +184,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(9917, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(9925, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
             }
@@ -218,24 +218,24 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        9917,
+                        9925,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    9918,
+                    9926,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(9919, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(9920, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(9927, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(9928, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(9921, "Installing extension '{0}' v{1}...", id, version)) : ( localize(9922, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(9929, "Installing extension '{0}' v{1}...", id, version)) : ( localize(9930, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -247,7 +247,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        9923,
+                        9931,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -256,7 +256,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 else {
                     this.logger.info(( localize(
-                        9924,
+                        9932,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -275,11 +275,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         if (valid) {
             try {
                 await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
-                this.logger.info(( localize(9925, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(9933, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(9926, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(9934, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -314,7 +314,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && semverExports.gt(local.manifest.version, manifest.version));
             if (newer) {
                 this.logger.info(( localize(
-                    9927,
+                    9935,
                     "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.",
                     newer.identifier.id,
                     newer.manifest.version,
@@ -342,7 +342,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( (extensionsToUninstall.some(e => e.type === 0 )))) {
                 this.logger.info(( localize(
-                    9928,
+                    9936,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -350,26 +350,26 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( (extensionsToUninstall.some(e => e.isBuiltin)))) {
                 this.logger.info(( localize(
-                    9929,
+                    9937,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(9930, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(9938, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    9931,
+                    9939,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(9932, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(9940, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -387,7 +387,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(9933, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(9934, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(9941, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(9942, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( (__decorate([

package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js

@@ -192,7 +192,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         if (options.clearSessionPreference) {
             this._removeAccountPreference(extensionId, providerId, scopes);
         }
-        const matchingAccountPreferenceSession = this._getAccountPreference(extensionId, providerId, scopes, sessions);
+        const matchingAccountPreferenceSession =
+        options.account
+            ? sessions[0]
+            : this._getAccountPreference(extensionId, providerId, scopes, sessions);
         if (!options.forceNewSession && sessions.length) {
             if (matchingAccountPreferenceSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, extensionId)) {
                 return matchingAccountPreferenceSession;

package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js

@@ -288,7 +288,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         if (_editable) {
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
-                e.veto(true, ( localize(9948, "A custom editor for '{0}' is open.", this.name)));
+                e.veto(true, ( localize(9956, "A custom editor for '{0}' is open.", this.name)));
             }));
         }
         if (startDirty) {
@@ -355,7 +355,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: 0 ,
             resource: this._editorResource,
-            label: label ?? ( localize(9949, "Edit")),
+            label: label ?? ( localize(9957, "Edit")),
             code: 'undoredo.customEditorEdit',
             undo: () => this.undo(),
             redo: () => this.redo(),

package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js

@@ -103,7 +103,7 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 				<meta http-equiv="Content-Security-Policy" content="default-src 'none';">
 			</head>
-			<body>${( localize(9903, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+			<body>${( localize(9911, "An error occurred while loading view: {0}", escape(viewType)))}</body>
 		</html>`;
     }
 };