@codingame/monaco-vscode-user-data-profile-service-override 6.0.3 → 7.0.1

package/vscode/src/vs/workbench/services/userDataProfile/browser/extensionsResource.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { GlobalExtensionEnablementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionEnablementService';
@@ -106,7 +107,7 @@ let ExtensionsResource = class ExtensionsResource {
     toContent(extensions, exclude) {
         return JSON.stringify(exclude?.length ? extensions.filter(e => !exclude.includes(e.identifier.id.toLowerCase())) : extensions);
     }
-    async apply(content, profile) {
+    async apply(content, profile, progress, token) {
         return this.withProfileScopedServices(profile, async (extensionEnablementService) => {
             const profileExtensions = await this.getProfileExtensions(content);
             const installedExtensions = await this.extensionManagementService.getInstalled(undefined, profile.extensionsResource);
@@ -164,7 +165,23 @@ let ExtensionsResource = class ExtensionsResource {
                     }
                 }))));
                 if (installExtensionInfos.length) {
-                    await this.extensionManagementService.installGalleryExtensions(installExtensionInfos);
+                    if (token) {
+                        for (const installExtensionInfo of installExtensionInfos) {
+                            if (token.isCancellationRequested) {
+                                return;
+                            }
+                            progress?.(( localizeWithPath(
+                                _moduleId,
+                                0,
+                                "Installing extension {0}...",
+                                installExtensionInfo.extension.displayName ?? installExtensionInfo.extension.identifier.id
+                            )));
+                            await this.extensionManagementService.installFromGallery(installExtensionInfo.extension, installExtensionInfo.options);
+                        }
+                    }
+                    else {
+                        await this.extensionManagementService.installGalleryExtensions(installExtensionInfos);
+                    }
                 }
                 this.logService.info(`Importing Profile (${profile.name}): Finished installing extensions.`);
             }
@@ -247,7 +264,7 @@ class ExtensionsResourceTreeItem {
     constructor() {
         this.type = ProfileResourceType.Extensions;
         this.handle = ProfileResourceType.Extensions;
-        this.label = { label: ( localizeWithPath(_moduleId, 0, "Extensions")) };
+        this.label = { label: ( localizeWithPath(_moduleId, 1, "Extensions")) };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
         this.contextValue = ProfileResourceType.Extensions;
         this.excludedExtensions = ( (new Set()));
@@ -260,7 +277,7 @@ class ExtensionsResourceTreeItem {
                 handle: e.identifier.id.toLowerCase(),
                 parent: this,
                 label: { label: e.displayName || e.identifier.id },
-                description: e.disabled ? ( localizeWithPath(_moduleId, 1, "Disabled")) : undefined,
+                description: e.disabled ? ( localizeWithPath(_moduleId, 2, "Disabled")) : undefined,
                 collapsibleState: TreeItemCollapsibleState.None,
                 checkbox: that.checkbox ? {
                     get isChecked() { return !( (that.excludedExtensions.has(e.identifier.id.toLowerCase()))); },
@@ -272,11 +289,12 @@ class ExtensionsResourceTreeItem {
                             that.excludedExtensions.add(e.identifier.id.toLowerCase());
                         }
                     },
-                    tooltip: ( localizeWithPath(_moduleId, 2, "Select {0} Extension", e.displayName || e.identifier.id)),
+                    tooltip: ( localizeWithPath(_moduleId, 3, "Select {0} Extension", e.displayName || e.identifier.id)),
                     accessibilityInformation: {
-                        label: ( localizeWithPath(_moduleId, 2, "Select {0} Extension", e.displayName || e.identifier.id)),
+                        label: ( localizeWithPath(_moduleId, 3, "Select {0} Extension", e.displayName || e.identifier.id)),
                     }
                 } : undefined,
+                themeIcon: Codicon.extensions,
                 command: {
                     id: 'extension.open',
                     title: '',