chore(vscode): update to 1.53.2

These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.

lib/vscode/src/vs/platform/extensionManagement/common/extensionGalleryService.ts

@@ -9,7 +9,7 @@ import { getGalleryExtensionId, getGalleryExtensionTelemetryData, adoptToGallery
 import { getOrDefault } from 'vs/base/common/objects';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IPager } from 'vs/base/common/paging';
-import { IRequestService, asJson, asText } from 'vs/platform/request/common/request';
+import { IRequestService, asJson, asText, isSuccess } from 'vs/platform/request/common/request';
 import { IRequestOptions, IRequestContext, IHeaders } from 'vs/base/parts/request/common/request';
 import { isEngineValid } from 'vs/platform/extensions/common/extensionValidator';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -147,6 +147,35 @@ const DefaultQueryState: IQueryState = {
 	assetTypes: []
 };
 
+type GalleryServiceQueryClassification = {
+	filterTypes: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	sortBy: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	sortOrder: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	duration: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', 'isMeasurement': true };
+	success: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	requestBodySize: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	responseBodySize?: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	statusCode?: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	errorCode?: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	count?: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+};
+
+type QueryTelemetryData = {
+	filterTypes: string[];
+	sortBy: string;
+	sortOrder: string;
+};
+
+type GalleryServiceQueryEvent = QueryTelemetryData & {
+	duration: number;
+	success: boolean;
+	requestBodySize: string;
+	responseBodySize?: string;
+	statusCode?: string;
+	errorCode?: string;
+	count?: string;
+};
+
 class Query {
 
 	constructor(private state = DefaultQueryState) { }
@@ -196,6 +225,14 @@ class Query {
 		const criterium = this.state.criteria.filter(criterium => criterium.filterType === FilterType.SearchText)[0];
 		return criterium && criterium.value ? criterium.value : '';
 	}
+
+	get telemetryData(): QueryTelemetryData {
+		return {
+			filterTypes: this.state.criteria.map(criterium => String(criterium.filterType)),
+			sortBy: String(this.sortBy),
+			sortOrder: String(this.sortOrder)
+		};
+	}
 }
 
 function getStatistic(statistics: IRawGalleryExtensionStatistics[], name: string): number {
@@ -447,20 +484,9 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			throw new Error('No extension gallery service configured.');
 		}
 
-		const type = options.names ? 'ids' : (options.text ? 'text' : 'all');
 		let text = options.text || '';
 		const pageSize = getOrDefault(options, o => o.pageSize, 50);
 
-		type GalleryServiceQueryClassification = {
-			type: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
-			text: { classification: 'CustomerContent', purpose: 'FeatureInsight' };
-		};
-		type GalleryServiceQueryEvent = {
-			type: string;
-			text: string;
-		};
-		this.telemetryService.publicLog2<GalleryServiceQueryEvent, GalleryServiceQueryClassification>('galleryService:query', { type, text });
-
 		let query = new Query()
 			.withFlags(Flags.IncludeLatestVersionOnly, Flags.IncludeAssetUri, Flags.IncludeStatistics, Flags.IncludeFiles, Flags.IncludeVersionProperties)
 			.withPage(1, pageSize)
@@ -543,27 +569,49 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			'Content-Length': String(data.length)
 		};
 
-		const context = await this.requestService.request({
-			type: 'POST',
-			url: this.api('/extensionquery'),
-			data,
-			headers
-		}, token);
+		const startTime = new Date().getTime();
+		let context: IRequestContext | undefined, error: any, total: number = 0;
 
