support skipping builtin extension (#308825)

Author: sandy081

src/vs/platform/environment/common/environment.ts

@@ -71,6 +71,7 @@ export interface IEnvironmentService {
 	debugExtensionHost: IExtensionHostDebugParams;
 	isExtensionDevelopment: boolean;
 	disableExtensions: boolean | string[];
+	skipBuiltinExtensions?: readonly string[];
 	enableExtensions?: readonly string[];
 	extensionDevelopmentLocationURI?: URI[];
 	extensionDevelopmentKind?: ExtensionKind[];

src/vs/platform/environment/common/environmentService.ts

@@ -221,6 +221,14 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 		return false;
 	}
 
+	get skipBuiltinExtensions(): readonly string[] {
+		const value = env['VSCODE_SKIP_BUILTIN_EXTENSIONS'];
+		if (!value) {
+			return [];
+		}
+		return value.split(',').map(id => id.trim()).filter(id => id);
+	}
+
 	@memoize
 	get debugExtensionHost(): IExtensionHostDebugParams { return parseExtensionHostDebugPort(this.args, this.isBuilt); }
 	get debugRenderer(): boolean { return !!this.args.debugRenderer; }

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

@@ -107,6 +107,18 @@ interface IBuiltInExtensionControl {
 	[name: string]: 'marketplace' | 'disabled' | string;
 }
 
+function getProductBuiltInExtensionsEnabledWithAutoUpdates(productService: IProductService, environmentService: IEnvironmentService): Set<string> {
+	const result = new Set<string>();
+	for (const id of productService.builtInExtensionsEnabledWithAutoUpdates) {
+		const toLowerCaseId = id.toLowerCase();
+		if (environmentService.skipBuiltinExtensions?.some(skipId => skipId.toLowerCase() === toLowerCaseId)) {
+			continue;
+		}
+		result.add(toLowerCaseId);
+	}
+	return result;
+}
+
 export type SystemExtensionsScanOptions = {
 	readonly checkControlFile?: boolean;
 	readonly language?: string;
@@ -205,7 +217,14 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		promises.push(this.scanDefaultSystemExtensions(scanOptions.language));
 		promises.push(this.scanDevSystemExtensions(scanOptions.language, !!scanOptions.checkControlFile));
 		const [defaultSystemExtensions, devSystemExtensions] = await Promise.all(promises);
-		return this.applyScanOptions([...defaultSystemExtensions, ...devSystemExtensions], ExtensionType.System, { pickLatest: false });
+		let allSystemExtensions = [...defaultSystemExtensions, ...devSystemExtensions];
+
+		if (this.environmentService.skipBuiltinExtensions?.length) {
+			const skipSet = new Set(this.environmentService.skipBuiltinExtensions.map(id => id.toLowerCase()));
+			allSystemExtensions = allSystemExtensions.filter(ext => !skipSet.has(ext.identifier.id.toLowerCase()));
+		}
+
+		return this.applyScanOptions(allSystemExtensions, ExtensionType.System, { pickLatest: false });
 	}
 
 	async scanUserExtensions(scanOptions: UserExtensionsScanOptions): Promise<IScannedExtension[]> {
@@ -394,14 +413,14 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 				result.set(extension.identifier.id, extension);
 			}
 		});
+		const productBuiltInExtensionsEnabledWithAutoUpdates = getProductBuiltInExtensionsEnabledWithAutoUpdates(this.productService, this.environmentService);
 		user?.forEach((extension) => {
 			const existing = result.get(extension.identifier.id);
 			if (!existing && system && extension.type === ExtensionType.System) {
 				this.logService.debug(`Skipping obsolete system extension ${extension.location.path}.`);
 				return;
 			}
-			const isBuiltinExtensionEnabledWithAutoUpdates = this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === extension.identifier.id.toLowerCase());
-			if (isBuiltinExtensionEnabledWithAutoUpdates && !extension.forceAutoUpdate) {
+			if (productBuiltInExtensionsEnabledWithAutoUpdates.has(extension.identifier.id.toLowerCase()) && !extension.forceAutoUpdate) {
 				this.logService.info(`Skipping user installed builtin extension ${extension.identifier.id} with version ${extension.manifest.version} because it is not allowed to in the current product quality ${this.productService.quality}`);
 				return;
 			}
@@ -570,18 +589,20 @@ class ExtensionsScanner extends Disposable {
 
 	private readonly extensionsEnabledWithApiProposalVersion: string[];
 	private readonly productQuality: string | undefined;
+	private readonly productBuiltInExtensionsEnabledWithAutoUpdates: Set<string>;
 
 	constructor(
 		@IExtensionsProfileScannerService protected readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService,
 		@IFileService protected readonly fileService: IFileService,
-		@IProductService private readonly productService: IProductService,
+		@IProductService productService: IProductService,
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
 		@ILogService protected readonly logService: ILogService
 	) {
 		super();
 		this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
 		this.productQuality = productService.quality;
+		this.productBuiltInExtensionsEnabledWithAutoUpdates = getProductBuiltInExtensionsEnabledWithAutoUpdates(productService, environmentService);
 	}
 
 	async scanExtensions(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
@@ -720,7 +741,7 @@ class ExtensionsScanner extends Disposable {
 			isValid,
 			validations,
 			preRelease: !!metadata?.preRelease,
-			forceAutoUpdate: this.productService.builtInExtensionsEnabledWithAutoUpdates.some(builtinExtensionId => builtinExtensionId.toLowerCase() === id.toLowerCase()) && this.productQuality === 'stable',
+			forceAutoUpdate: this.productBuiltInExtensionsEnabledWithAutoUpdates.has(id.toLowerCase()) && this.productQuality === 'stable',
 		};
 		if (input.validate) {
 			extension = this.validate(extension, input);

src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts

@@ -136,7 +136,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 			});
 		}
 
-		if (!this.environmentService.isSessionsWindow) {
+		if (!this.environmentService.isSessionsWindow && !this.environmentService.skipBuiltinExtensions?.some(id => id.toLowerCase() === this._chatExtensionId)) {
 			const builtinChatExtensionEnablementMigrationKey = 'builtinChatExtensionEnablementMigration';
 			const builtinChatExtensionEnablementMigration = this.storageService.getBoolean(builtinChatExtensionEnablementMigrationKey, StorageScope.PROFILE) === true;
 			if (!builtinChatExtensionEnablementMigration) {