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

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

@@ -2,11 +2,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { registerAction2, MenuRegistry, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IExtensionManagementService, ExtensionsLocalizedLabel, PreferencesLocalizedLabel, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionManagementService, IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { IExtensionGalleryService, IExtensionManagementService, ExtensionsLocalizedLabel, PreferencesLocalizedLabel } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { extensionsConfigurationNodeBase, IWorkbenchExtensionManagementService, IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
 import { Extensions as Extensions$4 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { VIEWLET_ID, IExtensionsWorkbenchService, CONTEXT_HAS_GALLERY, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, OUTDATED_EXTENSIONS_VIEW_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, extensionsSearchActionsMenu, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, UPDATE_ACTIONS_GROUP, TOGGLE_IGNORE_EXTENSION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { SearchExtensionsAction, PromptExtensionInstallFailureAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, InstallSpecificVersionOfExtensionAction, ReinstallAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, ClearLanguageAction, ConfigureWorkspaceRecommendedExtensionsAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsInput';
@@ -32,10 +32,13 @@ import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/prefere
 import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { ManageExtensionsQuickAccessProvider, InstallExtensionQuickAccessProvider } from './extensionsQuickAccess.js';
+import './extensionRecommendationsService.js';
 import { CONTEXT_SYNC_ENABLEMENT } from 'vscode/vscode/vs/workbench/services/userDataSync/common/userDataSync';
 import { CopyAction, CutAction, PasteAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import './extensionsWorkbenchService.js';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import './extensionRecommendationNotificationService.js';
 import { IExtensionService, toExtensionDescription } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
@@ -50,6 +53,7 @@ import { Disposable, DisposableStore, isDisposable } from 'vscode/vscode/vs/base
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { mnemonicButtonLabel } from 'vscode/vscode/vs/base/common/labels';
+import 'vscode/vscode/vs/base/common/arrays';
 import { Promises } from 'vscode/vscode/vs/base/common/async';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceTrust';
@@ -111,14 +115,7 @@ import { IFileDialogService, IDialogService } from 'vscode/vscode/vs/platform/di
 }, 0 );
 ( Registry.as(Extensions$2.Configuration))
     .registerConfiguration({
-    id: 'extensions',
-    order: 30,
-    title: ( localizeWithPath(
-        'vs/workbench/contrib/extensions/browser/extensions.contribution',
-        'extensionsConfigurationTitle',
-        "Extensions"
-    )),
-    type: 'object',
+    ...extensionsConfigurationNodeBase,
     properties: {
         'extensions.autoUpdate': {
             enum: [true, 'onlyEnabledExtensions', 'onlySelectedExtensions', false,],
@@ -354,6 +351,15 @@ import { IFileDialogService, IDialogService } from 'vscode/vscode/vs/platform/di
                 "When enabled, extensions which declare the `onStartupFinished` activation event will be activated after a timeout."
             )),
             default: false
+        },
+        'extensions.experimental.issueQuickAccess': {
+            type: 'boolean',
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/extensions/browser/extensions.contribution',
+                'extensionsInQuickAccess',
+                "When enabled, extensions can be searched for via Quick Access and report issues from there."
+            )),
+            default: true
         }
     }
 });
@@ -431,6 +437,23 @@ CommandsRegistry.registerCommand({
                             )),
                             default: false
                         },
