Merge pull request #94526 from microsoft/joao/cleanup-builtin

Cleanup built-in extensions mechanism

build/builtInExtensions.json

-[
-	{
-		"name": "ms-vscode.node-debug",
-		"version": "1.44.4",
-		"repo": "https://github.com/Microsoft/vscode-node-debug",
-		"metadata": {
-			"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",
-			"publisherId": {
-				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-				"publisherName": "ms-vscode",
-				"displayName": "Microsoft",
-				"flags": "verified"
-			},
-			"publisherDisplayName": "Microsoft"
-		}
-	},
-	{
-		"name": "ms-vscode.node-debug2",
-		"version": "1.42.1",
-		"repo": "https://github.com/Microsoft/vscode-node-debug2",
-		"metadata": {
-			"id": "36d19e17-7569-4841-a001-947eb18602b2",
-			"publisherId": {
-				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-				"publisherName": "ms-vscode",
-				"displayName": "Microsoft",
-				"flags": "verified"
-			},
-			"publisherDisplayName": "Microsoft"
-		}
-	},
-	{
-		"name": "ms-vscode.references-view",
-		"version": "0.0.50",
-		"repo": "https://github.com/Microsoft/vscode-reference-view",
-		"metadata": {
-			"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",
-			"publisherId": {
-				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-				"publisherName": "ms-vscode",
-				"displayName": "Microsoft",
-				"flags": "verified"
-			},
-			"publisherDisplayName": "Microsoft"
-		}
-	},
-	{
-		"name": "ms-vscode.js-debug-nightly",
-		"version": "2020.3.3117",
-		"forQualities": [
-			"insider"
-		],
-		"repo": "https://github.com/Microsoft/vscode-js-debug",
-		"metadata": {
-			"id": "7acbb4ce-c85a-49d4-8d95-a8054406ae97",
-			"publisherId": {
-				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-				"publisherName": "ms-vscode",
-				"displayName": "Microsoft",
-				"flags": "verified"
-			},
-			"publisherDisplayName": "Microsoft"
-		}
-	},
-	{
-		"name": "ms-vscode.js-debug-companion",
-		"version": "0.0.4",
-		"repo": "https://github.com/microsoft/vscode-js-debug-companion",
-		"metadata": {
-			"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
-			"publisherId": {
-				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-				"publisherName": "ms-vscode",
-				"displayName": "Microsoft",
-				"flags": "verified"
-			},
-			"publisherDisplayName": "Microsoft"
-		}
-	}
-]

build/builtin/browser-main.js

@@ -9,8 +9,7 @@ const os = require('os');
 const { remote } = require('electron');
 const dialog = remote.dialog;
 
