@codingame/monaco-vscode-extension-gallery-service-override 2.0.3 → 2.1.0

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

@@ -16,7 +16,7 @@ import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAct
 import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsInput';
-import { ServerInstalledExtensionsView, DefaultPopularExtensionsView, DefaultRecommendedExtensionsView, EnabledExtensionsView, DisabledExtensionsView, SearchMarketplaceExtensionsView, ExtensionsListView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, WorkspaceRecommendedExtensionsView, RecommendedExtensionsView, BuiltInFeatureExtensionsView, BuiltInThemesExtensionsView, BuiltInProgrammingLanguageExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DeprecatedExtensionsView } from './extensionsViews.js';
+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';
@@ -36,6 +36,7 @@ import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/view
 import { Query } from '../common/extensionQuery.js';
 import { SuggestEnabledInput } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
 import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
+import { EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
@@ -59,6 +60,7 @@ const DefaultViewsContext = ( new RawContextKey('defaultExtensionViews', true));
 const ExtensionsSortByContext = ( new RawContextKey('extensionsSortByValue', ''));
 const SearchMarketplaceExtensionsContext = ( new RawContextKey('searchMarketplaceExtensions', false));
 const SearchHasTextContext = ( new RawContextKey('extensionSearchHasText', false));
+const InstalledExtensionsContext = ( new RawContextKey('installedExtensions', false));
 const SearchInstalledExtensionsContext = ( new RawContextKey('searchInstalledExtensions', false));
 const SearchRecentlyUpdatedExtensionsContext = ( new RawContextKey('searchRecentlyUpdatedExtensions', false));
 const SearchExtensionUpdatesContext = ( new RawContextKey('searchExtensionUpdates', false));
@@ -179,11 +181,11 @@ let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContributio
                 constructor() {
                     super({
                         id: 'workbench.extensions.actions.installLocalExtensionsInRemote',
-                        title: { value: ( localizeWithPath(
+                        title: ( localize2WithPath(
                             'vs/workbench/contrib/extensions/browser/extensionsViewlet',
                             'install remote in local',
-                            "Install Remote Extensions Locally..."
-                        )), original: 'Install Remote Extensions Locally...' },
+                            'Install Remote Extensions Locally...'
+                        )),
                         category: REMOTE_CATEGORY,
                         f1: true
                     });
@@ -275,7 +277,7 @@ let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContributio
                 "Installed"
             )),
             ctorDescriptor: ( new SyncDescriptor(ExtensionsListView, [{}])),
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.has('searchInstalledExtensions')))),
+            when: ( ContextKeyExpr.or(( ContextKeyExpr.has('searchInstalledExtensions')), ( ContextKeyExpr.has('installedExtensions')))),
         });
         viewDescriptors.push({
             id: 'workbench.views.extensions.searchRecentlyUpdated',
@@ -369,6 +371,10 @@ let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContributio
     }
     createBuiltinExtensionsViewDescriptors() {
         const viewDescriptors = [];
+        const configuredCategories = ['themes', 'programming languages'];
+        const otherCategories = EXTENSION_CATEGORIES.filter(c => !configuredCategories.includes(c.toLowerCase()));
+        otherCategories.push(NONE_CATEGORY);
+        const otherCategoriesQuery = `${( otherCategories.map(c => `category:"${c}"`)).join(' ')} ${( configuredCategories.map(c => `category:"-${c}"`)).join(' ')}`;
         viewDescriptors.push({
             id: 'workbench.views.extensions.builtinFeatureExtensions',
             name: ( localize2WithPath(
@@ -376,7 +382,7 @@ let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContributio
                 'builtinFeatureExtensions',
                 "Features"
             )),
-            ctorDescriptor: ( new SyncDescriptor(BuiltInFeatureExtensionsView, [{}])),
+            ctorDescriptor: ( new SyncDescriptor(StaticQueryExtensionsView, [{ query: `@builtin ${otherCategoriesQuery}` }])),
             when: ( ContextKeyExpr.has('builtInExtensions')),
         });
         viewDescriptors.push({
@@ -386,7 +392,7 @@ let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContributio
                 'builtInThemesExtensions',
                 "Themes"
             )),
-            ctorDescriptor: ( new SyncDescriptor(BuiltInThemesExtensionsView, [{}])),
+            ctorDescriptor: ( new SyncDescriptor(StaticQueryExtensionsView, [{ query: `@builtin category:themes` }])),
             when: ( ContextKeyExpr.has('builtInExtensions')),
         });
         viewDescriptors.push({
@@ -396,7 +402,10 @@ let ExtensionsViewletViewsContribution = class ExtensionsViewletViewsContributio
                 'builtinProgrammingLanguageExtensions',
                 "Programming Languages"
             )),
