Revert "extensions: allow built-in extensions on different qualities (#89199)"

This reverts commit 7ad58a9b.

build/builtInExtensions.json

@@ -44,24 +44,6 @@
 			"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",

build/builtin/browser-main.js

@@ -9,7 +9,6 @@ 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 controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 
@@ -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');
@@ -128,4 +122,4 @@ function main() {
 	render(el, { builtin, control });
 }
 
-window.onload = main;
+window.onload = main;
\ No newline at end of file

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[] = require('../builtInExtensions.json');
 
 export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream {
 	const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))

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

@@ -116,25 +116,4 @@ export function getMaliciousExtensionsSet(report: IReportedExtension[]): Set<str
 	}
 
 	return result;
-}
-
-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);
-}
+}
\ No newline at end of file

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;
@@ -957,7 +955,10 @@ export class ExtensionManagementService extends Disposable implements IExtension
 
 	private getDevSystemExtensionsList(): Promise<string[]> {
 		return pfs.readFile(this.devSystemExtensionsFilePath, 'utf8')
-			.then(data => parseBuiltInExtensions(data, this.productService.quality).map(ext => ext.name));
+			.then<string[]>(raw => {
+				const parsed: { name: string }[] = JSON.parse(raw);
+				return parsed.map(({ name }) => name);
+			});
 	}
 
 	private toNonCancellablePromise<T>(promise: Promise<T>): Promise<T> {

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[] }> {
@@ -266,7 +262,7 @@ export class CachedExtensionScanner {
 		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));
+				.then<IBuiltInExtension[]>(raw => JSON.parse(raw));
 
 			const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 			const controlFile = pfs.readFile(controlFilePath, 'utf8')
@@ -326,7 +322,6 @@ interface IBuiltInExtension {
 	name: string;
 	version: string;
 	repo: string;
-	forQualities?: ReadonlyArray<string>;
 }
 
 interface IBuiltInExtensionControl {