-		if (context.res.statusCode && context.res.statusCode >= 400 && context.res.statusCode < 500) {
-			return { galleryExtensions: [], total: 0 };
+		try {
+			context = await this.requestService.request({
+				type: 'POST',
+				url: this.api('/extensionquery'),
+				data,
+				headers
+			}, token);
+
+			if (context.res.statusCode && context.res.statusCode >= 400 && context.res.statusCode < 500) {
+				return { galleryExtensions: [], total };
+			}
+
+			const result = await asJson<IRawGalleryQueryResult>(context);
+			if (result) {
+				const r = result.results[0];
+				const galleryExtensions = r.extensions;
+				const resultCount = r.resultMetadata && r.resultMetadata.filter(m => m.metadataType === 'ResultCount')[0];
+				total = resultCount && resultCount.metadataItems.filter(i => i.name === 'TotalCount')[0].count || 0;
+
+				return { galleryExtensions, total };
+			}
+			return { galleryExtensions: [], total };
+
+		} catch (e) {
+			error = e;
+			throw e;
+		} finally {
+			this.telemetryService.publicLog2<GalleryServiceQueryEvent, GalleryServiceQueryClassification>('galleryService:query', {
+				...query.telemetryData,
+				requestBodySize: String(data.length),
+				duration: new Date().getTime() - startTime,
+				success: !!context && isSuccess(context),
+				responseBodySize: context?.res.headers['Content-Length'],
+				statusCode: context ? String(context.res.statusCode) : undefined,
+				errorCode: error
+					? isPromiseCanceledError(error) ? 'canceled' : getErrorMessage(error).startsWith('XHR timeout') ? 'timeout' : 'failed'
+					: undefined,
+				count: String(total)
+			});
 		}
-
-		const result = await asJson<IRawGalleryQueryResult>(context);
-		if (result) {
-			const r = result.results[0];
-			const galleryExtensions = r.extensions;
-			const resultCount = r.resultMetadata && r.resultMetadata.filter(m => m.metadataType === 'ResultCount')[0];
-			const total = resultCount && resultCount.metadataItems.filter(i => i.name === 'TotalCount')[0].count || 0;
-
-			return { galleryExtensions, total };
-		}
-		return { galleryExtensions: [], total: 0 };
 	}
 
 	async reportStatistic(publisher: string, name: string, version: string, type: StatisticType): Promise<void> {

lib/vscode/src/vs/platform/extensionManagement/common/extensionManagement.ts

@@ -278,3 +278,19 @@ export const ExtensionsLocalizedLabel = { value: ExtensionsLabel, original: 'Ext
 export const ExtensionsChannelId = 'extensions';
 export const PreferencesLabel = localize('preferences', "Preferences");
 export const PreferencesLocalizedLabel = { value: PreferencesLabel, original: 'Preferences' };
+
+
+export interface CLIOutput {
+	log(s: string): void;
+	error(s: string): void;
+}
+
+export const IExtensionManagementCLIService = createDecorator<IExtensionManagementCLIService>('IExtensionManagementCLIService');
+export interface IExtensionManagementCLIService {
+	readonly _serviceBrand: undefined;
+
+	listExtensions(showVersions: boolean, category?: string, output?: CLIOutput): Promise<void>;
+	installExtensions(extensions: (string | URI)[], builtinExtensionIds: string[], isMachineScoped: boolean, force: boolean, output?: CLIOutput): Promise<void>;
+	uninstallExtensions(extensions: (string | URI)[], force: boolean, output?: CLIOutput): Promise<void>;
+	locateExtension(extensions: string[], output?: CLIOutput): Promise<void>;
+}

lib/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLIService.ts

@@ -0,0 +1,347 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+
+import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { URI } from 'vs/base/common/uri';
+import { gt } from 'vs/base/common/semver/semver';
+import { CLIOutput, IExtensionGalleryService, IExtensionManagementCLIService, IExtensionManagementService, IGalleryExtension, ILocalExtension, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { ExtensionType, EXTENSION_CATEGORIES, IExtensionManifest, isLanguagePackExtension } from 'vs/platform/extensions/common/extensions';
+import { getBaseLabel } from 'vs/base/common/labels';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Schemas } from 'vs/base/common/network';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
+
+const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
+const useId = localize('useId', "Make sure you use the full extension ID, including the publisher, e.g.: {0}", 'ms-dotnettools.csharp');
+
+
+function getId(manifest: IExtensionManifest, withVersion?: boolean): string {
+	if (withVersion) {
+		return `${manifest.publisher}.${manifest.name}@${manifest.version}`;
+	} else {
+		return `${manifest.publisher}.${manifest.name}`;
+	}
+}
+
+const EXTENSION_ID_REGEX = /^([^.]+\..+)@(\d+\.\d+\.\d+(-.*)?)$/;
+
+export function getIdAndVersion(id: string): [string, string | undefined] {
+	const matches = EXTENSION_ID_REGEX.exec(id);
+	if (matches && matches[1]) {
+		return [adoptToGalleryExtensionId(matches[1]), matches[2]];
+	}
+	return [adoptToGalleryExtensionId(id), undefined];
+}
+
+type InstallExtensionInfo = { id: string, version?: string, installOptions: InstallOptions };
+
+
+export class ExtensionManagementCLIService implements IExtensionManagementCLIService {
+
+	_serviceBrand: any;
+
+	constructor(
+		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
+		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
+		@ILocalizationsService private readonly localizationsService: ILocalizationsService
+	) { }
+
+	protected get location(): string | undefined {
+		return undefined;
+	}
+
+	public async listExtensions(showVersions: boolean, category?: string, output: CLIOutput = console): Promise<void> {
+		let extensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
+		const categories = EXTENSION_CATEGORIES.map(c => c.toLowerCase());
+		if (category && category !== '') {
+			if (categories.indexOf(category.toLowerCase()) < 0) {
+				output.log('Invalid category please enter a valid category. To list valid categories run --category without a category specified');
+				return;
+			}
+			extensions = extensions.filter(e => {
+				if (e.manifest.categories) {
+					const lowerCaseCategories: string[] = e.manifest.categories.map(c => c.toLowerCase());
+					return lowerCaseCategories.indexOf(category.toLowerCase()) > -1;
+				}
+				return false;
+			});
+		} else if (category === '') {
+			output.log('Possible Categories: ');
+			categories.forEach(category => {
+				output.log(category);
+			});
+			return;
+		}
+		if (this.location) {
+			output.log(localize('listFromLocation', "Extensions installed on {0}:", this.location));
+		}
+
+		extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
+		let lastId: string | undefined = undefined;
+		for (let extension of extensions) {
+			if (lastId !== extension.identifier.id) {
+				lastId = extension.identifier.id;
+				output.log(getId(extension.manifest, showVersions));
+			}
+		}
+	}
+
+	public async installExtensions(extensions: (string | URI)[], builtinExtensionIds: string[], isMachineScoped: boolean, force: boolean, output: CLIOutput = console): Promise<void> {
+		const failed: string[] = [];
+		const installedExtensionsManifests: IExtensionManifest[] = [];
+		if (extensions.length) {
+			output.log(this.location ? localize('installingExtensionsOnLocation', "Installing extensions on {0}...", this.location) : localize('installingExtensions', "Installing extensions..."));
+		}
+
+		const installed = await this.extensionManagementService.getInstalled(ExtensionType.User);
+		const checkIfNotInstalled = (id: string, version?: string): boolean => {
+			const installedExtension = installed.find(i => areSameExtensions(i.identifier, { id }));
+			if (installedExtension) {
+				if (!version && !force) {
+					output.log(localize('alreadyInstalled-checkAndUpdate', "Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.", id, installedExtension.manifest.version, id));
+					return false;
+				}
+				if (version && installedExtension.manifest.version === version) {
+					output.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", `${id}@${version}`));
+					return false;
+				}
+			}
+			return true;
+		};
+		const vsixs: URI[] = [];
+		const installExtensionInfos: InstallExtensionInfo[] = [];
+		for (const extension of extensions) {
+			if (extension instanceof URI) {
+				vsixs.push(extension);
+			} else {
+				const [id, version] = getIdAndVersion(extension);
+				if (checkIfNotInstalled(id, version)) {
+					installExtensionInfos.push({ id, version, installOptions: { isBuiltin: false, isMachineScoped } });
+				}
+			}
+		}
+		for (const extension of builtinExtensionIds) {
+			const [id, version] = getIdAndVersion(extension);
+			if (checkIfNotInstalled(id, version)) {
+				installExtensionInfos.push({ id, version, installOptions: { isBuiltin: true, isMachineScoped: false } });
+			}
+		}
+
+		if (vsixs.length) {
+			await Promise.all(vsixs.map(async vsix => {
+				try {
+					const manifest = await this.installVSIX(vsix, force, output);
+					if (manifest) {
+						installedExtensionsManifests.push(manifest);
+					}
+				} catch (err) {
+					output.error(err.message || err.stack || err);
+					failed.push(vsix.toString());
+				}
+			}));
+		}
+
+		if (installExtensionInfos.length) {
+
+			const galleryExtensions = await this.getGalleryExtensions(installExtensionInfos);
+
+			await Promise.all(installExtensionInfos.map(async extensionInfo => {
+				const gallery = galleryExtensions.get(extensionInfo.id.toLowerCase());
+				if (gallery) {
+					try {
+						const manifest = await this.installFromGallery(extensionInfo, gallery, installed, force, output);
+						if (manifest) {
+							installedExtensionsManifests.push(manifest);
+						}
+					} catch (err) {
+						output.error(err.message || err.stack || err);
+						failed.push(extensionInfo.id);
+					}
+				} else {
+					output.error(`${notFound(extensionInfo.version ? `${extensionInfo.id}@${extensionInfo.version}` : extensionInfo.id)}\n${useId}`);
+					failed.push(extensionInfo.id);
+				}
+			}));
+
+		}
+
+		if (installedExtensionsManifests.some(manifest => isLanguagePackExtension(manifest))) {
+			await this.updateLocalizationsCache();
+		}
+
+		if (failed.length) {
+			throw new Error(localize('installation failed', "Failed Installing Extensions: {0}", failed.join(', ')));
+		}
+	}
+
+	private async installVSIX(vsix: URI, force: boolean, output: CLIOutput): Promise<IExtensionManifest | null> {
+
+		const manifest = await this.extensionManagementService.getManifest(vsix);
+		if (!manifest) {
+			throw new Error('Invalid vsix');
+		}
+
+		const valid = await this.validateVSIX(manifest, force, output);
+		if (valid) {
+			try {
+				await this.extensionManagementService.install(vsix);
+				output.log(localize('successVsixInstall', "Extension '{0}' was successfully installed.", getBaseLabel(vsix)));
+				return manifest;
+			} catch (error) {
+				if (isPromiseCanceledError(error)) {
+					output.log(localize('cancelVsixInstall', "Cancelled installing extension '{0}'.", getBaseLabel(vsix)));
+					return null;
+				} else {
+					throw error;
+				}
+			}
+		}
+		return null;
+	}
+
+	private async getGalleryExtensions(extensions: InstallExtensionInfo[]): Promise<Map<string, IGalleryExtension>> {
+		const extensionIds = extensions.filter(({ version }) => version === undefined).map(({ id }) => id);
+		const extensionsWithIdAndVersion = extensions.filter(({ version }) => version !== undefined);
+
+		const galleryExtensions = new Map<string, IGalleryExtension>();
+		await Promise.all([
+			(async () => {
+				const result = await this.extensionGalleryService.getExtensions(extensionIds, CancellationToken.None);
+				result.forEach(extension => galleryExtensions.set(extension.identifier.id.toLowerCase(), extension));
+			})(),
+			Promise.all(extensionsWithIdAndVersion.map(async ({ id, version }) => {
+				const extension = await this.extensionGalleryService.getCompatibleExtension({ id }, version);
+				if (extension) {
+					galleryExtensions.set(extension.identifier.id.toLowerCase(), extension);
+				}
+			}))
+		]);
+
+		return galleryExtensions;
+	}
+
+	private async installFromGallery({ id, version, installOptions }: InstallExtensionInfo, galleryExtension: IGalleryExtension, installed: ILocalExtension[], force: boolean, output: CLIOutput): Promise<IExtensionManifest | null> {
+		const manifest = await this.extensionGalleryService.getManifest(galleryExtension, CancellationToken.None);
+		if (manifest && !this.validateExtensionKind(manifest, output)) {
+			return null;
+		}
+
+		const installedExtension = installed.find(e => areSameExtensions(e.identifier, galleryExtension.identifier));
+		if (installedExtension) {
+			if (galleryExtension.version === installedExtension.manifest.version) {
+				output.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", version ? `${id}@${version}` : id));
+				return null;
+			}
+			output.log(localize('updateMessage', "Updating the extension '{0}' to the version {1}", id, galleryExtension.version));
+		}
+
+		try {
+			if (installOptions.isBuiltin) {
+				output.log(localize('installing builtin ', "Installing builtin extension '{0}' v{1}...", id, galleryExtension.version));
+			} else {
+				output.log(localize('installing', "Installing extension '{0}' v{1}...", id, galleryExtension.version));
+			}
+
+			await this.extensionManagementService.installFromGallery(galleryExtension, installOptions);
+			output.log(localize('successInstall', "Extension '{0}' v{1} was successfully installed.", id, galleryExtension.version));
+			return manifest;
+		} catch (error) {
+			if (isPromiseCanceledError(error)) {
+				output.log(localize('cancelInstall', "Cancelled installing extension '{0}'.", id));
+				return null;
+			} else {
+				throw error;
+			}
+		}
+	}
+
+	protected validateExtensionKind(_manifest: IExtensionManifest, output: CLIOutput): boolean {
+		return true;
+	}
+
+	private async validateVSIX(manifest: IExtensionManifest, force: boolean, output: CLIOutput): Promise<boolean> {
+		const extensionIdentifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
+		const installedExtensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
+		const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && gt(local.manifest.version, manifest.version));
+
+		if (newer && !force) {
+			output.log(localize('forceDowngrade', "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.", newer.identifier.id, newer.manifest.version, manifest.version));
+			return false;
+		}
+
+		return this.validateExtensionKind(manifest, output);
+	}
+
+	public async uninstallExtensions(extensions: (string | URI)[], force: boolean, output: CLIOutput = console): Promise<void> {
+		const getExtensionId = async (extensionDescription: string | URI): Promise<string> => {
+			if (extensionDescription instanceof URI) {
+				const manifest = await this.extensionManagementService.getManifest(extensionDescription);
+				return getId(manifest);
+			}
+			return extensionDescription;
+		};
+
+		const uninstalledExtensions: ILocalExtension[] = [];
+		for (const extension of extensions) {
+			const id = await getExtensionId(extension);
+			const installed = await this.extensionManagementService.getInstalled();
+			const extensionsToUninstall = installed.filter(e => areSameExtensions(e.identifier, { id }));
+			if (!extensionsToUninstall.length) {
+				throw new Error(`${this.notInstalled(id)}\n${useId}`);
+			}
+			if (extensionsToUninstall.some(e => e.type === ExtensionType.System)) {
+				output.log(localize('builtin', "Extension '{0}' is a Built-in extension and cannot be uninstalled", id));
+				return;
+			}
+			if (!force && extensionsToUninstall.some(e => e.isBuiltin)) {
+				output.log(localize('forceUninstall', "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.", id));
+				return;
+			}
+			output.log(localize('uninstalling', "Uninstalling {0}...", id));
+			for (const extensionToUninstall of extensionsToUninstall) {
+				await this.extensionManagementService.uninstall(extensionToUninstall);
+				uninstalledExtensions.push(extensionToUninstall);
+			}
+
+			if (this.location) {
+				output.log(localize('successUninstallFromLocation', "Extension '{0}' was successfully uninstalled from {1}!", id, this.location));
+			} else {
+				output.log(localize('successUninstall', "Extension '{0}' was successfully uninstalled!", id));
+			}
+
+		}
+
+		if (uninstalledExtensions.some(e => isLanguagePackExtension(e.manifest))) {
+			await this.updateLocalizationsCache();
+		}
+	}
+
+	public async locateExtension(extensions: string[], output: CLIOutput = console): Promise<void> {
+		const installed = await this.extensionManagementService.getInstalled();
+		extensions.forEach(e => {
+			installed.forEach(i => {
+				if (i.identifier.id === e) {
+					if (i.location.scheme === Schemas.file) {
+						output.log(i.location.fsPath);
+						return;
+					}
+				}
+			});
+		});
+	}
+
+
+	private updateLocalizationsCache(): Promise<boolean> {
+		return this.localizationsService.update();
+	}
+
+	private notInstalled(id: string) {
+		return this.location ? localize('notInstalleddOnLocation', "Extension '{0}' is not installed on {1}.", id, this.location) : localize('notInstalled', "Extension '{0}' is not installed.", id);
+	}
+
+}

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

@@ -42,12 +42,16 @@ export class ExtensionIdentifierWithVersion implements IExtensionIdentifierWithV
 	}
 }
 
