@codingame/monaco-vscode-extension-gallery-service-override 6.0.3 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "6.0.3",
+  "version": "7.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.0"
   }
 }

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

@@ -13,6 +13,7 @@ import { isTargetPlatformCompatible, ExtensionManagementError, ExtensionManageme
 import { IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { areSameExtensions, ExtensionKey, getGalleryExtensionId, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { isApplicationScopedExtension, ExtensionType } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { areApiProposalsCompatible } from 'vscode/vscode/vs/platform/extensions/common/extensionValidator';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -92,7 +93,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 installableExtensions.push({ ...compatible, options });
             }
             catch (error) {
-                results.push({ identifier: extension.identifier, operation: InstallOperation.Install, source: extension, error });
+                results.push({ identifier: extension.identifier, operation: InstallOperation.Install, source: extension, error, profileLocation: options.profileLocation ?? this.getCurrentExtensionsManifestLocation() });
             }
         }))));
         if (installableExtensions.length) {
@@ -117,7 +118,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 const existing = (await this.getInstalled(ExtensionType.User, profile.extensionsResource))
                     .find(e => areSameExtensions(e.identifier, extension.identifier));
                 if (existing) {
-                    this._onDidUpdateExtensionMetadata.fire(existing);
+                    this._onDidUpdateExtensionMetadata.fire({ local: existing, profileLocation: profile.extensionsResource });
                 }
                 else {
                     this._onDidUninstallExtension.fire({ identifier: extension.identifier, profileLocation: profile.extensionsResource });
@@ -154,7 +155,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             const key = `${getGalleryExtensionId(manifest.publisher, manifest.name)}-${( (options.profileLocation.toString()))}`;
             installingExtensionsMap.set(key, { task: installExtensionTask, root });
             this._onInstallExtension.fire({ identifier: installExtensionTask.identifier, source: extension, profileLocation: options.profileLocation });
-            this.logService.info('Installing extension:', installExtensionTask.identifier.id, ( (options.profileLocation.toString())));
+            this.logService.info('Installing extension:', installExtensionTask.identifier.id, options);
             if (!URI.isUri(extension)) {
                 this.installingExtensions.set(getInstallExtensionTaskKey(extension, options.profileLocation), { task: installExtensionTask, waitingTasks: [] });
             }
@@ -489,17 +490,27 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
             compatibleExtension = await this.getCompatibleVersion(extension, sameVersion, installPreRelease, productVersion);
             if (!compatibleExtension) {
-                if (!installPreRelease && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
+                const incompatibleApiProposalsMessages = [];
+                if (!areApiProposalsCompatible(extension.properties.enabledApiProposals ?? [], incompatibleApiProposalsMessages)) {
                     throw ( (new ExtensionManagementError(localizeWithPath(
                         _moduleId,
                         4,
+                        "Can't install '{0}' extension. {1}",
+                        extension.displayName ?? extension.identifier.id,
+                        incompatibleApiProposalsMessages[0]
+                    ), ExtensionManagementErrorCode.IncompatibleApi)));
+                }
+                if (!installPreRelease && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
+                    throw ( (new ExtensionManagementError(localizeWithPath(
+                        _moduleId,
+                        5,
                         "Can't install release version of '{0}' extension because it has no release version.",
                         extension.displayName ?? extension.identifier.id
                     ), ExtensionManagementErrorCode.ReleaseVersionNotFound)));
                 }
                 throw ( (new ExtensionManagementError(localizeWithPath(
                     _moduleId,
-                    5,
+                    6,
                     "Can't install '{0}' extension because it is not compatible with the current version of {1} (version {2}).",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -673,7 +684,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if (dependents.length === 1) {
                 return ( localizeWithPath(
                     _moduleId,
-                    6,
+                    7,
                     "Cannot uninstall '{0}' extension. '{1}' extension depends on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name
@@ -682,7 +693,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if (dependents.length === 2) {
                 return ( localizeWithPath(
                     _moduleId,
-                    7,
+                    8,
                     "Cannot uninstall '{0}' extension. '{1}' and '{2}' extensions depend on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -691,7 +702,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
             return ( localizeWithPath(
                 _moduleId,
-                8,
+                9,
                 "Cannot uninstall '{0}' extension. '{1}', '{2}' and other extension depend on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -701,7 +712,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (dependents.length === 1) {
             return ( localizeWithPath(
                 _moduleId,
-                9,
+                10,
                 "Cannot uninstall '{0}' extension . It includes uninstalling '{1}' extension and '{2}' extension depends on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -712,7 +723,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (dependents.length === 2) {
             return ( localizeWithPath(
                 _moduleId,
-                10,
+                11,
                 "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}' and '{3}' extensions depend on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -723,7 +734,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         return ( localizeWithPath(
             _moduleId,
-            11,
+            12,
             "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}', '{3}' and other extensions depend on this.",
             extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
             dependingExtension.manifest.displayName

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

@@ -11,7 +11,7 @@ import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/commo
 import { getTargetPlatform, SortBy, SortOrder, toTargetPlatform, WEB_EXTENSION_TAG, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ExtensionGalleryErrorCode, ExtensionGalleryError, StatisticType, InstallOperation } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { adoptToGalleryExtensionId, getGalleryExtensionId, areSameExtensions, getGalleryExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { TargetPlatform } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import { isEngineValid } from 'vscode/vscode/vs/platform/extensions/common/extensionValidator';
+import { isEngineValid, areApiProposalsCompatible } from 'vscode/vscode/vs/platform/extensions/common/extensionValidator';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
@@ -69,6 +69,7 @@ const PropertyType = {
     ExtensionPack: 'Microsoft.VisualStudio.Code.ExtensionPack',
     Engine: 'Microsoft.VisualStudio.Code.Engine',
     PreRelease: 'Microsoft.VisualStudio.Code.PreRelease',
+    EnabledApiProposals: 'Microsoft.VisualStudio.Code.EnabledApiProposals',
     LocalizedLanguages: 'Microsoft.VisualStudio.Code.LocalizedLanguages',
     WebExtension: 'Microsoft.VisualStudio.Code.WebExtension',
     SponsorLink: 'Microsoft.VisualStudio.Code.SponsorLink',
@@ -190,6 +191,11 @@ function isPreReleaseVersion(version) {
     const values = version.properties ? version.properties.filter(p => p.key === PropertyType.PreRelease) : [];
     return values.length > 0 && values[0].value === 'true';
 }
+function getEnabledApiProposals(version) {
+    const values = version.properties ? version.properties.filter(p => p.key === PropertyType.EnabledApiProposals) : [];
+    const value = (values.length > 0 && values[0].value) || '';
+    return value ? value.split(',') : [];
+}
 function getLocalizedLanguages(version) {
     const values = version.properties ? version.properties.filter(p => p.key === PropertyType.LocalizedLanguages) : [];
     const value = (values.length > 0 && values[0].value) || '';
@@ -286,6 +292,7 @@ function toExtension(galleryExtension, version, allTargetPlatforms, queryContext
             dependencies: getExtensions(version, PropertyType.Dependency),
             extensionPack: getExtensions(version, PropertyType.ExtensionPack),
             engine: getEngine(version),
+            enabledApiProposals: getEnabledApiProposals(version),
             localizedLanguages: getLocalizedLanguages(version),
             targetPlatform: getTargetPlatformForExtensionVersion(version),
             isPreReleaseVersion: isPreReleaseVersion(version)
@@ -312,6 +319,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         this.extensionsGalleryUrl = isPPEEnabled ? config.servicePPEUrl : config?.serviceUrl;
         this.extensionsGallerySearchUrl = isPPEEnabled ? undefined : config?.searchUrl;
         this.extensionsControlUrl = config?.controlUrl;
+        this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
         this.commonHeadersPromise = resolveMarketplaceHeaders(productService.version, productService, this.environmentService, this.configurationService, this.fileService, storageService, this.telemetryService);
     }
     api(path = '') {
@@ -391,7 +399,22 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             }
             engine = manifest.engines.vscode;
         }
-        return isEngineValid(engine, productVersion.version, productVersion.date);
+        if (!isEngineValid(engine, productVersion.version, productVersion.date)) {
+            return false;
+        }
+        if (!this.areApiProposalsCompatible(extension.identifier, extension.properties.enabledApiProposals)) {
+            return false;
+        }
+        return true;
+    }
+    areApiProposalsCompatible(extensionIdentifier, enabledApiProposals) {
+        if (!enabledApiProposals) {
+            return true;
+        }
+        if (!this.extensionsEnabledWithApiProposalVersion.includes(extensionIdentifier.id.toLowerCase())) {
+            return true;
+        }
+        return areApiProposalsCompatible(enabledApiProposals);
     }
     async isValidVersion(extension, rawGalleryExtensionVersion, versionType, compatible, allTargetPlatforms, targetPlatform, productVersion = { version: this.productService.version, date: this.productService.date }) {
         if (!isTargetPlatformCompatible(getTargetPlatformForExtensionVersion(rawGalleryExtensionVersion), allTargetPlatforms, targetPlatform)) {
@@ -547,7 +570,10 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             if (version && rawGalleryExtensionVersion.version !== version) {
                 continue;
             }
-            if (await this.isValidVersion(getGalleryExtensionId(rawGalleryExtension.publisher.publisherName, rawGalleryExtension.extensionName), rawGalleryExtensionVersion, includePreRelease ? 'any' : 'release', criteria.compatible, allTargetPlatforms, criteria.targetPlatform, criteria.productVersion)) {
+            if (await this.isValidVersion(extensionIdentifier.id, rawGalleryExtensionVersion, includePreRelease ? 'any' : 'release', criteria.compatible, allTargetPlatforms, criteria.targetPlatform, criteria.productVersion)) {
+                if (criteria.compatible && !this.areApiProposalsCompatible(extensionIdentifier, getEnabledApiProposals(rawGalleryExtensionVersion))) {
+                    return null;
+                }
                 return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, queryContext);
             }
             if (version && rawGalleryExtensionVersion.version === version) {
@@ -731,15 +757,15 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         return '';
     }
-    async getAllCompatibleVersions(extension, includePreRelease, targetPlatform) {
+    async getAllCompatibleVersions(extensionIdentifier, includePreRelease, targetPlatform) {
         let query = ( new Query())
             .withFlags(Flags.IncludeVersions, Flags.IncludeCategoryAndTags, Flags.IncludeFiles, Flags.IncludeVersionProperties)
             .withPage(1, 1);
-        if (extension.identifier.uuid) {
-            query = query.withFilter(FilterType.ExtensionId, extension.identifier.uuid);
+        if (extensionIdentifier.uuid) {
+            query = query.withFilter(FilterType.ExtensionId, extensionIdentifier.uuid);
         }
         else {
-            query = query.withFilter(FilterType.ExtensionName, extension.identifier.id);
+            query = query.withFilter(FilterType.ExtensionName, extensionIdentifier.id);
         }
         const { galleryExtensions } = await this.queryRawGalleryExtensions(query, CancellationToken.None);
         if (!galleryExtensions.length) {
@@ -752,7 +778,8 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         const validVersions = [];
         await Promise.all(( galleryExtensions[0].versions.map(async (version) => {
             try {
-                if (await this.isValidVersion(extension.identifier.id, version, includePreRelease ? 'any' : 'release', true, allTargetPlatforms, targetPlatform)) {
+                if ((await this.isValidVersion(extensionIdentifier.id, version, includePreRelease ? 'any' : 'release', true, allTargetPlatforms, targetPlatform))
+                    && this.areApiProposalsCompatible(extensionIdentifier, getEnabledApiProposals(version))) {
                     validVersions.push(version);
                 }
             }
@@ -821,6 +848,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         const malicious = [];
         const deprecated = {};
         const search = [];
+        const extensionsEnabledWithPreRelease = [];
         if (result) {
             for (const id of result.malicious) {
                 malicious.push({ id });
@@ -852,8 +880,13 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                     search.push(s);
                 }
             }
+            if (Array.isArray(result.extensionsEnabledWithPreRelease)) {
+                for (const id of result.extensionsEnabledWithPreRelease) {
+                    extensionsEnabledWithPreRelease.push(id.toLowerCase());
+                }
+            }
         }
-        return { malicious, deprecated, search };
+        return { malicious, deprecated, search, extensionsEnabledWithPreRelease };
     }
 };
 AbstractExtensionGalleryService = ( __decorate([

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

@@ -30,7 +30,7 @@ class ExtensionManagementChannelClient extends Disposable {
         )))));
         this._register(this.channel.listen('onUninstallExtension')(e => this.fireEvent(this._onUninstallExtension, { ...e, profileLocation: URI.revive(e.profileLocation) })));
         this._register(this.channel.listen('onDidUninstallExtension')(e => this.fireEvent(this._onDidUninstallExtension, { ...e, profileLocation: URI.revive(e.profileLocation) })));
-        this._register(this.channel.listen('onDidUpdateExtensionMetadata')(e => this._onDidUpdateExtensionMetadata.fire(transformIncomingExtension(e, null))));
+        this._register(this.channel.listen('onDidUpdateExtensionMetadata')(e => this.fireEvent(this._onDidUpdateExtensionMetadata, { profileLocation: URI.revive(e.profileLocation), local: transformIncomingExtension(e.local, null) })));
     }
     fireEvent(event, data) {
         event.fire(data);

package/vscode/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.js

@@ -288,12 +288,12 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                 else {
                     title = ( localizeWithPath(_moduleId, 7, "Extension is activating..."));
                 }
-                data.elementDisposables.push(this._hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.activationTime, title));
+                data.elementDisposables.push(this._hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.activationTime, title));
                 clearNode(data.msgContainer);
                 if (this._getUnresponsiveProfile(element.description.identifier)) {
                     const el = $('span', undefined, ...renderLabelWithIcons(` $(alert) Unresponsive`));
                     const extensionHostFreezTitle = ( localizeWithPath(_moduleId, 8, "Extension has caused the extension host to freeze."));
-                    data.elementDisposables.push(this._hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), el, extensionHostFreezTitle));
+                    data.elementDisposables.push(this._hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), el, extensionHostFreezTitle));
                     data.msgContainer.appendChild(el);
                 }
                 if (isNonEmptyArray(element.status.runtimeErrors)) {
@@ -350,7 +350,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                                     "Last request was {0}.",
                                     fromNow(accessData.current.lastAccessed, true, true)
                                 ));
-                                data.elementDisposables.push(this._hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), element, title));
+                                data.elementDisposables.push(this._hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element, title));
                             }
                             data.msgContainer.appendChild(element);
                         }

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionEditor.js

@@ -55,7 +55,7 @@ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/co
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { ExtensionFeaturesTab } from './extensionFeaturesTab.js';
-import { InstallDropdownAction, ExtensionRuntimeStateAction, ExtensionStatusLabelAction, ActionWithDropDownAction, UpdateAction, ToggleAutoUpdateForExtensionAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, SetLanguageAction, ClearLanguageAction, EnableDropDownAction, DisableDropDownAction, RemoteInstallAction, LocalInstallAction, WebInstallAction, InstallingLabelAction, UninstallAction, MigrateDeprecatedExtensionAction, InstallAnotherVersionAction, TogglePreReleaseExtensionAction, ExtensionEditorManageExtensionAction, ExtensionDropDownAction, ExtensionActionWithDropdownActionViewItem, ExtensionStatusAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
+import { InstallDropdownAction, ExtensionRuntimeStateAction, ExtensionStatusLabelAction, ButtonWithDropDownExtensionAction, ExtensionAction, UpdateAction, ToggleAutoUpdateForExtensionAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, SetLanguageAction, ClearLanguageAction, EnableDropDownAction, DisableDropDownAction, RemoteInstallAction, LocalInstallAction, WebInstallAction, InstallingLabelAction, UninstallAction, MigrateDeprecatedExtensionAction, InstallAnotherVersionAction, TogglePreReleaseExtensionAction, ExtensionEditorManageExtensionAction, DropDownExtensionAction, ButtonWithDropdownExtensionActionViewItem, ExtensionStatusAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { Delegate } from './extensionsList.js';
 import { ExtensionsTree, ExtensionData, ExtensionsGridView, getExtensions } from './extensionsViewer.js';
 import { ExtensionWidget, RemoteBadgeWidget, VerifiedPublisherWidget, InstallCountWidget, RatingsWidget, SponsorWidget, ExtensionStatusWidget, ExtensionRecommendationWidget, onClick } from './extensionsWidgets.js';
@@ -138,7 +138,7 @@ class VersionWidget extends ExtensionWithDifferentGalleryVersionWidget {
     constructor(container, hoverService) {
         super();
         this.element = append(container, $('code.version'));
-        this._register(hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.element, ( localizeWithPath(_moduleId, 0, "Extension Version"))));
+        this._register(hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.element, ( localizeWithPath(_moduleId, 0, "Extension Version"))));
         this.render();
     }
     render() {
@@ -199,26 +199,26 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         const details = append(header, $('.details'));
         const title = append(details, $('.title'));
         const name = append(title, $('span.name.clickable', { role: 'heading', tabIndex: 0 }));
-        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), name, ( localizeWithPath(_moduleId, 1, "Extension name"))));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), name, ( localizeWithPath(_moduleId, 1, "Extension name"))));
         const versionWidget = ( (new VersionWidget(title, this.hoverService)));
         const preview = append(title, $('span.preview'));
-        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), preview, ( localizeWithPath(_moduleId, 2, "Preview"))));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), preview, ( localizeWithPath(_moduleId, 2, "Preview"))));
         preview.textContent = ( localizeWithPath(_moduleId, 2, "Preview"));
         const builtin = append(title, $('span.builtin'));
         builtin.textContent = ( localizeWithPath(_moduleId, 3, "Built-in"));
         const subtitle = append(details, $('.subtitle'));
         const publisher = append(append(subtitle, $('.subtitle-entry')), $('.publisher.clickable', { tabIndex: 0 }));
-        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), publisher, ( localizeWithPath(_moduleId, 4, "Publisher"))));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), publisher, ( localizeWithPath(_moduleId, 4, "Publisher"))));
         publisher.setAttribute('role', 'button');
         const publisherDisplayName = append(publisher, $('.publisher-name'));
         const verifiedPublisherWidget = this.instantiationService.createInstance(VerifiedPublisherWidget, append(publisher, $('.verified-publisher')), false);
         const resource = append(append(subtitle, $('.subtitle-entry.resource')), $('', { tabIndex: 0 }));
         resource.setAttribute('role', 'button');
         const installCount = append(append(subtitle, $('.subtitle-entry')), $('span.install', { tabIndex: 0 }));
