@codingame/monaco-vscode-extension-gallery-service-override 3.2.2 → 4.0.0

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

@@ -1,6 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { append, $, addDisposableListener, setParentFlowTo } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { CheckboxActionViewItem } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
@@ -33,15 +35,27 @@ import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { defaultCheckboxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { editorBackground, textLinkForeground, textLinkActiveForeground, buttonHoverBackground, buttonForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { textLinkForeground, textLinkActiveForeground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorBackground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import { buttonHoverBackground, buttonForeground } from 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { registerThemingParticipant, IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { ExtensionFeaturesTab } from './extensionFeaturesTab.js';
-import { InstallDropdownAction, ReloadAction, 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, 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 { Delegate } from './extensionsList.js';
 import { ExtensionsTree, ExtensionData, ExtensionsGridView, getExtensions } from './extensionsViewer.js';
 import { RemoteBadgeWidget, VerifiedPublisherWidget, InstallCountWidget, RatingsWidget, SponsorWidget, ExtensionStatusWidget, ExtensionWidget, ExtensionRecommendationWidget, onClick } from './extensionsWidgets.js';
 import { ExtensionContainers, VIEWLET_ID, IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
 import { renderMarkdownDocument, DEFAULT_MARKDOWN_STYLES } from 'vscode/vscode/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer';
 import { ShowCurrentReleaseNotesActionId } from 'vscode/vscode/vs/workbench/contrib/update/common/update';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED, IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
@@ -49,6 +63,9 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IExtensionRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 
 var ExtensionEditor_1;
 class NavBar extends Disposable {
@@ -107,11 +124,12 @@ class ExtensionWithDifferentGalleryVersionWidget extends ExtensionWidget {
 class VersionWidget extends ExtensionWithDifferentGalleryVersionWidget {
     constructor(container) {
         super();
-        this.element = append(container, $('code.version', { title: ( localizeWithPath(
+        this.element = append(container, $('code.version'));
+        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.element, ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionEditor',
             'extension version',
             "Extension Version"
-        )) }));
+        ))));
         this.render();
     }
     render() {
@@ -124,8 +142,8 @@ class VersionWidget extends ExtensionWithDifferentGalleryVersionWidget {
 let ExtensionEditor = class ExtensionEditor extends EditorPane {
     static { ExtensionEditor_1 = this; }
     static { this.ID = 'workbench.editor.extension'; }
-    constructor(telemetryService, instantiationService, paneCompositeService, extensionsWorkbenchService, extensionGalleryService, themeService, notificationService, openerService, extensionRecommendationsService, storageService, extensionService, webviewService, languageService, contextMenuService, contextKeyService) {
-        super(ExtensionEditor_1.ID, telemetryService, themeService, storageService);
+    constructor(group, telemetryService, instantiationService, paneCompositeService, extensionsWorkbenchService, extensionGalleryService, themeService, notificationService, openerService, extensionRecommendationsService, storageService, extensionService, webviewService, languageService, contextMenuService, contextKeyService, contextService, explorerService, viewsService, uriIdentityService) {
+        super(ExtensionEditor_1.ID, group, telemetryService, themeService, storageService);
         this.instantiationService = instantiationService;
         this.paneCompositeService = paneCompositeService;
         this.extensionsWorkbenchService = extensionsWorkbenchService;
@@ -138,6 +156,10 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         this.languageService = languageService;
         this.contextMenuService = contextMenuService;
         this.contextKeyService = contextKeyService;
+        this.contextService = contextService;
+        this.explorerService = explorerService;
+        this.viewsService = viewsService;
+        this.uriIdentityService = uriIdentityService;
         this._scopedContextKeyService = this._register(( new MutableDisposable()));
         this.initialScrollProgress = ( new Map());
         this.currentIdentifier = '';
@@ -166,17 +188,19 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         const remoteBadge = this.instantiationService.createInstance(RemoteBadgeWidget, iconContainer, true);
         const details = append(header, $('.details'));
         const title = append(details, $('.title'));
-        const name = append(title, $('span.name.clickable', { title: ( localizeWithPath(
+        const name = append(title, $('span.name.clickable', { role: 'heading', tabIndex: 0 }));
+        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), name, ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionEditor',
             'name',
             "Extension name"
-        )), role: 'heading', tabIndex: 0 }));
+        ))));
         const versionWidget = ( new VersionWidget(title));
-        const preview = append(title, $('span.preview', { title: ( localizeWithPath(
+        const preview = append(title, $('span.preview'));
+        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), preview, ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionEditor',
             'preview',
             "Preview"
-        )) }));
+        ))));
         preview.textContent = ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionEditor',
             'preview',