-            ctorDescriptor: ( new SyncDescriptor(BuiltInProgrammingLanguageExtensionsView, [{}])),
+            ctorDescriptor: ( new SyncDescriptor(
+                StaticQueryExtensionsView,
+                [{ query: `@builtin category:"programming languages"` }]
+            )),
             when: ( ContextKeyExpr.has('builtInExtensions')),
         });
         return viewDescriptors;
@@ -484,6 +493,7 @@ let ExtensionsViewPaneContainer = class ExtensionsViewPaneContainer extends View
         this.searchMarketplaceExtensionsContextKey = SearchMarketplaceExtensionsContext.bindTo(contextKeyService);
         this.searchHasTextContextKey = SearchHasTextContext.bindTo(contextKeyService);
         this.sortByUpdateDateContextKey = SortByUpdateDateContext.bindTo(contextKeyService);
+        this.installedExtensionsContextKey = InstalledExtensionsContext.bindTo(contextKeyService);
         this.searchInstalledExtensionsContextKey = SearchInstalledExtensionsContext.bindTo(contextKeyService);
         this.searchRecentlyUpdatedExtensionsContextKey = SearchRecentlyUpdatedExtensionsContext.bindTo(contextKeyService);
         this.searchExtensionUpdatesContextKey = SearchExtensionUpdatesContext.bindTo(contextKeyService);