-const productJsonPath = path.join(__dirname, '..', '..', 'product.json');
-const builtInExtensionsPath = path.join(__dirname, '..', 'builtInExtensions.json');
+const builtInExtensionsPath = path.join(__dirname, '..', '..', 'product.json');
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 
 function readJson(filePath) {
@@ -51,7 +50,6 @@ function render(el, state) {
 	}
 
 	const ul = document.createElement('ul');
-	const { quality } = readJson(productJsonPath);
 	const { builtin, control } = state;
 
 	for (const ext of builtin) {
@@ -62,10 +60,6 @@ function render(el, state) {
 
 		const name = document.createElement('code');
 		name.textContent = ext.name;
-		if (quality && ext.forQualities && !ext.forQualities.includes(quality)) {
-			name.textContent += ` (only on ${ext.forQualities.join(', ')})`;
-		}
-
 		li.appendChild(name);
 
 		const form = document.createElement('form');
@@ -116,7 +110,7 @@ function render(el, state) {
 
 function main() {
 	const el = document.getElementById('extensions');
-	const builtin = readJson(builtInExtensionsPath);
+	const builtin = readJson(builtInExtensionsPath).builtInExtensions;
 	let control;
 
 	try {

build/lib/builtInExtensions.js

@@ -18,7 +18,7 @@ const fancyLog = require('fancy-log');
 const ansiColors = require('ansi-colors');
 
 const root = path.dirname(path.dirname(__dirname));
-const builtInExtensions = require('../builtInExtensions.json');
+const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];
 

build/lib/extensions.js

@@ -28,7 +28,6 @@ const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
-const product = require('../../product.json');
 function fromLocal(extensionPath) {
     const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
     const input = fs.existsSync(webpackFilename)
@@ -187,10 +186,8 @@ const excludedExtensions = [
     'vscode-test-resolver',
     'ms-vscode.node-debug',
     'ms-vscode.node-debug2',
-    'ms.vscode.js-debug-nightly'
 ];
-const builtInExtensions = require('../builtInExtensions.json')
-    .filter(({ forQualities }) => { var _a; return !product.quality || ((_a = forQualities === null || forQualities === void 0 ? void 0 : forQualities.includes) === null || _a === void 0 ? void 0 : _a.call(forQualities, product.quality)) !== false; });
+const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 function packageLocalExtensionsStream() {
     const localExtensionDescriptions = glob.sync('extensions/*/package.json')
         .map(manifestPath => {

build/lib/extensions.ts

@@ -27,7 +27,6 @@ const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
-const product = require('../../product.json');
 
 function fromLocal(extensionPath: string): Stream {
 	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
@@ -221,19 +220,16 @@ const excludedExtensions = [
 	'vscode-test-resolver',
 	'ms-vscode.node-debug',
 	'ms-vscode.node-debug2',
-	'ms.vscode.js-debug-nightly'
 ];
 
 interface IBuiltInExtension {
 	name: string;
 	version: string;
 	repo: string;
-	forQualities?: ReadonlyArray<string>;
 	metadata: any;
 }
 
-const builtInExtensions = (<IBuiltInExtension[]>require('../builtInExtensions.json'))
-	.filter(({ forQualities }) => !product.quality || forQualities?.includes?.(product.quality) !== false);
+const builtInExtensions: IBuiltInExtension[] = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 
 export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream {
 	const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))

package.json

 {
   "name": "code-oss-dev",
   "version": "1.45.0",
-  "distro": "dcdad9bf320e13f9ed6032e4a748fe017d057620",
+  "distro": "376dbb2c860116cca77316a6bc004b0d150e434a",
   "author": {
     "name": "Microsoft Corporation"
   },

product.json

@@ -22,5 +22,82 @@
 	"urlProtocol": "code-oss",
 	"extensionAllowedProposedApi": [
 		"ms-vscode.references-view"
+	],
+	"builtInExtensions": [
+		{
+			"name": "ms-vscode.node-debug",
+			"version": "1.44.4",
+			"repo": "https://github.com/Microsoft/vscode-node-debug",
+			"metadata": {
+				"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		},
+		{
+			"name": "ms-vscode.node-debug2",
+			"version": "1.42.1",
+			"repo": "https://github.com/Microsoft/vscode-node-debug2",
+			"metadata": {
+				"id": "36d19e17-7569-4841-a001-947eb18602b2",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		},
+		{
+			"name": "ms-vscode.references-view",
+			"version": "0.0.50",
+			"repo": "https://github.com/Microsoft/vscode-reference-view",
+			"metadata": {
+				"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		},
+		{
+			"name": "ms-vscode.js-debug-companion",
+			"version": "0.0.4",
+			"repo": "https://github.com/microsoft/vscode-js-debug-companion",
+			"metadata": {
+				"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		},
+		{
+			"name": "ms-vscode.js-debug-nightly",
+			"version": "2020.3.3117",
+			"repo": "https://github.com/Microsoft/vscode-js-debug",
+			"metadata": {
+				"id": "7acbb4ce-c85a-49d4-8d95-a8054406ae97",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		}
 	]
 }

src/vs/platform/extensionManagement/common/extensionManagementUtil.ts

@@ -117,24 +117,3 @@ export function getMaliciousExtensionsSet(report: IReportedExtension[]): Set<str
 
 	return result;
 }
\ No newline at end of file
-
-export interface IBuiltInExtension {
-	name: string;
-	version: string;
-	repo: string;
-	forQualities?: ReadonlyArray<string>;
-	metadata: any;
-}
-
-/**
- * Parses the built-in extension JSON data and filters it down to the
- * extensions built into this product quality.
- */
-export function parseBuiltInExtensions(rawJson: string, productQuality: string | undefined) {
-	const parsed: IBuiltInExtension[] = JSON.parse(rawJson);
-	if (!productQuality) {
-		return parsed;
-	}
-
-	return parsed.filter(ext => ext.forQualities?.indexOf?.(productQuality) !== -1);
-}

src/vs/platform/extensionManagement/node/extensionManagementService.ts

@@ -21,7 +21,7 @@ import {
 	INSTALL_ERROR_MALICIOUS,
 	INSTALL_ERROR_INCOMPATIBLE
 } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions, getGalleryExtensionId, groupByExtension, getMaliciousExtensionsSet, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, ExtensionIdentifierWithVersion, parseBuiltInExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { areSameExtensions, getGalleryExtensionId, groupByExtension, getMaliciousExtensionsSet, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, ExtensionIdentifierWithVersion } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { localizeManifest } from '../common/extensionNls';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { INativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
@@ -46,7 +46,6 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { getManifest } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
 import { IExtensionManifest, ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { IProductService } from 'vs/platform/product/common/productService';
 
 const ERROR_SCANNING_SYS_EXTENSIONS = 'scanningSystem';
 const ERROR_SCANNING_USER_EXTENSIONS = 'scanningUser';
@@ -134,7 +133,6 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		@ILogService private readonly logService: ILogService,
 		@optional(IDownloadService) private downloadService: IDownloadService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IProductService private readonly productService: IProductService,
 	) {
 		super();
 		this.systemExtensionsPath = environmentService.builtinExtensionsPath;
@@ -756,6 +754,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		// Scan other system extensions during development
 		const devSystemExtensionsPromise = this.getDevSystemExtensionsList()
 			.then(devSystemExtensionsList => {
+				console.log(devSystemExtensionsList);
 				if (devSystemExtensionsList.length) {
 					return this.scanExtensions(this.devSystemExtensionsPath, ExtensionType.System)
 						.then(result => {
@@ -947,17 +946,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		return this._devSystemExtensionsPath;
 	}
 
-	private _devSystemExtensionsFilePath: string | null = null;
-	private get devSystemExtensionsFilePath(): string {
-		if (!this._devSystemExtensionsFilePath) {
-			this._devSystemExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', 'builtInExtensions.json'));
-		}
-		return this._devSystemExtensionsFilePath;
-	}
-
 	private getDevSystemExtensionsList(): Promise<string[]> {
-		return pfs.readFile(this.devSystemExtensionsFilePath, 'utf8')
-			.then(data => parseBuiltInExtensions(data, this.productService.quality).map(ext => ext.name));
+		return Promise.resolve(product.builtInExtensions ? product.builtInExtensions.map(e => e.name) : []);
 	}
 
 	private toNonCancellablePromise<T>(promise: Promise<T>): Promise<T> {

src/vs/platform/product/common/productService.ts

@@ -14,6 +14,13 @@ export interface IProductService extends Readonly<IProductConfiguration> {
 
 }
 
+export interface IBuiltInExtension {
+	readonly name: string;
+	readonly version: string;
+	readonly repo: string;
+	readonly metadata: any;
+}
+
 export interface IProductConfiguration {
 	readonly version: string;
 	readonly date?: string;
@@ -30,6 +37,8 @@ export interface IProductConfiguration {
 	readonly urlProtocol: string;
 	readonly dataFolderName: string;
 
+	readonly builtInExtensions?: IBuiltInExtension[];
+
 	readonly downloadUrl?: string;
 	readonly updateUrl?: string;
 	readonly target?: string;

src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts

@@ -23,8 +23,6 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { ExtensionScanner, ExtensionScannerInput, IExtensionReference, IExtensionResolver, IRelaxedExtensionDescription } from 'vs/workbench/services/extensions/node/extensionPoints';
 import { Translations, ILog } from 'vs/workbench/services/extensions/common/extensionPoints';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { parseBuiltInExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 
 interface IExtensionCacheData {
 	input: ExtensionScannerInput;
@@ -59,7 +57,6 @@ export class CachedExtensionScanner {
 		@IWorkbenchEnvironmentService private readonly _environmentService: INativeWorkbenchEnvironmentService,
 		@IWorkbenchExtensionEnablementService private readonly _extensionEnablementService: IWorkbenchExtensionEnablementService,
 		@IHostService private readonly _hostService: IHostService,
-		@IProductService private readonly _productService: IProductService,
 	) {
 		this.scannedExtensions = new Promise<IExtensionDescription[]>((resolve, reject) => {
 			this._scannedExtensionsResolve = resolve;
@@ -82,7 +79,7 @@ export class CachedExtensionScanner {
 	public async startScanningExtensions(log: ILog): Promise<void> {
 		try {
 			const translations = await this.translationConfig;
-			const { system, user, development } = await CachedExtensionScanner._scanInstalledExtensions(this._hostService, this._notificationService, this._environmentService, this._extensionEnablementService, this._productService, log, translations);
+			const { system, user, development } = await CachedExtensionScanner._scanInstalledExtensions(this._hostService, this._notificationService, this._environmentService, this._extensionEnablementService, log, translations);
 
 			let result = new Map<string, IExtensionDescription>();
 			system.forEach((systemExtension) => {
@@ -242,7 +239,6 @@ export class CachedExtensionScanner {
 		notificationService: INotificationService,
 		environmentService: INativeWorkbenchEnvironmentService,
 		extensionEnablementService: IWorkbenchExtensionEnablementService,
-		productService: IProductService,
 		log: ILog,
 		translations: Translations
 	): Promise<{ system: IExtensionDescription[], user: IExtensionDescription[], development: IExtensionDescription[] }> {
@@ -264,9 +260,7 @@ export class CachedExtensionScanner {
 		let finalBuiltinExtensions: Promise<IExtensionDescription[]> = builtinExtensions;
 
 		if (devMode) {
-			const builtInExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', 'builtInExtensions.json'));
-			const builtInExtensions = pfs.readFile(builtInExtensionsFilePath, 'utf8')
-				.then(raw => parseBuiltInExtensions(raw, productService.quality));
+			const builtInExtensions = Promise.resolve<IBuiltInExtension[]>(product.builtInExtensions || []);
 
 			const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 			const controlFile = pfs.readFile(controlFilePath, 'utf8')
@@ -326,7 +320,6 @@ interface IBuiltInExtension {
 	name: string;
 	version: string;
 	repo: string;
-	forQualities?: ReadonlyArray<string>;
 }
 
 interface IBuiltInExtensionControl {