@@ -189,25 +213,30 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             "Built-in"
         ));
         const subtitle = append(details, $('.subtitle'));
-        const publisher = append(append(subtitle, $('.subtitle-entry')), $('.publisher.clickable', { title: ( localizeWithPath(
+        const publisher = append(append(subtitle, $('.subtitle-entry')), $('.publisher.clickable', { tabIndex: 0 }));
+        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), publisher, ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionEditor',
             'publisher',
             "Publisher"
-        )), tabIndex: 0 }));
+        ))));
         publisher.setAttribute('role', 'button');
         const publisherDisplayName = append(publisher, $('.publisher-name'));
         const verifiedPublisherWidget = this.instantiationService.createInstance(VerifiedPublisherWidget, append(publisher, $('.verified-publisher')), false);
-        const installCount = append(append(subtitle, $('.subtitle-entry')), $('span.install', { title: ( localizeWithPath(
+        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(setupCustomHover(getDefaultHoverDelegate('mouse'), installCount, ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionEditor',
             'install count',
             "Install count"
-        )), tabIndex: 0 }));
+        ))));
         const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCount, false);
-        const rating = append(append(subtitle, $('.subtitle-entry')), $('span.rating.clickable', { title: ( localizeWithPath(
+        const rating = append(append(subtitle, $('.subtitle-entry')), $('span.rating.clickable', { tabIndex: 0 }));
+        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), rating, ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionEditor',
             'rating',
             "Rating"
-        )), tabIndex: 0 }));
+        ))));
         rating.setAttribute('role', 'link');
         const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, rating, false);
         const sponsorWidget = this.instantiationService.createInstance(SponsorWidget, append(subtitle, $('.subtitle-entry')));
@@ -222,7 +251,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         const description = append(details, $('.description'));
         const installAction = this.instantiationService.createInstance(InstallDropdownAction);
         const actions = [
-            this.instantiationService.createInstance(ReloadAction),
+            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(SetColorThemeAction),
@@ -253,14 +282,14 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         ];
         const actionsAndStatusContainer = append(details, $('.actions-status-container'));
         const extensionActionBar = this._register(( new ActionBar(actionsAndStatusContainer, {
-            actionViewItemProvider: (action) => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof ExtensionDropDownAction) {
-                    return action.createActionViewItem();
+                    return action.createActionViewItem(options);
                 }
                 if (action instanceof ActionWithDropDownAction) {
                     return ( new ExtensionActionWithDropdownActionViewItem(
                         action,
-                        { icon: true, label: true, menuActionsOrProvider: { getActions: () => action.menuActions }, menuActionClassNames: (action.class || '').split(' ') },
+                        { ...options, icon: true, label: true, menuActionsOrProvider: { getActions: () => action.menuActions }, menuActionClassNames: (action.class || '').split(' ') },
                         this.contextMenuService
                     ));
                 }
@@ -268,7 +297,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
                     return ( new CheckboxActionViewItem(
                         undefined,
                         action,
-                        { icon: true, label: true, checkboxStyles: defaultCheckboxStyles }
+                        { ...options, icon: true, label: true, checkboxStyles: defaultCheckboxStyles }
                     ));
                 }
                 return undefined;
@@ -320,6 +349,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             preview,
             publisher,
             publisherDisplayName,
+            resource,
             rating,
             actionsAndStatusContainer,
             extensionActionBar,
@@ -368,6 +398,12 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         }
     }
     async getGalleryVersionToShow(extension, preRelease) {
+        if (extension.resourceExtension) {
+            return null;
+        }
+        if (extension.local?.source === 'resource') {
+            return null;
+        }
         if (isUndefined(preRelease)) {
             return null;
         }
@@ -412,6 +448,33 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         template.description.textContent = extension.description;
         template.publisher.classList.toggle('clickable', !!extension.url);
         template.publisherDisplayName.textContent = extension.publisherDisplayName;
+        template.publisher.parentElement?.classList.toggle('hide', !!extension.resourceExtension || extension.local?.source === 'resource');
+        const location = extension.resourceExtension?.location ?? (extension.local?.source === 'resource' ? extension.local?.location : undefined);
+        template.resource.parentElement?.classList.toggle('hide', !location);
+        if (location) {
+            const workspaceFolder = this.contextService.getWorkspaceFolder(location);
+            if (workspaceFolder && extension.isWorkspaceScoped) {
+                template.resource.parentElement?.classList.add('clickable');
+                this.transientDisposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), template.resource, this.uriIdentityService.extUri.relativePath(workspaceFolder.uri, location)));
+                template.resource.textContent = ( localizeWithPath(
+                    'vs/workbench/contrib/extensions/browser/extensionEditor',
+                    'workspace extension',
+                    "Workspace Extension"
+                ));
+                this.transientDisposables.add(onClick(template.resource, () => {
+                    this.viewsService.openView(VIEW_ID, true).then(() => this.explorerService.select(location, true));
+                }));
+            }
+            else {
+                template.resource.parentElement?.classList.remove('clickable');
+                this.transientDisposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), template.resource, location.path));
+                template.resource.textContent = ( localizeWithPath(
+                    'vs/workbench/contrib/extensions/browser/extensionEditor',
+                    'local extension',
+                    "Local Extension"
+                ));
+            }
+        }
         template.installCount.parentElement?.classList.toggle('hide', !extension.url);
         template.rating.parentElement?.classList.toggle('hide', !extension.url);
         template.rating.classList.toggle('clickable', !!extension.url);