@@ -665,7 +675,8 @@ let ExtensionsViewPaneContainer = class ExtensionsViewPaneContainer extends View
         this.contextKeyService.bufferChangeEvents(() => {
             const isRecommendedExtensionsQuery = ExtensionsListView.isRecommendedExtensionsQuery(value);
             this.searchHasTextContextKey.set(value.trim() !== '');
-            this.searchInstalledExtensionsContextKey.set(ExtensionsListView.isInstalledExtensionsQuery(value));
+            this.installedExtensionsContextKey.set(ExtensionsListView.isInstalledExtensionsQuery(value));
+            this.searchInstalledExtensionsContextKey.set(ExtensionsListView.isSearchInstalledExtensionsQuery(value));
             this.searchRecentlyUpdatedExtensionsContextKey.set(ExtensionsListView.isSearchRecentlyUpdatedQuery(value) && !ExtensionsListView.isSearchExtensionUpdatesQuery(value));
             this.searchOutdatedExtensionsContextKey.set(ExtensionsListView.isOutdatedExtensionsQuery(value) && !ExtensionsListView.isSearchExtensionUpdatesQuery(value));
             this.searchExtensionUpdatesContextKey.set(ExtensionsListView.isSearchExtensionUpdatesQuery(value));

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

@@ -48,7 +48,7 @@ import { isOfflineError } from 'vscode/vscode/vs/base/parts/request/common/reque
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 
 var ExtensionsListView_1;
-const FORCE_FEATURE_EXTENSIONS = ['vscode.git', 'vscode.git-base', 'vscode.search-result'];
+const NONE_CATEGORY = 'none';
 class ExtensionsViewState extends Disposable {
     constructor() {
         super(...arguments);
@@ -363,65 +363,51 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
         return { extensions, canIncludeInstalledExtensions };
     }
     filterBuiltinExtensions(local, query, options) {
-        let value = query.value;
-        const showThemesOnly = /@builtin:themes/i.test(value);
-        if (showThemesOnly) {
-            value = value.replace(/@builtin:themes/g, '');
-        }
-        const showBasicsOnly = /@builtin:basics/i.test(value);
-        if (showBasicsOnly) {
-            value = value.replace(/@builtin:basics/g, '');
-        }
-        const showFeaturesOnly = /@builtin:features/i.test(value);
-        if (showFeaturesOnly) {
-            value = value.replace(/@builtin:features/g, '');
-        }
+        let { value, includedCategories, excludedCategories } = this.parseCategories(query.value);
         value = value.replace(/@builtin/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase();
         const result = local
-            .filter(e => e.isBuiltin && (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1));
-        const isThemeExtension = (e) => {
-            return (Array.isArray(e.local?.manifest?.contributes?.themes) && e.local.manifest.contributes.themes.length > 0)
-                || (Array.isArray(e.local?.manifest?.contributes?.iconThemes) && e.local.manifest.contributes.iconThemes.length > 0);
-        };
-        if (showThemesOnly) {
-            const themesExtensions = result.filter(isThemeExtension);
-            return this.sortExtensions(themesExtensions, options);
+            .filter(e => e.isBuiltin && (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1)
+            && this.filterExtensionByCategory(e, includedCategories, excludedCategories));
+        return this.sortExtensions(result, options);
+    }
+    filterExtensionByCategory(e, includedCategories, excludedCategories) {
+        if (!includedCategories.length && !excludedCategories.length) {
+            return true;
         }
-        const isLanguageBasicExtension = (e) => {
-            return FORCE_FEATURE_EXTENSIONS.indexOf(e.identifier.id) === -1
-                && (Array.isArray(e.local?.manifest?.contributes?.grammars) && e.local.manifest.contributes.grammars.length > 0);
-        };
-        if (showBasicsOnly) {
-            const basics = result.filter(isLanguageBasicExtension);
-            return this.sortExtensions(basics, options);
-        }
-        if (showFeaturesOnly) {
-            const others = result.filter(e => {
-                return e.local
-                    && e.local.manifest
-                    && !isThemeExtension(e)
-                    && !isLanguageBasicExtension(e);
-            });
-            return this.sortExtensions(others, options);
+        if (e.categories.length) {
+            if (excludedCategories.length && ( e.categories.some(category => excludedCategories.includes(category.toLowerCase())))) {
+                return false;
+            }
+            return ( e.categories.some(category => includedCategories.includes(category.toLowerCase())));
+        }
+        else {
+            return includedCategories.includes(NONE_CATEGORY);
         }
-        return this.sortExtensions(result, options);
     }
     parseCategories(value) {
-        const categories = [];
+        const includedCategories = [];
+        const excludedCategories = [];
         value = value.replace(/\bcategory:("([^"]*)"|([^"]\S*))(\s+|\b|$)/g, (_, quotedCategory, category) => {
             const entry = (category || quotedCategory || '').toLowerCase();
-            if (categories.indexOf(entry) === -1) {
-                categories.push(entry);
+            if (entry.startsWith('-')) {
+                if (excludedCategories.indexOf(entry) === -1) {
+                    excludedCategories.push(entry);
+                }
+            }
+            else {
+                if (includedCategories.indexOf(entry) === -1) {
+                    includedCategories.push(entry);
+                }
             }
             return '';
         });
-        return { value, categories };
+        return { value, includedCategories, excludedCategories };
     }
     filterInstalledExtensions(local, runningExtensions, query, options) {
-        let { value, categories } = this.parseCategories(query.value);
+        let { value, includedCategories, excludedCategories } = this.parseCategories(query.value);
         value = value.replace(/@installed/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase();
         const matchingText = (e) => (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1 || e.description.toLowerCase().indexOf(value) > -1)
-            && (!categories.length || ( categories.some(category => ( (e.local && e.local.manifest.categories || []).some(c => c.toLowerCase() === category)))));
+            && this.filterExtensionByCategory(e, includedCategories, excludedCategories);
         let result;
         if (options.sortBy !== undefined) {
             result = local.filter(e => !e.isBuiltin && matchingText(e));
@@ -473,27 +459,27 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
         return result;
     }
     filterOutdatedExtensions(local, query, options) {
-        let { value, categories } = this.parseCategories(query.value);
+        let { value, includedCategories, excludedCategories } = this.parseCategories(query.value);
         value = value.replace(/@outdated/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase();
         const result = local
             .sort((e1, e2) => e1.displayName.localeCompare(e2.displayName))
             .filter(extension => extension.outdated
             && (extension.name.toLowerCase().indexOf(value) > -1 || extension.displayName.toLowerCase().indexOf(value) > -1)
-            && (!categories.length || ( categories.some(category => !!extension.local && ( extension.local.manifest.categories.some(c => c.toLowerCase() === category))))));
+            && this.filterExtensionByCategory(extension, includedCategories, excludedCategories));
         return this.sortExtensions(result, options);
     }
     filterDisabledExtensions(local, runningExtensions, query, options) {
-        let { value, categories } = this.parseCategories(query.value);
+        let { value, includedCategories, excludedCategories } = this.parseCategories(query.value);
         value = value.replace(/@disabled/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase();
         const result = local
             .sort((e1, e2) => e1.displayName.localeCompare(e2.displayName))
             .filter(e => runningExtensions.every(r => !areSameExtensions({ id: r.identifier.value, uuid: r.uuid }, e.identifier))
             && (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1)
-            && (!categories.length || ( categories.some(category => ( (e.local && e.local.manifest.categories || []).some(c => c.toLowerCase() === category))))));
+            && this.filterExtensionByCategory(e, includedCategories, excludedCategories));
         return this.sortExtensions(result, options);
     }
     filterEnabledExtensions(local, runningExtensions, query, options) {
-        let { value, categories } = this.parseCategories(query.value);
+        let { value, includedCategories, excludedCategories } = this.parseCategories(query.value);
         value = value ? value.replace(/@enabled/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase() : '';
         local = local.filter(e => !e.isBuiltin);
         const result = local
@@ -502,7 +488,7 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
             r => areSameExtensions({ id: r.identifier.value, uuid: r.uuid }, e.identifier)
         ))
             && (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1)
-            && (!categories.length || ( categories.some(category => ( (e.local && e.local.manifest.categories || []).some(c => c.toLowerCase() === category))))));
+            && this.filterExtensionByCategory(e, includedCategories, excludedCategories));
         return this.sortExtensions(result, options);
     }
     filterWorkspaceUnsupportedExtensions(local, query, options) {
@@ -561,12 +547,12 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
         return this.sortExtensions(local, options);
     }
     filterRecentlyUpdatedExtensions(local, query, options) {
-        let { value, categories } = this.parseCategories(query.value);
+        let { value, includedCategories, excludedCategories } = this.parseCategories(query.value);
         const currentTime = Date.now();
         local = local.filter(e => !e.isBuiltin && !e.outdated && e.local?.updated && e.local?.installedTimestamp !== undefined && currentTime - e.local.installedTimestamp < ExtensionsListView_1.RECENT_UPDATE_DURATION);
         value = value.replace(/@recentlyUpdated/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase();
-        const result = local.filter(e => (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1) &&
-            (!categories.length || ( categories.some(category => ( (e.local && e.local.manifest.categories || []).some(c => c.toLowerCase() === category))))));
+        const result = local.filter(e => (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1)
+            && this.filterExtensionByCategory(e, includedCategories, excludedCategories));
         options.sortBy = options.sortBy ?? "UpdateDate" ;
         return this.sortExtensions(result, options);
     }
@@ -921,6 +907,7 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
     }
     static isLocalExtensionsQuery(query, sortBy) {
         return this.isInstalledExtensionsQuery(query)
+            || this.isSearchInstalledExtensionsQuery(query)
             || this.isOutdatedExtensionsQuery(query)
             || this.isEnabledExtensionsQuery(query)
             || this.isDisabledExtensionsQuery(query)
@@ -946,7 +933,10 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
         return /^\s*@workspaceUnsupported(:(untrusted|virtual)(Partial)?)?(\s|$)/i.test(query);
     }
     static isInstalledExtensionsQuery(query) {
-        return /@installed/i.test(query);
+        return /@installed$/i.test(query);
+    }
+    static isSearchInstalledExtensionsQuery(query) {
+        return /@installed\s./i.test(query);
     }
     static isOutdatedExtensionsQuery(query) {
         return /@outdated/i.test(query);
@@ -1072,9 +1062,11 @@ class OutdatedExtensionsView extends ExtensionsListView {
         if (ExtensionsListView.isSearchExtensionUpdatesQuery(query)) {
             query = query.replace('@updates', '@outdated');
         }
-        const model = await super.show(query.trim());
-        this.setExpanded(model.length > 0);
-        return model;
+        return super.show(query.trim());
+    }
+    updateSize() {
+        super.updateSize();
+        this.setExpanded(this.count() > 0);
     }
 }
 class RecentlyUpdatedExtensionsView extends ExtensionsListView {
@@ -1086,21 +1078,42 @@ class RecentlyUpdatedExtensionsView extends ExtensionsListView {
         return super.show(query.trim());
     }
 }
-class BuiltInFeatureExtensionsView extends ExtensionsListView {
-    async show(query) {
-        return (query && query.trim() !== '@builtin') ? this.showEmptyModel() : super.show('@builtin:features');
+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, 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, logService);
+        this.options = options;
     }
-}
-class BuiltInThemesExtensionsView extends ExtensionsListView {
-    async show(query) {
-        return (query && query.trim() !== '@builtin') ? this.showEmptyModel() : super.show('@builtin:themes');
+    show() {
+        return super.show(this.options.query);
     }
-}
-class BuiltInProgrammingLanguageExtensionsView extends ExtensionsListView {
-    async show(query) {
-        return (query && query.trim() !== '@builtin') ? this.showEmptyModel() : super.show('@builtin:basics');
-    }
-}
+};
+StaticQueryExtensionsView = ( __decorate([
+    ( __param(2, INotificationService)),
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IContextMenuService)),
+    ( __param(5, IInstantiationService)),
+    ( __param(6, IThemeService)),
+    ( __param(7, IExtensionService)),
+    ( __param(8, IExtensionsWorkbenchService)),
+    ( __param(9, IExtensionRecommendationsService)),
+    ( __param(10, ITelemetryService)),
+    ( __param(11, IConfigurationService)),
+    ( __param(12, IWorkspaceContextService)),
+    ( __param(13, IExtensionManagementServerService)),
+    ( __param(14, IExtensionManifestPropertiesService)),
+    ( __param(15, IWorkbenchExtensionManagementService)),
+    ( __param(16, IWorkspaceContextService)),
+    ( __param(17, IProductService)),
+    ( __param(18, IContextKeyService)),
+    ( __param(19, IViewDescriptorService)),
+    ( __param(20, IOpenerService)),
+    ( __param(21, IPreferencesService)),
+    ( __param(22, IStorageService)),
+    ( __param(23, IWorkspaceTrustManagementService)),
+    ( __param(24, IWorkbenchExtensionEnablementService)),
+    ( __param(25, IWorkbenchLayoutService)),
+    ( __param(26, ILogService))
+], StaticQueryExtensionsView));
 function toSpecificWorkspaceUnsupportedQuery(query, qualifier) {
     if (!query) {
         return '@workspaceUnsupported:' + qualifier;
@@ -1267,4 +1280,4 @@ function getAriaLabelForExtension(extension) {
     return `${extension.displayName}, ${deprecated ? `${deprecated}, ` : ''}${extension.version}, ${publisher}, ${extension.description} ${rating ? `, ${rating}` : ''}`;
 }
 
-export { BuiltInFeatureExtensionsView, BuiltInProgrammingLanguageExtensionsView, BuiltInThemesExtensionsView, DefaultPopularExtensionsView, DefaultRecommendedExtensionsView, DeprecatedExtensionsView, DisabledExtensionsView, EnabledExtensionsView, ExtensionsListView, OutdatedExtensionsView, RecentlyUpdatedExtensionsView, RecommendedExtensionsView, SearchMarketplaceExtensionsView, ServerInstalledExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, WorkspaceRecommendedExtensionsView, getAriaLabelForExtension };
+export { DefaultPopularExtensionsView, DefaultRecommendedExtensionsView, DeprecatedExtensionsView, DisabledExtensionsView, EnabledExtensionsView, ExtensionsListView, NONE_CATEGORY, OutdatedExtensionsView, RecentlyUpdatedExtensionsView, RecommendedExtensionsView, SearchMarketplaceExtensionsView, ServerInstalledExtensionsView, StaticQueryExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, WorkspaceRecommendedExtensionsView, getAriaLabelForExtension };

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

@@ -20,7 +20,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { starFullIcon, verifiedPublisherIcon, sponsorIcon, installCountIcon, starHalfIcon, starEmptyIcon, remoteIcon, ratingIcon, preReleaseIcon, syncIgnoredIcon, activationTimeIcon, errorIcon, warningIcon, infoIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
 import { registerColor, textLinkForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
-import { IHoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hover';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
@@ -277,18 +277,11 @@ class PreReleaseBookmarkWidget extends ExtensionWidget {
     }
     render() {
         this.clear();
-        if (!this.extension) {
-            return;
-        }
-        if (!this.extension.hasPreReleaseVersion) {
-            return;
-        }
-        if (this.extension.state === 1  && !this.extension.local?.isPreReleaseVersion) {
-            return;
+        if (this.extension?.state === 1  ? this.extension.preRelease : this.extension?.hasPreReleaseVersion) {
+            this.element = append(this.parent, $('div.extension-bookmark'));
+            const preRelease = append(this.element, $('.pre-release'));
+            append(preRelease, $('span' + ThemeIcon.asCSSSelector(preReleaseIcon)));
         }
-        this.element = append(this.parent, $('div.extension-bookmark'));
-        const preRelease = append(this.element, $('.pre-release'));
-        append(preRelease, $('span' + ThemeIcon.asCSSSelector(preReleaseIcon)));
     }
 }
 let RemoteBadgeWidget = class RemoteBadgeWidget extends ExtensionWidget {
@@ -497,15 +490,7 @@ let ExtensionHoverWidget = ExtensionHoverWidget_1 = class ExtensionHoverWidget e
         const markdown = ( new MarkdownString('', { isTrusted: true, supportThemeIcons: true }));
         markdown.appendMarkdown(`**${this.extension.displayName}**`);
         if (valid(this.extension.version)) {
-            markdown.appendMarkdown(`&nbsp;<span style="background-color:#8080802B;">**&nbsp;_v${this.extension.version}_**&nbsp;</span>`);
-        }
-        if (this.extension.state === 1  ? this.extension.local?.isPreReleaseVersion : this.extension.gallery?.properties.isPreReleaseVersion) {
-            const extensionPreReleaseIcon = this.themeService.getColorTheme().getColor(extensionPreReleaseIconColor);
-            markdown.appendMarkdown(`**&nbsp;**&nbsp;<span style="color:#ffffff;background-color:${extensionPreReleaseIcon ? Color.Format.CSS.formatHex(extensionPreReleaseIcon) : '#ffffff'};">&nbsp;$(${preReleaseIcon.id})&nbsp;${( localizeWithPath(
-                'vs/workbench/contrib/extensions/browser/extensionsWidgets',
-                'pre-release-label',
-                "Pre-Release"
-            ))}&nbsp;</span>`);
+            markdown.appendMarkdown(`&nbsp;<span style="background-color:#8080802B;">**&nbsp;_v${this.extension.version}${(this.extension.isPreReleaseVersion ? ' (pre-release)' : '')}_**&nbsp;</span>`);
         }
         markdown.appendText(`\n`);
         if (this.extension.state === 1 ) {
@@ -678,7 +663,10 @@ let ExtensionHoverWidget = ExtensionHoverWidget_1 = class ExtensionHoverWidget e
         if (extension.isBuiltin) {
             return undefined;
         }
-        if (extension.local?.isPreReleaseVersion || extension.gallery?.properties.isPreReleaseVersion) {
+        if (extension.isPreReleaseVersion) {
+            return undefined;
+        }
+        if (extension.preRelease) {
             return undefined;
         }
         const preReleaseVersionLink = `[${( localizeWithPath(

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

@@ -164,6 +164,9 @@ let Extension = class Extension {
     get licenseUrl() {
         return this.gallery && this.gallery.assets.license ? this.gallery.assets.license.uri : undefined;
     }
+    get supportUrl() {
+        return this.gallery && this.gallery.supportLink ? this.gallery.supportLink : undefined;
+    }
     get state() {
         return this.stateProvider(this);
     }
@@ -220,8 +223,17 @@ let Extension = class Extension {
     get preview() {
         return this.local?.manifest.preview ?? this.gallery?.preview ?? false;
     }
+    get preRelease() {
+        return !!this.local?.preRelease;
+    }
+    get isPreReleaseVersion() {
+        if (this.local) {
+            return this.local.isPreReleaseVersion;
+        }
+        return !!this.gallery?.properties.isPreReleaseVersion;
+    }
     get hasPreReleaseVersion() {
-        return !!this.gallery?.hasPreReleaseVersion;
+        return !!this.gallery?.hasPreReleaseVersion || !!this.local?.hasPreReleaseVersion;
     }
     get hasReleaseVersion() {
         return !!this.gallery?.hasReleaseVersion;
@@ -535,7 +547,8 @@ let Extensions = Extensions_1 = class Extensions extends Disposable {
     async onDidUpdateExtensionMetadata(local) {
         const extension = this.installed.find(e => areSameExtensions(e.identifier, local.identifier));
         if (extension?.local) {
-            const hasChanged = extension.local.pinned !== local.pinned;
+            const hasChanged = extension.local.pinned !== local.pinned
+                || extension.local.preRelease !== local.preRelease;
             extension.local = local;
             if (hasChanged) {
                 this._onChange.fire({ extension });
@@ -672,9 +685,6 @@ let ExtensionsWorkbenchService = class ExtensionsWorkbenchService extends Dispos
         }));
         urlService.registerHandler(this);
         this.whenInitialized = this.initialize();
-        lifecycleService.when(4 ).then(() => {
-            telemetryService.publicLog2('extensions:autoupdate', { mode: `${this.getAutoUpdateValue()}` });
-        });
     }
     async initialize() {
         await Promise.all([this.queryLocal(), this.extensionService.whenInstalledExtensionsRegistered()]);
@@ -925,7 +935,7 @@ let ExtensionsWorkbenchService = class ExtensionsWorkbenchService extends Dispos
         if (isUninstalled) {
             const canRemoveRunningExtension = runningExtension && this.extensionService.canRemoveExtension(runningExtension);
             const isSameExtensionRunning = runningExtension && (!extension.server || extension.server === this.extensionManagementServerService.getExtensionManagementServer(toExtension(runningExtension)));
-            if (!canRemoveRunningExtension && isSameExtensionRunning) {
+            if (!canRemoveRunningExtension && isSameExtensionRunning && !runningExtension.isUnderDevelopment) {
                 return ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService',
                     'postUninstallTooltip',
@@ -1549,6 +1559,16 @@ let ExtensionsWorkbenchService = class ExtensionsWorkbenchService extends Dispos
         return extension.local ? !this.isInstalledExtensionSynced(extension.local)
             : this.extensionsSyncManagementService.hasToNeverSyncExtension(extension.identifier.id);
     }
+    async togglePreRelease(extension) {
+        if (!extension.local) {
+            return;
+        }
+        if (extension.preRelease !== extension.isPreReleaseVersion) {
+            await this.extensionManagementService.updateMetadata(extension.local, { preRelease: !extension.preRelease });
+            return;
+        }
+        await this.install(extension, { installPreReleaseVersion: !extension.preRelease, preRelease: !extension.preRelease });
+    }
     async toggleExtensionIgnoredToSync(extension) {
         const isIgnored = this.isExtensionIgnoredToSync(extension);
         if (extension.local && isIgnored) {

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

@@ -108,6 +108,9 @@ let FileBasedRecommendations = class FileBasedRecommendations extends ExtensionR
         disposableTimeout(() => this.promptImportantRecommendations(uri, model), 0, this._store);
     }
     promptImportantRecommendations(uri, model, extensionRecommendations) {
+        if (model.isDisposed()) {
+            return;
+        }
         const pattern = extname(uri).toLowerCase();
         extensionRecommendations = extensionRecommendations ?? this.recommendationsByPattern.get(pattern) ?? this.fileOpenRecommendations;
         const extensionRecommendationEntries = Object.entries(extensionRecommendations);

package/vscode/src/vs/workbench/contrib/extensions/common/extensionQuery.js

@@ -2,10 +2,9 @@ import { flatten } from 'vscode/vscode/vs/base/common/arrays';
 import { EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 
 class Query {
-    constructor(value, sortBy, groupBy) {
+    constructor(value, sortBy) {
         this.value = value;
         this.sortBy = sortBy;
-        this.groupBy = groupBy;
         this.value = value.trim();
     }
     static suggestions(query) {
@@ -39,21 +38,13 @@ class Query {
             sortBy = by;
             return '';
         });
-        let groupBy = '';
-        value = value.replace(/@group:(\w+)(-\w*)?/g, (match, by, order) => {
-            groupBy = by;
-            return '';
-        });
-        return ( new Query(value, sortBy, groupBy));
+        return ( new Query(value, sortBy));
     }
     toString() {
         let result = this.value;
         if (this.sortBy) {
             result = `${result}${result ? ' ' : ''}@sort:${this.sortBy}`;
         }
-        if (this.groupBy) {
-            result = `${result}${result ? ' ' : ''}@group:${this.groupBy}`;
-        }
         return result;
     }
     isValid() {

package/vscode/src/vs/workbench/contrib/extensions/common/runtimeExtensionsInput.js

@@ -1,7 +1,14 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 
+const RuntimeExtensionsEditorIcon = registerIcon('runtime-extensions-editor-label-icon', Codicon.extensions, ( localizeWithPath(
+    'vs/workbench/contrib/extensions/common/runtimeExtensionsInput',
+    'runtimeExtensionEditorLabelIcon',
+    'Icon of the runtime extensions editor label.'
+)));
 class RuntimeExtensionsInput extends EditorInput {
     constructor() {
         super(...arguments);
@@ -30,6 +37,9 @@ class RuntimeExtensionsInput extends EditorInput {
             "Running Extensions"
         ));
     }
+    getIcon() {
+        return RuntimeExtensionsEditorIcon;
+    }
     matches(other) {
         if (super.matches(other)) {
             return true;

package/vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.js

@@ -13,7 +13,7 @@ import { IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionMan
 import { areSameExtensions, getExtensionId, getGalleryExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeManifest } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionNls';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { gt, rcompare } from 'vscode-semver';
 import { isString, isUndefined } from 'vscode/vscode/vs/base/common/types';
 import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
@@ -181,7 +181,7 @@ let WebExtensionsScannerService = class WebExtensionsScannerService extends Disp
                 }
             }
             catch (error) {
-                this.logService.info(`Error while fetching the additional builtin extension ${( location.toString())}.`, getErrorMessage(error));
+                this.logService.info(`Error while fetching the additional builtin extension ${( extensionLocation.toString())}.`, getErrorMessage(error));
             }
         })));
         return result;
@@ -804,6 +804,10 @@ let WebExtensionsScannerService = class WebExtensionsScannerService extends Disp
                 update = true;
                 webExtension.location = migratedLocation;
             }
+            if (isUndefined(webExtension.metadata?.hasPreReleaseVersion) && webExtension.metadata?.preRelease) {
+                update = true;
+                webExtension.metadata.hasPreReleaseVersion = true;
+            }
             return webExtension;
         })));
         if (update) {
@@ -862,11 +866,11 @@ if (isWeb) {
         constructor() {
             super({
                 id: 'workbench.extensions.action.openInstalledWebExtensionsResource',
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/services/extensionManagement/browser/webExtensionsScannerService',
                     'openInstalledWebExtensionsResource',
-                    "Open Installed Web Extensions Resource"
-                )), original: 'Open Installed Web Extensions Resource' },
+                    'Open Installed Web Extensions Resource'
+                )),
                 category: Categories.Developer,
                 f1: true,
                 precondition: IsWebContext