+                        'justification': {
+                            'type': ['string', 'object'],
+                            'description': ( localizeWithPath(
+                                'vs/workbench/contrib/extensions/browser/extensions.contribution',
+                                'workbench.extensions.installExtension.option.justification',
+                                "Justification for installing the extension. This is a string or an object that can be used to pass any information to the installation handlers. i.e. `{reason: 'This extension wants to open a URI', action: 'Open URI'}` will show a message box with the reason and action upon install."
+                            )),
+                        },
+                        'enable': {
+                            'type': 'boolean',
+                            'description': ( localizeWithPath(
+                                'vs/workbench/contrib/extensions/browser/extensions.contribution',
+                                'workbench.extensions.installExtension.option.enable',
+                                "When enabled, the extension will be enabled if it is installed but disabled. If the extension is already enabled, this has no effect."
+                            )),
+                            default: false
+                        },
                         'context': {
                             'type': 'object',
                             'description': ( localizeWithPath(
@@ -447,30 +470,32 @@ CommandsRegistry.registerCommand({
     handler: async (accessor, arg, options) => {
         const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
         const extensionManagementService = accessor.get(IWorkbenchExtensionManagementService);
+        const extensionGalleryService = accessor.get(IExtensionGalleryService);
         try {
             if (typeof arg === 'string') {
                 const [id, version] = getIdAndVersion(arg);
-                const [extension] = await extensionsWorkbenchService.getExtensions([{ id, preRelease: options?.installPreReleaseVersion }], CancellationToken.None);
-                if (extension) {
-                    const installOptions = {
+                const extension = extensionsWorkbenchService.local.find(e => areSameExtensions(e.identifier, { id, uuid: version }));
+                if (extension?.enablementState === 1 ) {
+                    const [gallery] = await extensionGalleryService.getExtensions([{ id, preRelease: options?.installPreReleaseVersion }], CancellationToken.None);
+                    if (gallery) {
+                        throw new Error(localizeWithPath('vs/workbench/contrib/extensions/browser/extensions.contribution', 'notFound', "Extension '{0}' not found.", arg));
+                    }
+                    await extensionManagementService.installFromGallery(gallery, {
                         isMachineScoped: options?.donotSync ? true : undefined,
                         installPreReleaseVersion: options?.installPreReleaseVersion,
                         installGivenVersion: !!version,
                         context: options?.context
-                    };
-                    if (extension.gallery && extension.enablementState === 1 ) {
-                        await extensionManagementService.installFromGallery(extension.gallery, installOptions);
-                        return;
-                    }
-                    if (version) {
-                        await extensionsWorkbenchService.installVersion(extension, version, installOptions);
-                    }
-                    else {
-                        await extensionsWorkbenchService.install(extension, installOptions);
-                    }
+                    });
                 }
                 else {
-                    throw new Error(localizeWithPath('vs/workbench/contrib/extensions/browser/extensions.contribution', 'notFound', "Extension '{0}' not found.", arg));
+                    await extensionsWorkbenchService.install(arg, {
+                        version,
+                        installPreReleaseVersion: options?.installPreReleaseVersion,
+                        context: options?.context,
+                        justification: options?.justification,
+                        enable: options?.enable,
+                        isMachineScoped: options?.donotSync ? true : undefined,
+                    }, 15 );
                 }
             }
             else {
@@ -1881,7 +1906,7 @@ let ExtensionsContributions = class ExtensionsContributions extends Disposable {
             menu: {
                 id: MenuId.ExtensionContext,
                 group: '2_configure',
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('extensionStatus', 'installed')), ( ( ContextKeyExpr.has('isDefaultApplicationScopedExtension')).negate()), ( ( ContextKeyExpr.has('isBuiltinExtension')).negate()))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('extensionStatus', 'installed')), ( ( ContextKeyExpr.has('isDefaultApplicationScopedExtension')).negate()), ( ( ContextKeyExpr.has('isBuiltinExtension')).negate()), ( ContextKeyExpr.equals('isWorkspaceScopedExtension', false)))),
                 order: 3
             },
             run: async (accessor, id) => {
@@ -1901,7 +1926,7 @@ let ExtensionsContributions = class ExtensionsContributions extends Disposable {
             menu: {
                 id: MenuId.ExtensionContext,
                 group: '2_configure',
-                when: ( ContextKeyExpr.and(CONTEXT_SYNC_ENABLEMENT)),
+                when: ( ContextKeyExpr.and(CONTEXT_SYNC_ENABLEMENT, ( ContextKeyExpr.equals('isWorkspaceScopedExtension', false)))),
                 order: 4
             },
             run: async (accessor, id) => {
@@ -1951,7 +1976,7 @@ let ExtensionsContributions = class ExtensionsContributions extends Disposable {
             menu: {
                 id: MenuId.ExtensionContext,
                 group: '3_recommendations',
-                when: ( ContextKeyExpr.and(( WorkbenchStateContext.notEqualsTo('empty')), ( ( ContextKeyExpr.has('isBuiltinExtension')).negate()), ( ( ContextKeyExpr.has('isExtensionWorkspaceRecommended')).negate()), ( ( ContextKeyExpr.has('isUserIgnoredRecommendation')).negate()))),
+                when: ( ContextKeyExpr.and(( WorkbenchStateContext.notEqualsTo('empty')), ( ( ContextKeyExpr.has('isBuiltinExtension')).negate()), ( ( ContextKeyExpr.has('isExtensionWorkspaceRecommended')).negate()), ( ( ContextKeyExpr.has('isUserIgnoredRecommendation')).negate()), ( ContextKeyExpr.notEquals('extensionSource', 'resource')))),
                 order: 2
             },
             run: (accessor, id) => accessor.get(IWorkspaceExtensionsConfigService).toggleRecommendation(id)

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

@@ -6,7 +6,7 @@ import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar'
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { ExtensionContainers, IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
-import { ActionWithDropDownAction, ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction, ExtensionStatusAction, ExtensionStatusLabelAction, MigrateDeprecatedExtensionAction, ReloadAction, UpdateAction, ToggleAutoUpdateForExtensionAction, InstallDropdownAction, InstallingLabelAction, SetLanguageAction, ClearLanguageAction, RemoteInstallAction, LocalInstallAction, WebInstallAction, ManageExtensionAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
+import { ActionWithDropDownAction, ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction, ExtensionStatusAction, ExtensionStatusLabelAction, MigrateDeprecatedExtensionAction, ExtensionRuntimeStateAction, UpdateAction, ToggleAutoUpdateForExtensionAction, InstallDropdownAction, InstallingLabelAction, SetLanguageAction, ClearLanguageAction, RemoteInstallAction, LocalInstallAction, WebInstallAction, ManageExtensionAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { extensionVerifiedPublisherIconColor, RecommendationWidget, PreReleaseBookmarkWidget, RemoteBadgeWidget, ExtensionPackCountWidget, VerifiedPublisherWidget, ExtensionHoverWidget, SyncIgnoredWidget, ExtensionActivationStatusWidget, InstallCountWidget, RatingsWidget } from './extensionsWidgets.js';
 import { IExtensionService, toExtension } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
@@ -59,16 +59,16 @@ let Renderer = class Renderer {
         const verifiedPublisherWidget = this.instantiationService.createInstance(VerifiedPublisherWidget, append(publisher, $(`.verified-publisher`)), true);
         const publisherDisplayName = append(publisher, $('.publisher-name.ellipsis'));
         const actionbar = ( new ActionBar(footer, {
-            actionViewItemProvider: (action) => {
+            actionViewItemProvider: (action, 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
                     ));
                 }
                 if (action instanceof ExtensionDropDownAction) {
-                    return action.createActionViewItem();
+                    return action.createActionViewItem(options);
                 }
                 return undefined;
             },
@@ -80,7 +80,7 @@ let Renderer = class Renderer {
         const actions = [
             this.instantiationService.createInstance(ExtensionStatusLabelAction),
             this.instantiationService.createInstance(MigrateDeprecatedExtensionAction, true),
-            this.instantiationService.createInstance(ReloadAction),
+            this.instantiationService.createInstance(ExtensionRuntimeStateAction),
             this.instantiationService.createInstance(ActionWithDropDownAction, 'extensions.updateActions', '', [[this.instantiationService.createInstance(UpdateAction, false)], [this.instantiationService.createInstance(ToggleAutoUpdateForExtensionAction, true, [true, 'onlyEnabledExtensions'])]]),
             this.instantiationService.createInstance(InstallDropdownAction),
             this.instantiationService.createInstance(InstallingLabelAction),
@@ -173,7 +173,7 @@ let Renderer = class Renderer {
         data.name.textContent = extension.displayName;
         data.description.textContent = extension.description;
         const updatePublisher = () => {
-            data.publisherDisplayName.textContent = extension.publisherDisplayName;
+            data.publisherDisplayName.textContent = !extension.resourceExtension && extension.local?.source !== 'resource' ? extension.publisherDisplayName : '';
         };
         updatePublisher();
         Event.filter(this.extensionsWorkbenchService.onChange, e => !!e && areSameExtensions(e.identifier, extension.identifier))(() => updatePublisher(), this, data.extensionDisposables);

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

@@ -13,7 +13,17 @@ import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/comm
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
 import { Renderer } from './extensionsList.js';
-import { listFocusBackground, listFocusForeground, foreground, editorBackground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { foreground } 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 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import { listFocusBackground, listFocusForeground } from '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 { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
 import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
 import { getAriaLabelForExtension } from './extensionsViews.js';

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

@@ -19,7 +19,7 @@ import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/c
 import { ServerInstalledExtensionsView, DefaultPopularExtensionsView, DefaultRecommendedExtensionsView, EnabledExtensionsView, DisabledExtensionsView, SearchMarketplaceExtensionsView, ExtensionsListView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, WorkspaceRecommendedExtensionsView, RecommendedExtensionsView, NONE_CATEGORY, StaticQueryExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DeprecatedExtensionsView } from './extensionsViews.js';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { NumberBadge, IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
@@ -79,8 +79,9 @@ const REMOTE_CATEGORY = ( localize2WithPath(
     { key: 'remote', comment: ['Remote as in remote machine'] },
     "Remote"
 ));
-let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContribution {
+let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContribution extends Disposable {
     constructor(extensionManagementServerService, labelService, viewDescriptorService, contextKeyService) {
+        super();
         this.extensionManagementServerService = extensionManagementServerService;
         this.labelService = labelService;
         this.contextKeyService = contextKeyService;
@@ -145,7 +146,7 @@ let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContributio
                 canToggleVisibility: servers.length === 1
             });
             if (server === this.extensionManagementServerService.remoteExtensionManagementServer && this.extensionManagementServerService.localExtensionManagementServer) {
-                registerAction2(class InstallLocalExtensionsInRemoteAction2 extends Action2 {
+                this._register(registerAction2(class InstallLocalExtensionsInRemoteAction2 extends Action2 {
                     constructor() {
                         super({
                             id: 'workbench.extensions.installLocalExtensions',
@@ -170,11 +171,11 @@ let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContributio
                     run(accessor) {
                         return accessor.get(IInstantiationService).createInstance(InstallLocalExtensionsInRemoteAction).run();
                     }
-                });
+                }));
             }
         }
         if (this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer) {
-            registerAction2(class InstallRemoteExtensionsInLocalAction2 extends Action2 {
+            this._register(registerAction2(class InstallRemoteExtensionsInLocalAction2 extends Action2 {
                 constructor() {
                     super({
                         id: 'workbench.extensions.actions.installLocalExtensionsInRemote',
@@ -190,7 +191,7 @@ let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContributio
                 run(accessor) {
                     return accessor.get(IInstantiationService).createInstance(InstallRemoteExtensionsInLocalAction, 'workbench.extensions.actions.installLocalExtensionsInRemote').run();
                 }
-            });
+            }));
         }
         viewDescriptors.push({
             id: 'workbench.views.extensions.popular',
@@ -832,9 +833,9 @@ let StatusUpdater = class StatusUpdater extends Disposable {
     }
     onServiceChange() {
         this.badgeHandle.clear();
-        const extensionsReloadRequired = this.extensionsWorkbenchService.installed.filter(e => e.reloadRequiredStatus !== undefined);
-        const outdated = this.extensionsWorkbenchService.outdated.reduce((r, e) => r + (this.extensionEnablementService.isEnabled(e.local) && !extensionsReloadRequired.includes(e) ? 1 : 0), 0);
-        const newBadgeNumber = outdated + extensionsReloadRequired.length;
+        const actionRequired = this.extensionsWorkbenchService.installed.filter(e => e.runtimeState !== undefined);
+        const outdated = this.extensionsWorkbenchService.outdated.reduce((r, e) => r + (this.extensionEnablementService.isEnabled(e.local) && !actionRequired.includes(e) ? 1 : 0), 0);
+        const newBadgeNumber = outdated + actionRequired.length;
         if (newBadgeNumber > 0) {
             let msg = '';
             if (outdated) {
@@ -850,20 +851,20 @@ let StatusUpdater = class StatusUpdater extends Disposable {
                     outdated
                 ));
             }
-            if (outdated > 0 && extensionsReloadRequired.length > 0) {
+            if (outdated > 0 && actionRequired.length > 0) {
                 msg += ', ';
             }
-            if (extensionsReloadRequired.length) {
-                msg += extensionsReloadRequired.length === 1 ? ( localizeWithPath(
+            if (actionRequired.length) {
+                msg += actionRequired.length === 1 ? ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/extensionsViewlet',
                     'extensionToReload',
-                    '{0} requires reload',
-                    extensionsReloadRequired.length
+                    '{0} requires restart',
+                    actionRequired.length
                 )) : ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/extensionsViewlet',
                     'extensionsToReload',
-                    '{0} require reload',
-                    extensionsReloadRequired.length
+                    '{0} require restart',
+                    actionRequired.length
                 ));
             }
             const badge = ( new NumberBadge(newBadgeNumber, () => msg));
@@ -899,7 +900,7 @@ let MaliciousExtensionChecker = class MaliciousExtensionChecker {
                     .filter(e => ( extensionsControlManifest.malicious.some(identifier => areSameExtensions(e.identifier, identifier))));
                 if (maliciousExtensions.length) {
                     return Promises.settled(( maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e).then(() => {
-                        this.notificationService.prompt(Severity.Warning, ( localizeWithPath(
+                        this.notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
                             'vs/workbench/contrib/extensions/browser/extensionsViewlet',
                             'malicious warning',
                             "We have uninstalled '{0}' which was reported to be problematic.",

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

@@ -48,6 +48,8 @@ import { isOfflineError } from 'vscode/vscode/vs/base/parts/request/common/reque
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions, IExtensionFeaturesManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
+import { isString } from 'vscode/vscode/vs/base/common/types';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 
 var ExtensionsListView_1;
 const NONE_CATEGORY = 'none';
@@ -74,7 +76,7 @@ function isLocalSortBy(value) {
 let ExtensionsListView = class ExtensionsListView extends ViewPane {
     static { ExtensionsListView_1 = this; }
     static { this.RECENT_UPDATE_DURATION = 7 * 24 * 60 * 60 * 1000; }
-    constructor(options, viewletViewOptions, notificationService, keybindingService, contextMenuService, instantiationService, themeService, extensionService, extensionsWorkbenchService, extensionRecommendationsService, telemetryService, configurationService, contextService, extensionManagementServerService, extensionManifestPropertiesService, extensionManagementService, workspaceService, productService, contextKeyService, viewDescriptorService, openerService, preferencesService, storageService, workspaceTrustManagementService, extensionEnablementService, layoutService, extensionFeaturesManagementService, logService) {
+    constructor(options, viewletViewOptions, notificationService, keybindingService, contextMenuService, instantiationService, themeService, extensionService, extensionsWorkbenchService, extensionRecommendationsService, telemetryService, configurationService, contextService, extensionManagementServerService, extensionManifestPropertiesService, extensionManagementService, workspaceService, productService, contextKeyService, viewDescriptorService, openerService, preferencesService, storageService, workspaceTrustManagementService, extensionEnablementService, layoutService, extensionFeaturesManagementService, uriIdentityService, logService) {
         super({
             ...viewletViewOptions,
             showActions: ViewPaneShowActions.Always,
@@ -97,6 +99,7 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
         this.extensionEnablementService = extensionEnablementService;
         this.layoutService = layoutService;
         this.extensionFeaturesManagementService = extensionFeaturesManagementService;
+        this.uriIdentityService = uriIdentityService;
         this.logService = logService;
         this.list = null;
         this.queryRequest = null;
@@ -123,7 +126,20 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
         const messageBox = append(messageContainer, $('.message'));
         const delegate = ( new Delegate());
         const extensionsViewState = ( new ExtensionsViewState());
-        const renderer = this.instantiationService.createInstance(Renderer, extensionsViewState, { hoverOptions: { position: () => { return this.layoutService.getSideBarPosition() === 0  ? 1  : 0 ; } } });
+        const renderer = this.instantiationService.createInstance(Renderer, extensionsViewState, {
+            hoverOptions: {
+                position: () => {
+                    const viewLocation = this.viewDescriptorService.getViewLocationById(this.id);
+                    if (viewLocation === 0 ) {
+                        return this.layoutService.getSideBarPosition() === 0  ? 1  : 0 ;
+                    }
+                    if (viewLocation === 2 ) {
+                        return this.layoutService.getSideBarPosition() === 0  ? 0  : 1 ;
+                    }
+                    return 1 ;
+                }
+            }
+        });
         this.list = this.instantiationService.createInstance(WorkbenchPagedList, 'Extensions', extensionsList, delegate, [renderer], {
             multipleSelectionSupport: false,
             setRowLineHeight: false,
@@ -420,7 +436,7 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
             result = this.sortExtensions(result, options);
         }
         else {
-            result = local.filter(e => (!e.isBuiltin || e.outdated || e.reloadRequiredStatus !== undefined) && matchingText(e));
+            result = local.filter(e => (!e.isBuiltin || e.outdated || e.runtimeState !== undefined) && matchingText(e));
             const runningExtensionsById = runningExtensions.reduce((result, e) => { result.set(e.identifier.value, e); return result; }, ( new ExtensionIdentifierMap()));
             const defaultSort = (e1, e2) => {
                 const running1 = runningExtensionsById.get(e1.identifier.id);
@@ -447,20 +463,20 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
                 return isE1Running ? -1 : 1;
             };
             const outdated = [];
-            const reloadRequired = [];
+            const actionRequired = [];
             const noActionRequired = [];
             result.forEach(e => {
                 if (e.outdated) {
                     outdated.push(e);
                 }
-                else if (e.reloadRequiredStatus) {
-                    reloadRequired.push(e);
+                else if (e.runtimeState) {
+                    actionRequired.push(e);
                 }
                 else {
                     noActionRequired.push(e);
                 }
             });
-            result = [...outdated.sort(defaultSort), ...reloadRequired.sort(defaultSort), ...noActionRequired.sort(defaultSort)];
+            result = [...outdated.sort(defaultSort), ...actionRequired.sort(defaultSort), ...noActionRequired.sort(defaultSort)];
         }
         return result;
     }
@@ -715,12 +731,28 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
     async getInstallableRecommendations(recommendations, options, token) {
         const result = [];
         if (recommendations.length) {
-            const extensions = await this.extensionsWorkbenchService.getExtensions(( recommendations.map(id => ({ id }))), { source: options.source }, token);
-            for (const extension of extensions) {
-                if (extension.gallery && !extension.deprecationInfo && (await this.extensionManagementService.canInstall(extension.gallery))) {
-                    result.push(extension);
+            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: options.source }, token);
+                for (const extension of extensions) {
+                    if (extension.gallery && !extension.deprecationInfo && (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;
     }
@@ -737,10 +769,7 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
     async getWorkspaceRecommendationsModel(query, options, token) {
         const recommendations = await this.getWorkspaceRecommendations();
         const installableRecommendations = (await this.getInstallableRecommendations(recommendations, { ...options, source: 'recommendations-workspace' }, token));
-        const result = coalesce(( recommendations.map(
-            id => installableRecommendations.find(i => areSameExtensions(i.identifier, { id }))
-        )));
-        return ( new PagedModel(result));
+        return ( new PagedModel(installableRecommendations));
     }
     async getKeymapRecommendationsModel(query, options, token) {
         const value = query.value.replace(/@recommended:keymaps/g, '').trim().toLowerCase();
@@ -781,7 +810,9 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
         const local = ( (await this.extensionsWorkbenchService.queryLocal(this.options.server))
             .map(e => e.identifier.id.toLowerCase()));
         const workspaceRecommendations = ( (await this.getWorkspaceRecommendations())
-            .map(extensionId => extensionId.toLowerCase()));
+            .map(
+            extensionId => isString(extensionId) ? extensionId.toLowerCase() : extensionId
+        ));
         return distinct(flatten(await Promise.all([
             this.extensionRecommendationsService.getImportantRecommendations(),
             this.extensionRecommendationsService.getFileBasedRecommendations(),
@@ -795,22 +826,16 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
             this.extensionRecommendationsService.getImportantRecommendations(),
             this.extensionRecommendationsService.getFileBasedRecommendations(),
             this.extensionRecommendationsService.getOtherRecommendations()
-        ])).filter(extensionId => !local.includes(extensionId.toLowerCase())), extensionId => extensionId.toLowerCase());
+        ])).filter(extensionId => !isString(extensionId) || !local.includes(extensionId.toLowerCase())));
         const installableRecommendations = await this.getInstallableRecommendations(allRecommendations, { ...options, source: 'recommendations-all', sortBy: undefined }, token);
-        const result = coalesce(( allRecommendations.map(
-            id => installableRecommendations.find(i => areSameExtensions(i.identifier, { id }))
-        )));
-        return ( new PagedModel(result.slice(0, 8)));
+        return ( new PagedModel(installableRecommendations.slice(0, 8)));
     }
     async searchRecommendations(query, options, token) {
         const value = query.value.replace(/@recommended/g, '').trim().toLowerCase();
         const recommendations = distinct([...(await this.getWorkspaceRecommendations()), ...(await this.getOtherRecommendations())]);
         const installableRecommendations = (await this.getInstallableRecommendations(recommendations, { ...options, source: 'recommendations', sortBy: undefined }, token))
             .filter(extension => extension.identifier.id.toLowerCase().indexOf(value) > -1);
-        const result = coalesce(( recommendations.map(
-            id => installableRecommendations.find(i => areSameExtensions(i.identifier, { id }))
-        )));
-        return ( new PagedModel(this.sortExtensions(result, options)));
+        return ( new PagedModel(this.sortExtensions(installableRecommendations, options)));
     }
     setModel(model, error, donotResetScrollTop) {
         if (this.list) {
@@ -1052,7 +1077,8 @@ ExtensionsListView = ExtensionsListView_1 = ( __decorate([
     ( __param(24, IWorkbenchExtensionEnablementService)),
     ( __param(25, IWorkbenchLayoutService)),
     ( __param(26, IExtensionFeaturesManagementService)),
-    ( __param(27, ILogService))
+    ( __param(27, IUriIdentityService)),
+    ( __param(28, ILogService))
 ], ExtensionsListView));
 class DefaultPopularExtensionsView extends ExtensionsListView {
     async show() {
@@ -1106,8 +1132,8 @@ class RecentlyUpdatedExtensionsView extends ExtensionsListView {
     }
 }
 let StaticQueryExtensionsView = class StaticQueryExtensionsView extends ExtensionsListView {
-    constructor(options, viewletViewOptions, notificationService, keybindingService, contextMenuService, instantiationService, themeService, extensionService, extensionsWorkbenchService, extensionRecommendationsService, telemetryService, configurationService, contextService, extensionManagementServerService, extensionManifestPropertiesService, extensionManagementService, workspaceService, productService, contextKeyService, viewDescriptorService, openerService, preferencesService, storageService, workspaceTrustManagementService, extensionEnablementService, layoutService, extensionFeaturesManagementService, logService) {
-        super(options, viewletViewOptions, notificationService, keybindingService, contextMenuService, instantiationService, themeService, extensionService, extensionsWorkbenchService, extensionRecommendationsService, telemetryService, configurationService, contextService, extensionManagementServerService, extensionManifestPropertiesService, extensionManagementService, workspaceService, productService, contextKeyService, viewDescriptorService, openerService, preferencesService, storageService, workspaceTrustManagementService, extensionEnablementService, layoutService, extensionFeaturesManagementService, logService);
+    constructor(options, viewletViewOptions, notificationService, keybindingService, contextMenuService, instantiationService, themeService, extensionService, extensionsWorkbenchService, extensionRecommendationsService, telemetryService, configurationService, contextService, extensionManagementServerService, extensionManifestPropertiesService, extensionManagementService, workspaceService, productService, contextKeyService, viewDescriptorService, openerService, preferencesService, storageService, workspaceTrustManagementService, extensionEnablementService, layoutService, extensionFeaturesManagementService, uriIdentityService, logService) {
+        super(options, viewletViewOptions, notificationService, keybindingService, contextMenuService, instantiationService, themeService, extensionService, extensionsWorkbenchService, extensionRecommendationsService, telemetryService, configurationService, contextService, extensionManagementServerService, extensionManifestPropertiesService, extensionManagementService, workspaceService, productService, contextKeyService, viewDescriptorService, openerService, preferencesService, storageService, workspaceTrustManagementService, extensionEnablementService, layoutService, extensionFeaturesManagementService, uriIdentityService, logService);
         this.options = options;
     }
     show() {
@@ -1140,7 +1166,8 @@ StaticQueryExtensionsView = ( __decorate([
     ( __param(24, IWorkbenchExtensionEnablementService)),
     ( __param(25, IWorkbenchLayoutService)),
     ( __param(26, IExtensionFeaturesManagementService)),
-    ( __param(27, ILogService))
+    ( __param(27, IUriIdentityService)),
+    ( __param(28, ILogService))
 ], StaticQueryExtensionsView));
 function toSpecificWorkspaceUnsupportedQuery(query, qualifier) {
     if (!query) {
@@ -1258,13 +1285,26 @@ class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
         const installed = (await this.extensionsWorkbenchService.queryLocal())
             .filter(l => l.enablementState !== 1 );
         const recommendations = (await this.getWorkspaceRecommendations())
-            .filter(extensionId => installed.every(local => !areSameExtensions({ id: extensionId }, local.identifier)));
+            .filter(recommendation => installed.every(local => isString(recommendation) ? !areSameExtensions({ id: recommendation }, local.identifier) : !this.uriIdentityService.extUri.isEqual(recommendation, local.local?.location)));
         return this.getInstallableRecommendations(recommendations, { source: 'install-all-workspace-recommendations' }, CancellationToken.None);
     }
     async installWorkspaceRecommendations() {
         const installableRecommendations = await this.getInstallableWorkspaceRecommendations();
         if (installableRecommendations.length) {
-            await this.extensionManagementService.installGalleryExtensions(( installableRecommendations.map(i => ({ extension: i.gallery, options: {} }))));
+            const galleryExtensions = [];
+            const resourceExtensions = [];
+            for (const recommendation of installableRecommendations) {
+                if (recommendation.gallery) {
+                    galleryExtensions.push({ extension: recommendation.gallery, options: {} });
+                }
+                else {
+                    resourceExtensions.push(recommendation);
+                }
+            }
+            await Promise.all([
+                this.extensionManagementService.installGalleryExtensions(galleryExtensions),
+                ...( resourceExtensions.map(extension => this.extensionsWorkbenchService.install(extension)))
+            ]);
         }
         else {
             this.notificationService.notify({