@@ -574,12 +637,12 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
                 extension: undefined,
             }));
             webview.initialScrollProgress = this.initialScrollProgress.get(webviewIndex) || 0;
-            webview.claim(this, this.scopedContextKeyService);
+            webview.claim(this, this.window, this.scopedContextKeyService);
             setParentFlowTo(webview.container, container);
             webview.layoutWebviewOverElement(container);
             webview.setHtml(body);
-            webview.claim(this, undefined);
-            this.contentDisposables.add(webview.onDidFocus(() => this.fireOnDidFocus()));
+            webview.claim(this, this.window, undefined);
+            this.contentDisposables.add(webview.onDidFocus(() => this._onDidFocus?.fire()));
             this.contentDisposables.add(webview.onDidScroll(() => this.initialScrollProgress.set(webviewIndex, webview.initialScrollProgress)));
             const removeLayoutParticipant = insert(this.layoutParticipants, {
                 layout: () => {
@@ -845,7 +908,9 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             ))));
             const resourcesElement = append(extensionResourcesContainer, $('.resources'));
             for (const [label, uri] of resources) {
-                this.transientDisposables.add(onClick(append(resourcesElement, $('a.resource', { title: ( uri.toString()), tabindex: '0' }, label)), () => this.openerService.open(uri)));
+                const resource = append(resourcesElement, $('a.resource', { tabindex: '0' }, label));
+                this.transientDisposables.add(onClick(resource, () => this.openerService.open(uri)));
+                this.transientDisposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), resource, ( uri.toString())));
             }
         }
     }
@@ -993,21 +1058,25 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
     }
 };
 ExtensionEditor = ExtensionEditor_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IPaneCompositePartService)),
