Skip sections, keep grouping in built-in view #45921

Author: ramya-rao-a

src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts

@@ -33,7 +33,7 @@ import {
 } from 'vs/workbench/parts/extensions/browser/extensionsActions';
 import { LocalExtensionType, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
-import { ExtensionsListView, InstalledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, BuiltInExtensionsView, BuiltInThemesExtensionsView, BuiltInBasicsExtensionsView } from './extensionsViews';
+import { ExtensionsListView, InstalledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, BuiltInExtensionsView } from './extensionsViews';
 import { OpenGlobalSettingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -133,9 +133,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 		viewDescriptors.push(this.createMarketPlaceExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createInstalledExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createSearchInstalledExtensionsListViewDescriptor());
-		viewDescriptors.push(this.createSearchBuiltInBasicsExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createSearchBuiltInExtensionsListViewDescriptor());
-		viewDescriptors.push(this.createSearchBuiltInThemesExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createDefaultRecommendedExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createOtherRecommendedExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createWorkspaceRecommendedExtensionsListViewDescriptor());
@@ -220,32 +218,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 			location: ViewLocation.Extensions,
 			ctor: BuiltInExtensionsView,
 			when: ContextKeyExpr.has('searchBuiltInExtensions'),
-			weight: 100,
-			canToggleVisibility: true
-		};
-	}
-
-	private createSearchBuiltInThemesExtensionsListViewDescriptor(): IViewDescriptor {
-		return {
-			id: 'extensions.builtInThemesExtensionsList',
-			name: localize('builtInThemesExtensions', "Built-In Themes"),
-			location: ViewLocation.Extensions,
-			ctor: BuiltInThemesExtensionsView,
-			when: ContextKeyExpr.has('searchBuiltInExtensions'),
-			weight: 100,
-			canToggleVisibility: true
-		};
-	}
-
-	private createSearchBuiltInBasicsExtensionsListViewDescriptor(): IViewDescriptor {
-		return {
-			id: 'extensions.builtInBasicsExtensionsList',
-			name: localize('builtInBasicsExtensions', "Built-In Language Basics"),
-			location: ViewLocation.Extensions,
-			ctor: BuiltInBasicsExtensionsView,
-			when: ContextKeyExpr.has('searchBuiltInExtensions'),
-			weight: 100,
-			canToggleVisibility: true
+			weight: 100
 		};
 	}
 

src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts

@@ -146,39 +146,25 @@ export class ExtensionsListView extends ViewsViewletPanel {
 		}
 
 		if (ExtensionsListView.isBuiltInExtensionsQuery(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, '');
-			}
-
 			value = value.replace(/@builtin/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase();
 			let result = await this.extensionsWorkbenchService.queryLocal();
 
 			result = result
 				.filter(e => e.type === LocalExtensionType.System && (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1));
 
-			if (showThemesOnly) {
-				const themesExtensions = result.filter(e => {
-					return e.local.manifest
-						&& e.local.manifest.contributes
-						&& Array.isArray(e.local.manifest.contributes.themes)
-						&& e.local.manifest.contributes.themes.length;
-				});
-				return new PagedModel(this.sortExtensions(themesExtensions, options));
-			}
-			if (showBasicsOnly) {
-				const basics = result.filter(e => {
-					return e.local.manifest
-						&& e.local.manifest.contributes
-						&& Array.isArray(e.local.manifest.contributes.languages)
-						&& e.local.manifest.contributes.languages.length;
-				});
-				return new PagedModel(this.sortExtensions(basics, options));
-			}
+			const themesExtensions = result.filter(e => {
+				return e.local.manifest
+					&& e.local.manifest.contributes
+					&& Array.isArray(e.local.manifest.contributes.themes)
+					&& e.local.manifest.contributes.themes.length;
+			});
+
+			const basics = result.filter(e => {
+				return e.local.manifest
+					&& e.local.manifest.contributes
+					&& Array.isArray(e.local.manifest.contributes.languages)
+					&& e.local.manifest.contributes.languages.length;
+			});
 
 			const others = result.filter(e => {
 				return e.local.manifest
@@ -187,7 +173,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 					&& !Array.isArray(e.local.manifest.contributes.themes);
 			});
 
-			return new PagedModel(this.sortExtensions(others, options));
+			return new PagedModel([...this.sortExtensions(others, options), ...this.sortExtensions(basics, options), ...this.sortExtensions(themesExtensions, options)]);
 		}
 
 		if (!value || ExtensionsListView.isInstalledExtensionsQuery(value)) {
@@ -581,30 +567,6 @@ export class BuiltInExtensionsView extends ExtensionsListView {
 	}
 }
 
-export class BuiltInThemesExtensionsView extends ExtensionsListView {
-
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		if (!ExtensionsListView.isBuiltInExtensionsQuery(query)) {
-			return super.show(query);
-		}
-		let searchBuiltInQuery = '@builtin:themes';
-		searchBuiltInQuery = query ? searchBuiltInQuery + ' ' + query : searchBuiltInQuery;
-		return super.show(searchBuiltInQuery);
-	}
-}
-
-export class BuiltInBasicsExtensionsView extends ExtensionsListView {
-
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		if (!ExtensionsListView.isBuiltInExtensionsQuery(query)) {
-			return super.show(query);
-		}
-		let searchBuiltInQuery = '@builtin:basics';
-		searchBuiltInQuery = query ? searchBuiltInQuery + ' ' + query : searchBuiltInQuery;
-		return super.show(searchBuiltInQuery);
-	}
-}
-
 export class RecommendedExtensionsView extends ExtensionsListView {
 
 	async show(query: string): TPromise<IPagedModel<IExtension>> {