remove the filters not applicable to ads (#15409)

This commit is contained in:
Alan Ren
2021-05-11 13:57:20 -07:00
committed by GitHub
parent f03a129186
commit ed40a0b91e
2 changed files with 25 additions and 18 deletions

View File

@@ -155,24 +155,25 @@ export interface IExtensionIdentifier {
uuid?: string; uuid?: string;
} }
// {{SQL CARBON EDIT}} - ADS only implemented language pack filtering
export const EXTENSION_CATEGORIES = [ export const EXTENSION_CATEGORIES = [
'Azure', // 'Azure',
'Data Science', // 'Data Science',
'Debuggers', // 'Debuggers',
'Extension Packs', // 'Extension Packs',
'Formatters', // 'Formatters',
'Keymaps', // 'Keymaps',
'Language Packs', 'Language Packs',
'Linters', // 'Linters',
'Machine Learning', // 'Machine Learning',
'Notebooks', // 'Notebooks',
'Programming Languages', // 'Programming Languages',
'SCM Providers', // 'SCM Providers',
'Snippets', // 'Snippets',
'Testing', // 'Testing',
'Themes', // 'Themes',
'Visualization', // 'Visualization',
'Other', // 'Other',
]; ];
export interface IExtensionManifest { export interface IExtensionManifest {

View File

@@ -14,7 +14,7 @@ import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsServi
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { IOutputChannelRegistry, Extensions as OutputExtensions } from 'vs/workbench/services/output/common/output'; import { IOutputChannelRegistry, Extensions as OutputExtensions } from 'vs/workbench/services/output/common/output';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, DefaultViewsContext, ExtensionsSortByContext, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions'; import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, DefaultViewsContext, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions'; //{{SQL CARBON EDIT}}
import { ReinstallAction, InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, PromptExtensionInstallFailureAction, SearchExtensionsAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions'; import { ReinstallAction, InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, PromptExtensionInstallFailureAction, SearchExtensionsAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput'; import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
import { ExtensionEditor } from 'vs/workbench/contrib/extensions/browser/extensionEditor'; import { ExtensionEditor } from 'vs/workbench/contrib/extensions/browser/extensionEditor';
@@ -67,7 +67,7 @@ import { isArray } from 'vs/base/common/types';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs'; import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
import { mnemonicButtonLabel } from 'vs/base/common/labels'; import { mnemonicButtonLabel } from 'vs/base/common/labels';
import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery'; // import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery'; {{SQL CARBON EDIT}}
import { Promises } from 'vs/base/common/async'; import { Promises } from 'vs/base/common/async';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
@@ -762,6 +762,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
icon: filterIcon, icon: filterIcon,
}); });
/* {{SQL CARBON EDIT}} - Remove the menu items not applicable in ADS
const showFeaturedExtensionsId = 'extensions.filter.featured'; const showFeaturedExtensionsId = 'extensions.filter.featured';
this.registerExtensionAction({ this.registerExtensionAction({
id: showFeaturedExtensionsId, id: showFeaturedExtensionsId,
@@ -800,6 +801,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
}, },
run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@popular ')) run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@popular '))
}); });
*/
this.registerExtensionAction({ this.registerExtensionAction({
id: 'workbench.extensions.action.showRecommendedExtensions', id: 'workbench.extensions.action.showRecommendedExtensions',
@@ -820,6 +822,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@recommended ')) run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@recommended '))
}); });
/* {{SQL CARBON EDIT}} - Remove the menu items not applicable in ADS
this.registerExtensionAction({ this.registerExtensionAction({
id: 'workbench.extensions.action.recentlyPublishedExtensions', id: 'workbench.extensions.action.recentlyPublishedExtensions',
title: { value: localize('recentlyPublishedExtensions', "Show Recently Published Extensions"), original: 'Show Recently Published Extensions' }, title: { value: localize('recentlyPublishedExtensions', "Show Recently Published Extensions"), original: 'Show Recently Published Extensions' },
@@ -838,6 +841,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
}, },
run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@sort:publishedDate ')) run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@sort:publishedDate '))
}); });
*/
const extensionsCategoryFilterSubMenu = new MenuId('extensionsCategoryFilterSubMenu'); const extensionsCategoryFilterSubMenu = new MenuId('extensionsCategoryFilterSubMenu');
MenuRegistry.appendMenuItem(extensionsFilterSubMenu, <ISubmenuItem>{ MenuRegistry.appendMenuItem(extensionsFilterSubMenu, <ISubmenuItem>{
@@ -952,6 +956,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@outdated ')) run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@outdated '))
}); });
/* {{SQL CARBON EDIT}} - Remove the menu items not applicable in ADS
const extensionsSortSubMenu = new MenuId('extensionsSortSubMenu'); const extensionsSortSubMenu = new MenuId('extensionsSortSubMenu');
MenuRegistry.appendMenuItem(extensionsFilterSubMenu, <ISubmenuItem>{ MenuRegistry.appendMenuItem(extensionsFilterSubMenu, <ISubmenuItem>{
submenu: extensionsSortSubMenu, submenu: extensionsSortSubMenu,
@@ -986,6 +991,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
} }
}); });
}); });
*/
this.registerExtensionAction({ this.registerExtensionAction({
id: 'workbench.extensions.action.clearExtensionsSearchResults', id: 'workbench.extensions.action.clearExtensionsSearchResults',