-    ( __param(3, IExtensionsWorkbenchService)),
-    ( __param(4, IExtensionGalleryService)),
-    ( __param(5, IThemeService)),
-    ( __param(6, INotificationService)),
-    ( __param(7, IOpenerService)),
-    ( __param(8, IExtensionRecommendationsService)),
-    ( __param(9, IStorageService)),
-    ( __param(10, IExtensionService)),
-    ( __param(11, IWebviewService)),
-    ( __param(12, ILanguageService)),
-    ( __param(13, IContextMenuService)),
-    ( __param(14, IContextKeyService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IPaneCompositePartService)),
+    ( __param(4, IExtensionsWorkbenchService)),
+    ( __param(5, IExtensionGalleryService)),
+    ( __param(6, IThemeService)),
+    ( __param(7, INotificationService)),
+    ( __param(8, IOpenerService)),
+    ( __param(9, IExtensionRecommendationsService)),
+    ( __param(10, IStorageService)),
+    ( __param(11, IExtensionService)),
+    ( __param(12, IWebviewService)),
+    ( __param(13, ILanguageService)),
+    ( __param(14, IContextMenuService)),
+    ( __param(15, IContextKeyService)),
+    ( __param(16, IWorkspaceContextService)),
+    ( __param(17, IExplorerService)),
+    ( __param(18, IViewsService)),
+    ( __param(19, IUriIdentityService))
 ], ExtensionEditor));
 const contextKeyExpr = ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', ExtensionEditor.ID)), ( EditorContextKeys.focus.toNegated())));
 registerAction2(class ShowExtensionEditorFindAction extends Action2 {

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

@@ -20,7 +20,7 @@ import { Themable, IThemeService } from 'vscode/vscode/vs/platform/theme/common/
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { errorIcon, warningIcon, infoIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
 import { SeverityIcon } from 'vscode/vscode/vs/platform/severityIcon/browser/severityIcon';
 import { KeybindingLabel } from 'vscode/vscode/vs/base/browser/ui/keybindingLabel/keybindingLabel';
@@ -105,7 +105,7 @@ let RuntimeStatusMarkdownRenderer = class RuntimeStatusMarkdownRenderer extends
                     status.messages.length
                 ))}\n`);
                 for (const message of status.messages) {
-                    data.appendMarkdown(`$(${(message.type === Severity.Error ? Codicon.error : message.type === Severity.Warning ? Codicon.warning : Codicon.info).id}) ${message.message}\n\n`);
+                    data.appendMarkdown(`$(${(message.type === Severity$1.Error ? Codicon.error : message.type === Severity$1.Warning ? Codicon.warning : Codicon.info).id}) ${message.message}\n\n`);
                 }
             }
         }
@@ -116,10 +116,10 @@ let RuntimeStatusMarkdownRenderer = class RuntimeStatusMarkdownRenderer extends
                 data.appendMarkdown(`\n ### ${feature.label}\n\n`);
                 const status = accessData?.current?.status;
                 if (status) {
-                    if (status?.severity === Severity.Error) {
+                    if (status?.severity === Severity$1.Error) {
                         data.appendMarkdown(`$(${errorIcon.id}) ${status.message}\n\n`);
                     }
-                    if (status?.severity === Severity.Warning) {
+                    if (status?.severity === Severity$1.Warning) {
                         data.appendMarkdown(`$(${warningIcon.id}) ${status.message}\n\n`);
                     }
                 }
@@ -439,7 +439,7 @@ let ExtensionFeatureView = class ExtensionFeatureView extends Disposable {
         }
         const accessData = this.extensionFeaturesManagementService.getAccessData(this.extensionId, this.feature.id);
         if (accessData?.current?.status) {
-            append(bodyContent, $('.feature-status', undefined, $(`span${ThemeIcon.asCSSSelector(accessData.current.status.severity === Severity.Error ? errorIcon : accessData.current.status.severity === Severity.Warning ? warningIcon : infoIcon)}`, undefined), $('span', undefined, accessData.current.status.message)));
+            append(bodyContent, $('.feature-status', undefined, $(`span${ThemeIcon.asCSSSelector(accessData.current.status.severity === Severity$1.Error ? errorIcon : accessData.current.status.severity === Severity$1.Warning ? warningIcon : infoIcon)}`, undefined), $('span', undefined, accessData.current.status.message)));
         }
         const featureContentElement = append(bodyContent, $('.feature-content'));
         if (this.feature.renderer) {
@@ -465,15 +465,17 @@ let ExtensionFeatureView = class ExtensionFeatureView extends Disposable {
     }
     renderTableData(container, renderer) {
         const tableData = this._register(renderer.render(this.manifest));
+        const tableDisposable = this._register(( new MutableDisposable()));
         if (tableData.onDidChange) {
             this._register(tableData.onDidChange(data => {
                 clearNode(container);
-                this.renderTable(data, container);
+                tableDisposable.value = this.renderTable(data, container);
             }));
         }
-        this.renderTable(tableData.data, container);
+        tableDisposable.value = this.renderTable(tableData.data, container);
     }
     renderTable(tableData, container) {
+        const disposables = ( new DisposableStore());
         append(container, $('table', undefined, $('tr', undefined, ...( tableData.headers.map(header => $('th', undefined, header)))), ...( tableData.rows
             .map(row => {
             return $('tr', undefined, ...( row.map(rowData => {
@@ -490,7 +492,7 @@ let ExtensionFeatureView = class ExtensionFeatureView extends Disposable {
                     }
                     else if (item instanceof ResolvedKeybinding) {
                         const element = $('');
-                        const kbl = ( new KeybindingLabel(element, OS, defaultKeybindingLabelStyles));
+                        const kbl = disposables.add(( new KeybindingLabel(element, OS, defaultKeybindingLabelStyles)));
                         kbl.set(item);
                         result.push(element);
                     }
@@ -502,6 +504,7 @@ let ExtensionFeatureView = class ExtensionFeatureView extends Disposable {
                 })).flat());
             })));
         }))));
+        return disposables;
     }
     renderMarkdownData(container, renderer) {
         container.classList.add('markdown');

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

@@ -5,6 +5,7 @@ import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableStore, isDisposable, toDisposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isString } from 'vscode/vscode/vs/base/common/types';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
@@ -13,6 +14,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { Severity, INotificationService, NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { SearchExtensionsAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
@@ -71,7 +73,7 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
     get ignoredRecommendations() {
         return distinct(( [...JSON.parse(this.storageService.get(ignoreImportantExtensionRecommendationStorageKey, 0 , '[]'))].map(i => i.toLowerCase())));
     }
-    constructor(configurationService, storageService, notificationService, telemetryService, instantiationService, extensionsWorkbenchService, extensionManagementService, extensionEnablementService, extensionIgnoredRecommendationsService, userDataSyncEnablementService, workbenchEnvironmentService) {
+    constructor(configurationService, storageService, notificationService, telemetryService, instantiationService, extensionsWorkbenchService, extensionManagementService, extensionEnablementService, extensionIgnoredRecommendationsService, userDataSyncEnablementService, workbenchEnvironmentService, uriIdentityService) {
         super();
         this.configurationService = configurationService;
         this.storageService = storageService;
@@ -84,6 +86,7 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
         this.extensionIgnoredRecommendationsService = extensionIgnoredRecommendationsService;
         this.userDataSyncEnablementService = userDataSyncEnablementService;
         this.workbenchEnvironmentService = workbenchEnvironmentService;
+        this.uriIdentityService = uriIdentityService;
         this.recommendedExtensions = [];
         this.recommendationSources = [];
         this.pendingNotificaitons = [];
@@ -135,7 +138,7 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
         }
         let installed = await this.extensionManagementService.getInstalled();
         installed = installed.filter(l => this.extensionEnablementService.getEnablementState(l) !== 1 );
-        recommendations = recommendations.filter(extensionId => installed.every(local => !areSameExtensions({ id: extensionId }, local.identifier)));
+        recommendations = recommendations.filter(recommendation => installed.every(local => isString(recommendation) ? !areSameExtensions({ id: recommendation }, local.identifier) : !this.uriIdentityService.extUri.isEqual(recommendation, local.location)));
         if (!recommendations.length) {
             return;
         }
@@ -164,14 +167,14 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
             return "toomany" ;
         }
         this.recommendationSources.push(source);
-        if (source === 3  && extensionIds.every(id => this.recommendedExtensions.includes(id))) {
+        if (source === 3  && extensionIds.every(id => isString(id) && this.recommendedExtensions.includes(id))) {
             return "ignored" ;
         }
         const extensions = await this.getInstallableExtensions(extensionIds);
         if (!extensions.length) {
             return "ignored" ;
         }
-        this.recommendedExtensions = distinct([...this.recommendedExtensions, ...extensionIds]);
+        this.recommendedExtensions = distinct([...this.recommendedExtensions, ...extensionIds.filter(isString)]);
         let extensionsMessage = '';
         if (extensions.length === 1) {
             extensionsMessage = ( localizeWithPath(
@@ -392,14 +395,30 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
         this.hideVisibleNotificationPromise = undefined;
         this.visibleNotification = undefined;
     }
-    async getInstallableExtensions(extensionIds) {
+    async getInstallableExtensions(recommendations) {
         const result = [];
-        if (extensionIds.length) {
-            const extensions = await this.extensionsWorkbenchService.getExtensions(( extensionIds.map(id => ({ id }))), { source: 'install-recommendations' }, CancellationToken.None);
-            for (const extension of extensions) {
-                if (extension.gallery && (await this.extensionManagementService.canInstall(extension.gallery))) {
-                    result.push(extension);
+        if (recommendations.length) {
+            const galleryExtensions = [];
+            const resourceExtensions = [];
+            for (const recommendation of recommendations) {
+                if (typeof recommendation === 'string') {
+                    galleryExtensions.push(recommendation);
                 }
+                else {
+                    resourceExtensions.push(recommendation);
+                }
+            }
+            if (galleryExtensions.length) {
+                const extensions = await this.extensionsWorkbenchService.getExtensions(( galleryExtensions.map(id => ({ id }))), { source: 'install-recommendations' }, CancellationToken.None);
+                for (const extension of extensions) {
+                    if (extension.gallery && (await this.extensionManagementService.canInstall(extension.gallery))) {
+                        result.push(extension);
+                    }
+                }
+            }
+            if (resourceExtensions.length) {
+                const extensions = await this.extensionsWorkbenchService.getResourceExtensions(resourceExtensions, true);
+                result.push(...extensions);
             }
         }
         return result;
@@ -440,7 +459,8 @@ ExtensionRecommendationNotificationService = ( __decorate([
     ( __param(7, IWorkbenchExtensionEnablementService)),
     ( __param(8, IExtensionIgnoredRecommendationsService)),
     ( __param(9, IUserDataSyncEnablementService)),
-    ( __param(10, IWorkbenchEnvironmentService))
+    ( __param(10, IWorkbenchEnvironmentService)),
+    ( __param(11, IUriIdentityService))
 ], ExtensionRecommendationNotificationService));
 
 export { ExtensionRecommendationNotificationService };

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

@@ -4,7 +4,7 @@ import { IExtensionGalleryService, IExtensionManagementService } from 'vscode/vs
 import { IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { distinct, shuffle } from 'vscode/vscode/vs/base/common/arrays';
+import { shuffle } from 'vscode/vscode/vs/base/common/arrays';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
@@ -23,6 +23,7 @@ import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement
 import { RemoteRecommendations } from './remoteRecommendations.js';
 import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
 import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/services/userData/browser/userDataInit';
+import { isString } from 'vscode/vscode/vs/base/common/types';
 
 let ExtensionRecommendationsService = class ExtensionRecommendationsService extends Disposable {
     constructor(instantiationService, lifecycleService, galleryService, telemetryService, environmentService, extensionManagementService, extensionRecommendationsManagementService, extensionRecommendationNotificationService, extensionsWorkbenchService, remoteExtensionsScannerService, userDataInitializationService) {
@@ -103,9 +104,9 @@ let ExtensionRecommendationsService = class ExtensionRecommendationsService exte
             ...this.languageRecommendations.recommendations,
             ...this.webRecommendations.recommendations,
         ];
-        for (const { extensionId, reason } of allRecommendations) {
-            if (this.isExtensionAllowedToBeRecommended(extensionId)) {
-                output[extensionId.toLowerCase()] = reason;
+        for (const { extension, reason } of allRecommendations) {
+            if (isString(extension) && this.isExtensionAllowedToBeRecommended(extension)) {
+                output[extension.toLowerCase()] = reason;
             }
         }
         return output;
@@ -113,8 +114,8 @@ let ExtensionRecommendationsService = class ExtensionRecommendationsService exte
     async getConfigBasedRecommendations() {
         await this.configBasedRecommendations.activate();
         return {
-            important: this.toExtensionRecommendations(this.configBasedRecommendations.importantRecommendations),
-            others: this.toExtensionRecommendations(this.configBasedRecommendations.otherRecommendations)
+            important: this.toExtensionIds(this.configBasedRecommendations.importantRecommendations),
+            others: this.toExtensionIds(this.configBasedRecommendations.otherRecommendations)
         };
     }
     async getOtherRecommendations() {
@@ -125,8 +126,7 @@ let ExtensionRecommendationsService = class ExtensionRecommendationsService exte
             ...this.exeBasedRecommendations.otherRecommendations,
             ...this.webRecommendations.recommendations
         ];
-        const extensionIds = distinct(( recommendations.map(e => e.extensionId)))
-            .filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId));
+        const extensionIds = this.toExtensionIds(recommendations);
         shuffle(extensionIds, this.sessionSeed);
         return extensionIds;
     }
@@ -137,35 +137,45 @@ let ExtensionRecommendationsService = class ExtensionRecommendationsService exte
             ...this.configBasedRecommendations.importantRecommendations,
             ...this.exeBasedRecommendations.importantRecommendations,
         ];
-        const extensionIds = distinct(( recommendations.map(e => e.extensionId)))
-            .filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId));
+        const extensionIds = this.toExtensionIds(recommendations);
         shuffle(extensionIds, this.sessionSeed);
         return extensionIds;
     }
     getKeymapRecommendations() {
-        return this.toExtensionRecommendations(this.keymapRecommendations.recommendations);
+        return this.toExtensionIds(this.keymapRecommendations.recommendations);
     }
     getLanguageRecommendations() {
-        return this.toExtensionRecommendations(this.languageRecommendations.recommendations);
+        return this.toExtensionIds(this.languageRecommendations.recommendations);
     }
     getRemoteRecommendations() {
-        return this.toExtensionRecommendations(this.remoteRecommendations.recommendations);
+        return this.toExtensionIds(this.remoteRecommendations.recommendations);
     }
     async getWorkspaceRecommendations() {
         if (!this.isEnabled()) {
             return [];
         }
         await this.workspaceRecommendations.activate();
-        return this.toExtensionRecommendations(this.workspaceRecommendations.recommendations);
+        const result = [];
+        for (const { extension } of this.workspaceRecommendations.recommendations) {
+            if (isString(extension)) {
+                if (!result.includes(extension.toLowerCase()) && this.isExtensionAllowedToBeRecommended(extension)) {
+                    result.push(extension.toLowerCase());
+                }
+            }
+            else {
+                result.push(extension);
+            }
+        }
+        return result;
     }
     async getExeBasedRecommendations(exe) {
         await this.exeBasedRecommendations.activate();
         const { important, others } = exe ? this.exeBasedRecommendations.getRecommendations(exe)
             : { important: this.exeBasedRecommendations.importantRecommendations, others: this.exeBasedRecommendations.otherRecommendations };
-        return { important: this.toExtensionRecommendations(important), others: this.toExtensionRecommendations(others) };
+        return { important: this.toExtensionIds(important), others: this.toExtensionIds(others) };
     }
     getFileBasedRecommendations() {
-        return this.toExtensionRecommendations(this.fileBasedRecommendations.recommendations);
+        return this.toExtensionIds(this.fileBasedRecommendations.recommendations);
     }
     onDidInstallExtensions(results) {
         for (const e of results) {
@@ -178,9 +188,13 @@ let ExtensionRecommendationsService = class ExtensionRecommendationsService exte
             }
         }
     }
-    toExtensionRecommendations(recommendations) {
-        const extensionIds = distinct(( recommendations.map(e => e.extensionId)))
-            .filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId));
+    toExtensionIds(recommendations) {
+        const extensionIds = [];
+        for (const { extension } of recommendations) {
+            if (isString(extension) && this.isExtensionAllowedToBeRecommended(extension) && !extensionIds.includes(extension.toLowerCase())) {
+                extensionIds.push(extension.toLowerCase());
+            }
+        }
         return extensionIds;
     }
     isExtensionAllowedToBeRecommended(extensionId) {
@@ -192,8 +206,8 @@ let ExtensionRecommendationsService = class ExtensionRecommendationsService exte
             ...this.workspaceRecommendations.recommendations,
             ...this.configBasedRecommendations.importantRecommendations.filter(recommendation => !recommendation.whenNotInstalled || recommendation.whenNotInstalled.every(id => installed.every(local => !areSameExtensions(local.identifier, { id }))))
         ]
-            .map(({ extensionId }) => extensionId))
-            .filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId));
+            .map(({ extension }) => extension))
+            .filter(extension => !isString(extension) || this.isExtensionAllowedToBeRecommended(extension));
         if (allowedRecommendations.length) {
             await this._registerP(timeout(5000));
             await this.extensionRecommendationNotificationService.promptWorkspaceRecommendations(allowedRecommendations);