Improve default extensionKind detection

alexdima · alexdima · commit fd91d449f985 · 2020-07-24T10:41:03.000+02:00
diff --git a/resources/serverless/code-web.js b/resources/serverless/code-web.js
@@ -124,7 +124,7 @@ async function getDefaultExtensionInfos() {
 
 	let extensionArg = args['extension'];
 	if (!extensionArg) {
-		return { extensions, locations }
+		return { extensions, locations };
 	}
 
 	const extensionPaths = Array.isArray(extensionArg) ? extensionArg : [extensionArg];
@@ -164,7 +164,6 @@ async function getExtensionPackageJSON(extensionPath) {
 					fancyLog(`${ansiColors.yellow('Warning')}: Could not find ${mainFilePath}. Use ${ansiColors.cyan('yarn gulp watch-web')} to build the built-in extensions.`);
 				}
 			}
-			packageJSON.extensionKind = ['web']; // enable for Web
 
 			const packageNLSPath = path.join(extensionPath, 'package.nls.json');
 			const packageNLSExists = await exists(packageNLSPath);
diff --git a/src/vs/workbench/services/extensions/common/extensionsUtil.ts b/src/vs/workbench/services/extensions/common/extensionsUtil.ts
@@ -61,24 +61,31 @@ export function getExtensionKind(manifest: IExtensionManifest, productService: I
 
 	// Not an UI extension if it has main
 	if (manifest.main) {
+		if (manifest.browser) {
+			return ['workspace', 'web'];
+		}
 		return ['workspace'];
 	}
 
-	// Not an UI extension if it has dependencies or an extension pack
+	if (manifest.browser) {
+		return ['web'];
+	}
+
+	// Not an UI nor web extension if it has dependencies or an extension pack
 	if (isNonEmptyArray(manifest.extensionDependencies) || isNonEmptyArray(manifest.extensionPack)) {
 		return ['workspace'];
 	}
 
 	if (manifest.contributes) {
-		// Not an UI extension if it has no ui contributions
+		// Not an UI nor web extension if it has no ui contributions
 		for (const contribution of Object.keys(manifest.contributes)) {
 			if (!isUIExtensionPoint(contribution)) {
 				return ['workspace'];
 			}
 		}
 	}
 
-	return ['ui', 'workspace'];
+	return ['ui', 'workspace', 'web'];
 }
 
 let _uiExtensionPoints: Set<string> | null = null;

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ async function getDefaultExtensionInfos() {`
`124`	`124`
`125`	`125`	`let extensionArg = args['extension'];`
`126`	`126`	`if (!extensionArg) {`
`127`		`- return { extensions, locations }`
	`127`	`+ return { extensions, locations };`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`const extensionPaths = Array.isArray(extensionArg) ? extensionArg : [extensionArg];`
`@@ -164,7 +164,6 @@ async function getExtensionPackageJSON(extensionPath) {`
`164`	`164`	fancyLog(`${ansiColors.yellow('Warning')}: Could not find ${mainFilePath}. Use ${ansiColors.cyan('yarn gulp watch-web')} to build the built-in extensions.`);
`165`	`165`	`}`
`166`	`166`	`}`
`167`		`- packageJSON.extensionKind = ['web']; // enable for Web`
`168`	`167`
`169`	`168`	`const packageNLSPath = path.join(extensionPath, 'package.nls.json');`
`170`	`169`	`const packageNLSExists = await exists(packageNLSPath);`
Original file line number	Diff line number	Diff line change
`@@ -61,24 +61,31 @@ export function getExtensionKind(manifest: IExtensionManifest, productService: I`
`61`	`61`
`62`	`62`	`// Not an UI extension if it has main`
`63`	`63`	`if (manifest.main) {`
	`64`	`+ if (manifest.browser) {`
	`65`	`+ return ['workspace', 'web'];`
	`66`	`+ }`
`64`	`67`	`return ['workspace'];`
`65`	`68`	`}`
`66`	`69`
`67`		`- // Not an UI extension if it has dependencies or an extension pack`
	`70`	`+ if (manifest.browser) {`
	`71`	`+ return ['web'];`
	`72`	`+ }`
	`73`	`+`
	`74`	`+ // Not an UI nor web extension if it has dependencies or an extension pack`
`68`	`75`	`if (isNonEmptyArray(manifest.extensionDependencies) \|\| isNonEmptyArray(manifest.extensionPack)) {`
`69`	`76`	`return ['workspace'];`
`70`	`77`	`}`
`71`	`78`
`72`	`79`	`if (manifest.contributes) {`
`73`		`- // Not an UI extension if it has no ui contributions`
	`80`	`+ // Not an UI nor web extension if it has no ui contributions`
`74`	`81`	`for (const contribution of Object.keys(manifest.contributes)) {`
`75`	`82`	`if (!isUIExtensionPoint(contribution)) {`
`76`	`83`	`return ['workspace'];`
`77`	`84`	`}`
`78`	`85`	`}`
`79`	`86`	`}`
`80`	`87`
`81`		`- return ['ui', 'workspace'];`
	`88`	`+ return ['ui', 'workspace', 'web'];`
`82`	`89`	`}`
`83`	`90`
`84`	`91`	`let _uiExtensionPoints: Set<string> \| null = null;`