Allow passing in an exclude list to scanBuiltinExtensions

alexdima · alexdima · commit edf34c7cbc94 · 2020-08-03T23:22:39.000+02:00
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
@@ -264,20 +264,20 @@ function packageMarketplaceExtensionsStream(forWeb) {
         .pipe(util2.setExecutableBit(['**/*.sh'])));
 }
 exports.packageMarketplaceExtensionsStream = packageMarketplaceExtensionsStream;
-function scanBuiltinExtensions(extensionsRoot, forWeb) {
+function scanBuiltinExtensions(extensionsRoot, exclude = []) {
     const scannedExtensions = [];
     try {
         const extensionsFolders = fs.readdirSync(extensionsRoot);
         for (const extensionFolder of extensionsFolders) {
-            if (extensionFolder === 'vscode-web-playground') {
-                // never inline vscode-web-playground (even if it was packaged)
+            if (exclude.indexOf(extensionFolder) >= 0) {
+                continue;
             }
             const packageJSONPath = path.join(extensionsRoot, extensionFolder, 'package.json');
             if (!fs.existsSync(packageJSONPath)) {
                 continue;
             }
             let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));
-            if (forWeb && !isWebExtension(packageJSON)) {
+            if (!isWebExtension(packageJSON)) {
                 continue;
             }
             const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
@@ -338,21 +338,21 @@ export interface IScannedBuiltinExtension {
 	changelogPath?: string;
 }
 
-export function scanBuiltinExtensions(extensionsRoot: string, forWeb: boolean): IScannedBuiltinExtension[] {
+export function scanBuiltinExtensions(extensionsRoot: string, exclude: string[] = []): IScannedBuiltinExtension[] {
 	const scannedExtensions: IScannedBuiltinExtension[] = [];
 
 	try {
 		const extensionsFolders = fs.readdirSync(extensionsRoot);
 		for (const extensionFolder of extensionsFolders) {
-			if (extensionFolder === 'vscode-web-playground') {
-				// never inline vscode-web-playground (even if it was packaged)
+			if (exclude.indexOf(extensionFolder) >= 0) {
+				continue;
 			}
 			const packageJSONPath = path.join(extensionsRoot, extensionFolder, 'package.json');
 			if (!fs.existsSync(packageJSONPath)) {
 				continue;
 			}
 			let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));
-			if (forWeb && !isWebExtension(packageJSON)) {
+			if (!isWebExtension(packageJSON)) {
 				continue;
 			}
 			const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
diff --git a/resources/serverless/code-web.js b/resources/serverless/code-web.js
@@ -71,8 +71,8 @@ async function getBuiltInExtensionInfos() {
 	const locations = {};
 
 	const [localExtensions, marketplaceExtensions] = await Promise.all([
-		extensions.scanBuiltinExtensions(BUILTIN_EXTENSIONS_ROOT, true),
-		extensions.scanBuiltinExtensions(BUILTIN_MARKETPLACE_EXTENSIONS_ROOT, true),
+		extensions.scanBuiltinExtensions(BUILTIN_EXTENSIONS_ROOT),
+		extensions.scanBuiltinExtensions(BUILTIN_MARKETPLACE_EXTENSIONS_ROOT),
 	]);
 	for (const ext of localExtensions) {
 		allExtensions.push(ext);

Original file line number	Diff line number	Diff line change
`@@ -338,21 +338,21 @@ export interface IScannedBuiltinExtension {`
`338`	`338`	`changelogPath?: string;`
`339`	`339`	`}`
`340`	`340`
`341`		`-export function scanBuiltinExtensions(extensionsRoot: string, forWeb: boolean): IScannedBuiltinExtension[] {`
	`341`	`+export function scanBuiltinExtensions(extensionsRoot: string, exclude: string[] = []): IScannedBuiltinExtension[] {`
`342`	`342`	`const scannedExtensions: IScannedBuiltinExtension[] = [];`
`343`	`343`
`344`	`344`	`try {`
`345`	`345`	`const extensionsFolders = fs.readdirSync(extensionsRoot);`
`346`	`346`	`for (const extensionFolder of extensionsFolders) {`
`347`		`- if (extensionFolder === 'vscode-web-playground') {`
`348`		`- // never inline vscode-web-playground (even if it was packaged)`
	`347`	`+ if (exclude.indexOf(extensionFolder) >= 0) {`
	`348`	`+ continue;`
`349`	`349`	`}`
`350`	`350`	`const packageJSONPath = path.join(extensionsRoot, extensionFolder, 'package.json');`
`351`	`351`	`if (!fs.existsSync(packageJSONPath)) {`
`352`	`352`	`continue;`
`353`	`353`	`}`
`354`	`354`	`let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));`
`355`		`- if (forWeb && !isWebExtension(packageJSON)) {`
	`355`	`+ if (!isWebExtension(packageJSON)) {`
`356`	`356`	`continue;`
`357`	`357`	`}`
`358`	`358`	`const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));`