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

package/package.json

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

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/services/extensionManagement/browser/extensionBisect.js

@@ -138,11 +138,11 @@ let ExtensionBisectUi = class ExtensionBisectUi {
     }
     _showBisectPrompt() {
         const goodPrompt = {
-            label: ( localize(1156, "I can't reproduce")),
+            label: ( localize(1154, "I can't reproduce")),
             run: () => this._commandService.executeCommand('extension.bisect.next', false)
         };
         const badPrompt = {
-            label: ( localize(1157, "I can reproduce")),
+            label: ( localize(1155, "I can reproduce")),
             run: () => this._commandService.executeCommand('extension.bisect.next', true)
         };
         const stop = {
@@ -151,11 +151,11 @@ let ExtensionBisectUi = class ExtensionBisectUi {
         };
         const message = this._extensionBisectService.disabledCount === 1
             ? ( localize(
-            1158,
+            1156,
             "Extension Bisect is active and has disabled 1 extension. Check if you can still reproduce the problem and proceed by selecting from these options."
         ))
             : ( localize(
-            1159,
+            1157,
             "Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.",
             this._extensionBisectService.disabledCount
         ));
@@ -173,7 +173,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.start',
-            title: ( localize2(1160, 'Start Extension Bisect')),
+            title: ( localize2(1158, 'Start Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ( (ExtensionBisectUi.ctxIsBisectActive.negate())),
@@ -193,13 +193,13 @@ registerAction2(class extends Action2 {
         const extensionsBisect = accessor.get(IExtensionBisectService);
         const extensions = (await extensionManagement.getInstalled(1 )).filter(ext => extensionEnablementService.isEnabled(ext));
         const res = await dialogService.confirm({
-            message: ( localize(1161, "Extension Bisect")),
+            message: ( localize(1159, "Extension Bisect")),
             detail: ( localize(
-                1162,
+                1160,
                 "Extension Bisect will use binary search to find an extension that causes a problem. During the process the window reloads repeatedly (~{0} times). Each time you must confirm if you are still seeing problems.",
                 2 + Math.log2(extensions.length) | 0
             )),
-            primaryButton: ( localize(1163, "&&Start Extension Bisect"))
+            primaryButton: ( localize(1161, "&&Start Extension Bisect"))
         });
         if (res.confirmed) {
             await extensionsBisect.start(extensions);
@@ -211,7 +211,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.next',
-            title: ( localize2(1164, 'Continue Extension Bisect')),
+            title: ( localize2(1162, 'Continue Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive
@@ -245,8 +245,8 @@ registerAction2(class extends Action2 {
             return;
         }
         if (done.bad) {
-            await dialogService.info(( localize(1165, "Extension Bisect")), ( localize(
-                1166,
+            await dialogService.info(( localize(1163, "Extension Bisect")), ( localize(
+                1164,
                 "Extension Bisect is done but no extension has been identified. This might be a problem with {0}.",
                 productService.nameShort
             )));
@@ -254,15 +254,15 @@ registerAction2(class extends Action2 {
         else {
             const res = await dialogService.confirm({
                 type: Severity$1.Info,
-                message: ( localize(1165, "Extension Bisect")),
-                primaryButton: ( localize(1167, "&&Report Issue & Continue")),
-                cancelButton: ( localize(1168, "Continue")),
+                message: ( localize(1163, "Extension Bisect")),
+                primaryButton: ( localize(1165, "&&Report Issue & Continue")),
+                cancelButton: ( localize(1166, "Continue")),
                 detail: ( localize(
-                    1169,
+                    1167,
                     "Extension Bisect is done and has identified {0} as the extension causing the problem.",
                     done.id
                 )),
-                checkbox: { label: ( localize(1170, "Keep this extension disabled")), checked: true }
+                checkbox: { label: ( localize(1168, "Keep this extension disabled")), checked: true }
             });
             if (res.checkboxChecked) {
                 await extensionEnablementService.disableExtension({ id: done.id }, undefined);
@@ -277,28 +277,28 @@ registerAction2(class extends Action2 {
     async _checkForBad(dialogService, bisectService) {
         const { result } = await dialogService.prompt({
             type: Severity$1.Info,
-            message: ( localize(1171, "Extension Bisect")),
+            message: ( localize(1169, "Extension Bisect")),
             detail: ( localize(
-                1172,
+                1170,
                 "Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.",
                 bisectService.disabledCount
             )),
             buttons: [
                 {
-                    label: ( localize(1173, "I ca&&n't reproduce")),
+                    label: ( localize(1171, "I ca&&n't reproduce")),
                     run: () => false
                 },
                 {
-                    label: ( localize(1174, "I can &&reproduce")),
+                    label: ( localize(1172, "I can &&reproduce")),
                     run: () => true
                 },
                 {
-                    label: ( localize(1175, "&&Stop Bisect")),
+                    label: ( localize(1173, "&&Stop Bisect")),
                     run: () => undefined
                 }
             ],
             cancelButton: {
-                label: ( localize(1176, "&&Cancel Bisect")),
+                label: ( localize(1174, "&&Cancel Bisect")),
                 run: () => null
             }
         });
@@ -309,7 +309,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.stop',
-            title: ( localize2(1177, 'Stop Extension Bisect')),
+            title: ( localize2(1175, 'Stop Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js

@@ -170,14 +170,14 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                     this._remoteAgentService.getConnection()?.dispose();
                 }, {
                     id: 'join.disconnectRemote',
-                    label: ( localize(1143, "Disconnect Remote Agent")),
+                    label: ( localize(1141, "Disconnect Remote Agent")),
                     order: WillShutdownJoinerOrder.Last
                 });
             }
             else {
                 event.join(this._doStopExtensionHosts(), {
                     id: 'join.stopExtensionHosts',
-                    label: ( localize(1144, "Stopping Extension Hosts")),
+                    label: ( localize(1142, "Stopping Extension Hosts")),
                 });
             }
         }));
@@ -248,7 +248,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity$1.Error,
                 message: ( localize(
-                    1145,
+                    1143,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( (result.removedDueToLooping.map(e => `'${e.identifier.value}'`))).join(', ')
                 ))
@@ -402,7 +402,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity$1.Error,
                 message: ( localize(
-                    1145,
+                    1143,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( (result.removedDueToLooping.map(e => `'${e.identifier.value}'`))).join(', ')
                 ))
@@ -417,7 +417,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const extensionHostManager = this.findTestExtensionHost(this._environmentService.extensionTestsLocationURI);
         if (!extensionHostManager) {
             const msg = ( localize(
-                1146,
+                1144,
                 "No extension host found that can launch the test runner at {0}.",
                  (this._environmentService.extensionTestsLocationURI.toString())
             ));
@@ -587,7 +587,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                             vetoReasons.add(reason);
                         }
                     }).catch(error => {
-                        vetoReasons.add(( localize(1147, "{0} (Error: {1})", reason, toErrorMessage(error))));
+                        vetoReasons.add(( localize(1145, "{0} (Error: {1})", reason, toErrorMessage(error))));
                     });
                 }
             }
@@ -600,10 +600,10 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             if (!auto) {
                 const vetoReasonsArray = Array.from(vetoReasons);
                 this._logService.warn(`Extension host was not stopped because of veto (stop reason: ${reason}, veto reason: ${vetoReasonsArray.join(', ')})`);
-                await this._dialogService.warn(( localize(1148, "The following operation was blocked: {0}", reason)), vetoReasonsArray.length === 1 ?
-                    ( localize(1149, "The reason for blocking the operation: {0}", vetoReasonsArray[0])) :
+                await this._dialogService.warn(( localize(1146, "The following operation was blocked: {0}", reason)), vetoReasonsArray.length === 1 ?
+                    ( localize(1147, "The reason for blocking the operation: {0}", vetoReasonsArray[0])) :
                     ( localize(
-                        1150,
+                        1148,
                         "The reasons for blocking the operation:\n- {0}",
                         vetoReasonsArray.join('\n -')
                     )));
@@ -701,15 +701,15 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._remoteCrashTracker.registerCrash();
             if (this._remoteCrashTracker.shouldAutomaticallyRestart()) {
                 this._logService.info(`Automatically restarting the remote extension host.`);
-                this._notificationService.status(( localize(1151, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 });
+                this._notificationService.status(( localize(1149, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 });
                 this._startExtensionHostsIfNecessary(false, Array.from(( (this._allRequestedActivateEvents.keys()))));
             }
             else {
                 this._notificationService.prompt(Severity$1.Error, ( localize(
-                    1152,
+                    1150,
                     "Remote Extension host terminated unexpectedly 3 times within the last 5 minutes."
                 )), [{
-                        label: ( localize(1153, "Restart Remote Extension Host")),
+                        label: ( localize(1151, "Restart Remote Extension Host")),
                         run: () => {
                             this._startExtensionHostsIfNecessary(false, Array.from(( (this._allRequestedActivateEvents.keys()))));
                         }
@@ -1194,7 +1194,7 @@ class ActivationFeatureMarkdowneRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'activationEvents',
-    label: ( localize(1154, "Activation Events")),
+    label: ( localize(1152, "Activation Events")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js

@@ -107,7 +107,7 @@ class ApiProposalsMarkdowneRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'enabledApiProposals',
-    label: ( localize(1155, "API Proposals")),
+    label: ( localize(1153, "API Proposals")),
     access: {
         canToggle: false
     },