-        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), installCount, ( localizeWithPath(_moduleId, 5, "Install count"))));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), installCount, ( localizeWithPath(_moduleId, 5, "Install count"))));
         const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCount, false);
         const rating = append(append(subtitle, $('.subtitle-entry')), $('span.rating.clickable', { tabIndex: 0 }));
-        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), rating, ( localizeWithPath(_moduleId, 6, "Rating"))));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rating, ( localizeWithPath(_moduleId, 6, "Rating"))));
         rating.setAttribute('role', 'link');
         const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, rating, false);
         const sponsorWidget = this.instantiationService.createInstance(SponsorWidget, append(subtitle, $('.subtitle-entry')));
@@ -235,7 +235,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         const actions = [
             this.instantiationService.createInstance(ExtensionRuntimeStateAction),
             this.instantiationService.createInstance(ExtensionStatusLabelAction),
-            this.instantiationService.createInstance(ActionWithDropDownAction, 'extensions.updateActions', '', [[this.instantiationService.createInstance(UpdateAction, true)], [this.instantiationService.createInstance(ToggleAutoUpdateForExtensionAction, true, [true, 'onlyEnabledExtensions'])]]),
+            this.instantiationService.createInstance(ButtonWithDropDownExtensionAction, 'extensions.updateActions', ExtensionAction.PROMINENT_LABEL_ACTION_CLASS, [[this.instantiationService.createInstance(UpdateAction, true)], [this.instantiationService.createInstance(ToggleAutoUpdateForExtensionAction, true, [true, 'onlyEnabledExtensions'])]]),
             this.instantiationService.createInstance(SetColorThemeAction),
             this.instantiationService.createInstance(SetFileIconThemeAction),
             this.instantiationService.createInstance(SetProductIconThemeAction),
@@ -248,11 +248,11 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             this.instantiationService.createInstance(WebInstallAction),
             installAction,
             this.instantiationService.createInstance(InstallingLabelAction),
-            this.instantiationService.createInstance(ActionWithDropDownAction, 'extensions.uninstall', UninstallAction.UninstallLabel, [
+            this.instantiationService.createInstance(ButtonWithDropDownExtensionAction, 'extensions.uninstall', UninstallAction.UninstallClass, [
                 [
                     this.instantiationService.createInstance(MigrateDeprecatedExtensionAction, false),
                     this.instantiationService.createInstance(UninstallAction),
-                    this.instantiationService.createInstance(InstallAnotherVersionAction),
+                    this.instantiationService.createInstance(InstallAnotherVersionAction, null, true),
                 ]
             ]),
             this.instantiationService.createInstance(TogglePreReleaseExtensionAction),
@@ -265,16 +265,18 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         const actionsAndStatusContainer = append(details, $('.actions-status-container'));
         const extensionActionBar = this._register(( (new ActionBar(actionsAndStatusContainer, {
             actionViewItemProvider: (action, options) => {
-                if (action instanceof ExtensionDropDownAction) {
+                if (action instanceof DropDownExtensionAction) {
                     return action.createActionViewItem(options);
                 }
-                if (action instanceof ActionWithDropDownAction) {
+                if (action instanceof ButtonWithDropDownExtensionAction) {
                     return (
-                         (new ExtensionActionWithDropdownActionViewItem(
-                            action,
-                            { ...options, icon: true, label: true, menuActionsOrProvider: { getActions: () => action.menuActions }, menuActionClassNames: (action.class || '').split(' ') },
-                            this.contextMenuService
-                        ))
+                         (new ButtonWithDropdownExtensionActionViewItem(action, {
+                            ...options,
+                            icon: true,
+                            label: true,
+                            menuActionsOrProvider: { getActions: () => action.menuActions },
+                            menuActionClassNames: action.menuActionClassNames
+                        }, this.contextMenuService))
                     );
                 }
                 if (action instanceof ToggleAutoUpdateForExtensionAction) {
@@ -441,7 +443,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             const workspaceFolder = this.contextService.getWorkspaceFolder(location);
             if (workspaceFolder && extension.isWorkspaceScoped) {
                 template.resource.parentElement?.classList.add('clickable');
-                this.transientDisposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), template.resource, this.uriIdentityService.extUri.relativePath(workspaceFolder.uri, location)));
+                this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.resource, this.uriIdentityService.extUri.relativePath(workspaceFolder.uri, location)));
                 template.resource.textContent = ( localizeWithPath(_moduleId, 7, "Workspace Extension"));
                 this.transientDisposables.add(onClick(template.resource, () => {
                     this.viewsService.openView(VIEW_ID, true).then(() => this.explorerService.select(location, true));
@@ -449,7 +451,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             }
             else {
                 template.resource.parentElement?.classList.remove('clickable');
-                this.transientDisposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), template.resource, location.path));
+                this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.resource, location.path));
                 template.resource.textContent = ( localizeWithPath(_moduleId, 8, "Local Extension"));
             }
         }
@@ -632,7 +634,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         if (token?.isCancellationRequested) {
             return '';
         }
-        const content = await renderMarkdownDocument(contents, this.extensionService, this.languageService, extension.type !== ExtensionType.System, false, token);
+        const content = await renderMarkdownDocument(contents, this.extensionService, this.languageService, { shouldSanitize: extension.type !== ExtensionType.System, token });
         if (token?.isCancellationRequested) {
             return '';
         }
@@ -815,7 +817,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             for (const [label, uri] of resources) {
                 const resource = append(resourcesElement, $('a.resource', { tabindex: '0' }, label));
                 this.transientDisposables.add(onClick(resource, () => this.openerService.open(uri)));
-                this.transientDisposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), resource, ( (uri.toString()))));
+                this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), resource, ( (uri.toString()))));
             }
         }
     }

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.js

@@ -226,11 +226,21 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
             const installExtensions = async (isMachineScoped) => {
                 this.runAction(this.instantiationService.createInstance(SearchExtensionsAction, searchValue));
                 onDidInstallRecommendedExtensions(extensions);
+                const galleryExtensions = [], resourceExtensions = [];
+                for (const extension of extensions) {
+                    if (extension.gallery) {
+                        galleryExtensions.push(extension.gallery);
+                    }
+                    else if (extension.resourceExtension) {
+                        resourceExtensions.push(extension);
+                    }
+                }
                 await Promises.settled([
                     Promises.settled(( (extensions.map(
                         extension => this.extensionsWorkbenchService.open(extension, { pinned: true })
                     )))),
-                    this.extensionManagementService.installGalleryExtensions(( (extensions.map(e => ({ extension: e.gallery, options: { isMachineScoped } })))))
+                    galleryExtensions.length ? this.extensionManagementService.installGalleryExtensions(( (galleryExtensions.map(e => ({ extension: e, options: { isMachineScoped } }))))) : Promise.resolve(),
+                    resourceExtensions.length ? Promise.allSettled(( (resourceExtensions.map(r => this.extensionsWorkbenchService.install(r))))) : Promise.resolve()
                 ]);
             };
             choices.push({