+export function getExtensionId(publisher: string, name: string): string {
+	return `${publisher}.${name}`;
+}
+
 export function adoptToGalleryExtensionId(id: string): string {
 	return id.toLocaleLowerCase();
 }
 
 export function getGalleryExtensionId(publisher: string, name: string): string {
-	return `${publisher.toLocaleLowerCase()}.${name.toLocaleLowerCase()}`;
+	return adoptToGalleryExtensionId(getExtensionId(publisher, name));
 }
 
 export function groupByExtension<T>(extensions: T[], getExtensionIdentifier: (t: T) => IExtensionIdentifier): T[][] {

lib/vscode/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts

@@ -21,6 +21,8 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IExtensionRecommendationNotificationService, RecommendationsNotificationResult, RecommendationSource } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
 import { localize } from 'vs/nls';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { Event } from 'vs/base/common/event';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 
 type ExeExtensionRecommendationsClassification = {
 	extensionId: { classification: 'PublicNonPersonalData', purpose: 'FeatureInsight' };
@@ -52,6 +54,7 @@ export class ExtensionTipsService extends BaseExtensionTipsService {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IStorageService private readonly storageService: IStorageService,
+		@INativeHostService private readonly nativeHostService: INativeHostService,
 		@IExtensionRecommendationNotificationService private readonly extensionRecommendationNotificationService: IExtensionRecommendationNotificationService,
 		@IFileService fileService: IFileService,
 		@IProductService productService: IProductService,
@@ -172,6 +175,11 @@ export class ExtensionTipsService extends BaseExtensionTipsService {
 					case RecommendationsNotificationResult.Ignored:
 						this.highImportanceTipsByExe.delete(exeName);
 						break;
+					case RecommendationsNotificationResult.IncompatibleWindow:
+						// Recommended in incompatible window. Schedule the prompt after active window change
+						const onActiveWindowChange = Event.once(Event.latch(Event.any(this.nativeHostService.onDidOpenWindow, this.nativeHostService.onDidFocusWindow)));
+						this._register(onActiveWindowChange(() => this.promptHighImportanceExeBasedTip()));
+						break;
 					case RecommendationsNotificationResult.TooMany:
 						// Too many notifications. Schedule the prompt after one hour
 						const disposable = this._register(disposableTimeout(() => { disposable.dispose(); this.promptHighImportanceExeBasedTip(); }, 60 * 60 * 1000 /* 1 hour */));
@@ -217,6 +225,12 @@ export class ExtensionTipsService extends BaseExtensionTipsService {
 						this.promptMediumImportanceExeBasedTip();
 						break;
 
+					case RecommendationsNotificationResult.IncompatibleWindow:
+						// Recommended in incompatible window. Schedule the prompt after active window change
+						const onActiveWindowChange = Event.once(Event.latch(Event.any(this.nativeHostService.onDidOpenWindow, this.nativeHostService.onDidFocusWindow)));
+						this._register(onActiveWindowChange(() => this.promptMediumImportanceExeBasedTip()));
+						break;
+
 					case RecommendationsNotificationResult.TooMany:
 						// Too many notifications. Schedule the prompt after one hour
 						const disposable2 = this._register(disposableTimeout(() => { disposable2.dispose(); this.promptMediumImportanceExeBasedTip(); }, 60 * 60 * 1000 /* 1 hour */));

lib/vscode/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts

@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/common/extensionGalleryService';
+import { isUUID } from 'vs/base/common/uuid';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { IFileService } from 'vs/platform/files/common/files';
+import { FileService } from 'vs/platform/files/common/fileService';
+import { NullLogService } from 'vs/platform/log/common/log';
+import product from 'vs/platform/product/common/product';
+import { InMemoryStorageService, IStorageService } from 'vs/platform/storage/common/storage';
+import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
+import { URI } from 'vs/base/common/uri';
+import { joinPath } from 'vs/base/common/resources';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { mock } from 'vs/base/test/common/mock';
+
+class EnvironmentServiceMock extends mock<IEnvironmentService>() {
+	constructor(readonly serviceMachineIdResource: URI) {
+		super();
+	}
+}
+
+suite('Extension Gallery Service', () => {
+	const disposables: DisposableStore = new DisposableStore();
+	let fileService: IFileService, environmentService: IEnvironmentService, storageService: IStorageService;
+
+	setup(() => {
+		const serviceMachineIdResource = joinPath(URI.file('tests').with({ scheme: 'vscode-tests' }), 'machineid');
+		environmentService = new EnvironmentServiceMock(serviceMachineIdResource);
+		fileService = disposables.add(new FileService(new NullLogService()));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(serviceMachineIdResource.scheme, fileSystemProvider);
+		storageService = new InMemoryStorageService();
+	});
+
+	teardown(() => disposables.clear());
+
+	test('marketplace machine id', async () => {
+		const headers = await resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService);
+		assert.ok(isUUID(headers['X-Market-User-Id']));
+		const headers2 = await resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService);
+		assert.equal(headers['X-Market-User-Id'], headers2['X-Market-User-Id']);
+	});
+});

lib/vscode/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts

@@ -1,67 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import * as os from 'os';
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { join } from 'vs/base/common/path';
-import { mkdirp, RimRafMode, rimraf } from 'vs/base/node/pfs';
-import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { isUUID } from 'vs/base/common/uuid';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { Schemas } from 'vs/base/common/network';
-import product from 'vs/platform/product/common/product';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-
-suite('Extension Gallery Service', () => {
-	const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'extensiongalleryservice');
-	const marketplaceHome = join(parentDir, 'Marketplace');
-	let fileService: IFileService;
-	let disposables: DisposableStore;
-
-	setup(done => {
-
-		disposables = new DisposableStore();
-		fileService = new FileService(new NullLogService());
-		disposables.add(fileService);
-
-		const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
-		disposables.add(diskFileSystemProvider);
-		fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-
-		// Delete any existing backups completely and then re-create it.
-		rimraf(marketplaceHome, RimRafMode.MOVE).then(() => {
-			mkdirp(marketplaceHome).then(() => {
-				done();
-			}, error => done(error));
-		}, error => done(error));
-	});
-
-	teardown(done => {
-		disposables.clear();
-		rimraf(marketplaceHome, RimRafMode.MOVE).then(done, done);
-	});
-
-	test('marketplace machine id', () => {
-		const args = ['--user-data-dir', marketplaceHome];
-		const environmentService = new NativeEnvironmentService(parseArgs(args, OPTIONS));
-		const storageService: IStorageService = new TestStorageService();
-
-		return resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService).then(headers => {
-			assert.ok(isUUID(headers['X-Market-User-Id']));
-
-			return resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService).then(headers2 => {
-				assert.equal(headers['X-Market-User-Id'], headers2['X-Market-User-Id']);
-			});
-		});
-	});
-});