expose setting to customise extension kind

sandy081 · sandy081 · commit fd3136edf735 · 2019-04-16T17:29:07.000+02:00
diff --git a/src/vs/platform/extensions/node/extensionsUtil.ts b/src/vs/platform/extensions/node/extensionsUtil.ts
@@ -11,13 +11,13 @@ import product from 'vs/platform/product/node/product';
 
 export function isUIExtension(manifest: IExtensionManifest, uiContributions: string[], configurationService: IConfigurationService): boolean {
 	const extensionId = getGalleryExtensionId(manifest.publisher, manifest.name);
-	const configuredUIExtensions = configurationService.getValue<string[]>('_workbench.uiExtensions') || [];
-	if (configuredUIExtensions.some(id => areSameExtensions({ id }, { id: extensionId }))) {
-		return true;
-	}
-	if (configuredUIExtensions.some(id => areSameExtensions({ id }, { id: `-${extensionId}` }))) {
+	const { ui, workspace } = configurationService.getValue<{ ui: string[], workspace: string[] }>('extensions.extensionKind') || { ui: [], workspace: [] };
+	if (isNonEmptyArray(workspace) && workspace.some(id => areSameExtensions({ id }, { id: extensionId }))) {
 		return false;
 	}
+	if (isNonEmptyArray(ui) && ui.some(id => areSameExtensions({ id }, { id: extensionId }))) {
+		return true;
+	}
 	switch (manifest.extensionKind) {
 		case 'ui': return true;
 		case 'workspace': return false;
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts
@@ -242,6 +242,30 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				description: localize('extensionsCloseExtensionDetailsOnViewChange', "When enabled, editors with extension details will be automatically closed upon navigating away from the Extensions View."),
 				default: false
 			},
+			'extensions.extensionKind': {
+				type: 'object',
+				description: localize('extensions.extensionKind', "Configure ui or workspace extensions and allow them to run locally or remotely in a remote window."),
+				properties: {
+					'ui': {
+						type: 'array',
+						items: {
+							type: 'string',
+							pattern: '^([a-z0-9A-Z][a-z0-9\-A-Z]*)\\.([a-z0-9A-Z][a-z0-9\-A-Z]*)$',
+						}
+					},
+					'workspace': {
+						type: 'array',
+						items: {
+							type: 'string',
+							pattern: '^([a-z0-9A-Z][a-z0-9\-A-Z]*)\\.([a-z0-9A-Z][a-z0-9\-A-Z]*)$',
+						}
+					}
+				},
+				default: {
+					ui: [],
+					workspace: []
+				}
+			},
 			'extensions.showInstalledExtensionsByDefault': {
 				type: 'boolean',
 				description: localize('extensions.showInstalledExtensionsByDefault', "When enabled, extensions view shows installed extensions view by default."),
