Merge VS Code 1.31.1 (#4283)

2026-02-12 19:18:32 -05:00 · 2019-03-15 13:09:45 -07:00
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
--- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
@@ -7,7 +7,7 @@ import { tmpdir } from 'os';
 import * as path from 'path';
 import { distinct } from 'vs/base/common/arrays';
 import { getErrorMessage, isPromiseCanceledError, canceled } from 'vs/base/common/errors';
-import { StatisticType, IGalleryExtension, IExtensionGalleryService, IGalleryExtensionAsset, IQueryOptions, SortBy, SortOrder, IExtensionManifest, IExtensionIdentifier, IReportedExtension, InstallOperation, ITranslation, IGalleryExtensionVersion } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { StatisticType, IGalleryExtension, IExtensionGalleryService, IGalleryExtensionAsset, IQueryOptions, SortBy, SortOrder, IExtensionIdentifier, IReportedExtension, InstallOperation, ITranslation, IGalleryExtensionVersion, IGalleryExtensionAssets, isIExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { getGalleryExtensionId, getGalleryExtensionTelemetryData, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { assign, getOrDefault } from 'vs/base/common/objects';
 import { IRequestService } from 'vs/platform/request/node/request';
@@ -28,6 +28,7 @@ import { ExtensionsPolicy, ExtensionsPolicyKey } from 'vs/workbench/parts/extens
 // {{SQL CARBON EDIT}} - End
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';

 interface IRawGalleryExtensionFile {
 	assetType: string;
@@ -204,7 +205,7 @@ class Query {

 	get searchText(): string {
 		const criterium = this.state.criteria.filter(criterium => criterium.filterType === FilterType.SearchText)[0];
-		return criterium ? criterium.value : '';
+		return criterium && criterium.value ? criterium.value : '';
 	}
 }

@@ -222,7 +223,41 @@ function getCoreTranslationAssets(version: IRawGalleryExtensionVersion): { [lang
 	}, {});
 }

-function getVersionAsset(version: IRawGalleryExtensionVersion, type: string): IGalleryExtensionAsset {
+function getRepositoryAsset(version: IRawGalleryExtensionVersion): IGalleryExtensionAsset | null {
+	if (version.properties) {
+		const results = version.properties.filter(p => p.key === AssetType.Repository);
+		const gitRegExp = new RegExp('((git|ssh|http(s)?)|(git@[\w\.]+))(:(//)?)([\w\.@\:/\-~]+)(\.git)(/)?');
+
+		const uri = results.filter(r => gitRegExp.test(r.value))[0];
+		return uri ? { uri: uri.value, fallbackUri: uri.value } : null;
+	}
+	return getVersionAsset(version, AssetType.Repository);
+}
+
+function getDownloadAsset(version: IRawGalleryExtensionVersion): IGalleryExtensionAsset {
+	// {{SQL CARBON EDIT}} - Use the extension VSIX download URL if present
+	const asset = getVersionAsset(version, AssetType.VSIX);
+	if (asset) {
+		return asset;
+	}
+	// {{SQL CARBON EDIT}} - End
+
+	return {
+		uri: `${version.fallbackAssetUri}/${AssetType.VSIX}?redirect=true`,
+		fallbackUri: `${version.fallbackAssetUri}/${AssetType.VSIX}`
+	};
+}
+
+function getIconAsset(version: IRawGalleryExtensionVersion): IGalleryExtensionAsset {
+	const asset = getVersionAsset(version, AssetType.Icon);
+	if (asset) {
+		return asset;
+	}
+	const uri = require.toUrl('./media/defaultIcon.png');
+	return { uri, fallbackUri: uri };
+}
+
+function getVersionAsset(version: IRawGalleryExtensionVersion, type: string): IGalleryExtensionAsset | null {
 	const result = version.files.filter(f => f.assetType === type)[0];

 	// {{SQL CARBON EDIT}}
@@ -230,63 +265,22 @@ function getVersionAsset(version: IRawGalleryExtensionVersion, type: string): IG
 	if (result) {
 		uriFromSource = result.source;
 	}
-
-	if (type === AssetType.Repository) {
-		if (version.properties) {
-			const results = version.properties.filter(p => p.key === type);
-			const gitRegExp = new RegExp('((git|ssh|http(s)?)|(git@[\w\.]+))(:(//)?)([\w\.@\:/\-~]+)(\.git)(/)?');
-
-			const uri = results.filter(r => gitRegExp.test(r.value))[0];
-			if (!uri) {
-				return {
-					uri: null,
-					fallbackUri: null
-				};
-			}
-
-			return {
-				uri: uri.value,
-				fallbackUri: uri.value,
-			};
-		}
-	}
-
-	if (!result) {
-		if (type === AssetType.Icon) {
-			const uri = require.toUrl('./media/defaultIcon.png');
-			return { uri, fallbackUri: uri };
-		}
-
-		if (type === AssetType.Repository) {
-			return {
-				uri: null,
-				fallbackUri: null
-			};
-		}
-
-		return null;
-	}
-
 	if (type === AssetType.VSIX) {
 		return {
-			// {{SQL CARBON EDIT}}
 			uri: uriFromSource || `${version.fallbackAssetUri}/${type}?redirect=true`,
 			fallbackUri: `${version.fallbackAssetUri}/${type}`
 		};
 	}
-
-	// {{SQL CARBON EDIT}}
 	if (version.assetUri) {
 		return {
 			uri: `${version.assetUri}/${type}`,
 			fallbackUri: `${version.fallbackAssetUri}/${type}`
 		};
 	} else {
-		return {
-			uri: uriFromSource,
-			fallbackUri: `${version.fallbackAssetUri}/${type}`
-		};
+		return result ? { uri: uriFromSource, fallbackUri: `${version.fallbackAssetUri}/${type}` } : null;
 	}
+	// return result ? { uri: `${version.assetUri}/${type}`, fallbackUri: `${version.fallbackAssetUri}/${type}` } : null;
+	// {{SQL CARBON EDIT}} - End
 }

 function getExtensions(version: IRawGalleryExtensionVersion, property: string): string[] {
@@ -317,16 +311,16 @@ function getIsPreview(flags: string): boolean {
 }

 function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGalleryExtensionVersion, index: number, query: Query, querySource?: string): IGalleryExtension {
-	const assets = {
+	const assets = <IGalleryExtensionAssets>{
 		manifest: getVersionAsset(version, AssetType.Manifest),
 		readme: getVersionAsset(version, AssetType.Details),
 		changelog: getVersionAsset(version, AssetType.Changelog),
-		download: getVersionAsset(version, AssetType.VSIX),
+		license: getVersionAsset(version, AssetType.License),
+		repository: getRepositoryAsset(version),
+		download: getDownloadAsset(version),
 		// {{SQL CARBON EDIT}} - Add downloadPage
 		downloadPage: getVersionAsset(version, AssetType.DownloadPage),
-		icon: getVersionAsset(version, AssetType.Icon),
-		license: getVersionAsset(version, AssetType.License),
-		repository: getVersionAsset(version, AssetType.Repository),
+		icon: getIconAsset(version),
 		coreTranslations: getCoreTranslationAssets(version)
 	};

@@ -386,10 +380,10 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 	private readonly commonHeadersPromise: Promise<{ [key: string]: string; }>;

 	constructor(
-		@IRequestService private requestService: IRequestService,
-		@ILogService private logService: ILogService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@ITelemetryService private telemetryService: ITelemetryService,
+		@IRequestService private readonly requestService: IRequestService,
+		@ILogService private readonly logService: ILogService,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		// {{SQL CARBON EDIT}}
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
@@ -408,12 +402,18 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		return !!this.extensionsGalleryUrl;
 	}

-	getExtension({ id, uuid }: IExtensionIdentifier, version?: string): Promise<IGalleryExtension> {
+	getCompatibleExtension(arg1: IExtensionIdentifier | IGalleryExtension, version?: string): Promise<IGalleryExtension | null> {
+		const extension: IGalleryExtension | null = isIExtensionIdentifier(arg1) ? null : arg1;
+		if (extension && extension.properties.engine && isEngineValid(extension.properties.engine)) {
+			return Promise.resolve(extension);
+		}
+		const { id, uuid } = extension ? extension.identifier : <IExtensionIdentifier>arg1;
 		let query = new Query()
-			.withFlags(Flags.IncludeAssetUri, Flags.IncludeStatistics, Flags.IncludeFiles, Flags.IncludeVersionProperties)
+			.withFlags(Flags.IncludeAssetUri, Flags.IncludeStatistics, Flags.IncludeFiles, Flags.IncludeVersionProperties, Flags.ExcludeNonValidated)
 			.withPage(1, 1)
 			.withFilter(FilterType.Target, 'Microsoft.VisualStudio.Code')
-			.withFilter(FilterType.ExcludeWithFlags, flagsToString(Flags.Unpublished));
+			.withFilter(FilterType.ExcludeWithFlags, flagsToString(Flags.Unpublished))
+			.withAssetTypes(AssetType.Manifest, AssetType.VSIX);

 		if (uuid) {
 			query = query.withFilter(FilterType.ExtensionId, uuid);
@@ -421,16 +421,30 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			query = query.withFilter(FilterType.ExtensionName, id);
 		}

-		return this.queryGallery(query, CancellationToken.None).then(({ galleryExtensions }) => {
-			if (galleryExtensions.length) {
-				const galleryExtension = galleryExtensions[0];
-				const versionAsset = version ? galleryExtension.versions.filter(v => v.version === version)[0] : galleryExtension.versions[0];
-				if (versionAsset) {
-					return toExtension(galleryExtension, versionAsset, 0, query);
+		return this.queryGallery(query, CancellationToken.None)
+			.then(({ galleryExtensions }) => {
+				const [rawExtension] = galleryExtensions;
+				if (!rawExtension || !rawExtension.versions.length) {
+					return null;
 				}
-			}
-			return null;
-		});
+				if (version) {
+					const versionAsset = rawExtension.versions.filter(v => v.version === version)[0];
+					if (versionAsset) {
+						const extension = toExtension(rawExtension, versionAsset, 0, query);
+						if (extension.properties.engine && isEngineValid(extension.properties.engine)) {
+							return extension;
+						}
+					}
+					return null;
+				}
+				return this.getLastValidExtensionVersion(rawExtension, rawExtension.versions)
+					.then(rawVersion => {
+						if (rawVersion) {
+							return toExtension(rawExtension, rawVersion, 0, query);
+						}
+						return null;
+					});
+			});
 	}

 	query(options: IQueryOptions = {}): Promise<IPager<IGalleryExtension>> {
@@ -592,6 +606,9 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 	}

 	private queryGallery(query: Query, token: CancellationToken): Promise<{ galleryExtensions: IRawGalleryExtension[], total: number; }> {
+		if (!this.isEnabled()) {
+			return Promise.reject(new Error('No extension gallery service configured.'));
+		}
 		return this.commonHeadersPromise.then(commonHeaders => {
 			const data = JSON.stringify(query.raw);
 			const headers = assign({}, commonHeaders, {
@@ -611,20 +628,24 @@ export class ExtensionGalleryService implements IExtensionGalleryService {

 				// {{SQL CARBON EDIT}}
 				let extensionPolicy: string = this.configurationService.getValue<string>(ExtensionsPolicyKey);
-				if (context.res.statusCode >= 400 && context.res.statusCode < 500 || extensionPolicy === ExtensionsPolicy.allowNone) {
+				if (context.res.statusCode && context.res.statusCode >= 400 && context.res.statusCode < 500 || extensionPolicy === ExtensionsPolicy.allowNone) {
 					return { galleryExtensions: [], total: 0 };
 				}

 				return asJson<IRawGalleryQueryResult>(context).then(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;
+					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;

-					// {{SQL CARBON EDIT}}
-					let filteredExtensionsResult = this.createQueryResult(query, galleryExtensions);
+						// {{SQL CARBON EDIT}}
+						let filteredExtensionsResult = this.createQueryResult(query, galleryExtensions);

-					return { galleryExtensions: filteredExtensionsResult.galleryExtensions, total: filteredExtensionsResult.total };
+						return { galleryExtensions: filteredExtensionsResult.galleryExtensions, total: filteredExtensionsResult.total };
+						// {{SQL CARBON EDIT}} - End
+					}
+					return { galleryExtensions: [], total: 0 };
 				});
 			});
 		});
@@ -632,7 +653,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {

 	reportStatistic(publisher: string, name: string, version: string, type: StatisticType): Promise<void> {
 		if (!this.isEnabled()) {
-			return Promise.resolve(null);
+			return Promise.resolve(undefined);
 		}

 		return this.commonHeadersPromise.then(commonHeaders => {
@@ -642,7 +663,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 				type: 'POST',
 				url: this.api(`/publishers/${publisher}/extensions/${name}/${version}/stats?statType=${type}`),
 				headers
-			}, CancellationToken.None).then(null, () => null);
+			}, CancellationToken.None).then(undefined, () => undefined);
 		});
 	}

@@ -676,17 +697,24 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 	}

 	getReadme(extension: IGalleryExtension, token: CancellationToken): Promise<string> {
-		return this.getAsset(extension.assets.readme, {}, token)
-			.then(asText);
+		if (extension.assets.readme) {
+			return this.getAsset(extension.assets.readme, {}, token)
+				.then(context => asText(context))
+				.then(content => content || '');
+		}
+		return Promise.resolve('');
 	}

-	getManifest(extension: IGalleryExtension, token: CancellationToken): Promise<IExtensionManifest> {
-		return this.getAsset(extension.assets.manifest, {}, token)
-			.then(asText)
-			.then(JSON.parse);
+	getManifest(extension: IGalleryExtension, token: CancellationToken): Promise<IExtensionManifest | null> {
+		if (extension.assets.manifest) {
+			return this.getAsset(extension.assets.manifest, {}, token)
+				.then(asText)
+				.then(JSON.parse);
+		}
+		return Promise.resolve(null);
 	}

-	getCoreTranslation(extension: IGalleryExtension, languageId: string): Promise<ITranslation> {
+	getCoreTranslation(extension: IGalleryExtension, languageId: string): Promise<ITranslation | null> {
 		const asset = extension.assets.coreTranslations[languageId.toUpperCase()];
 		if (asset) {
 			return this.getAsset(asset)
@@ -697,8 +725,12 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 	}

 	getChangelog(extension: IGalleryExtension, token: CancellationToken): Promise<string> {
-		return this.getAsset(extension.assets.changelog, {}, token)
-			.then(asText);
+		if (extension.assets.changelog) {
+			return this.getAsset(extension.assets.changelog, {}, token)
+				.then(context => asText(context))
+				.then(content => content || '');
+		}
+		return Promise.resolve('');
 	}

 	loadAllDependencies(extensions: IExtensionIdentifier[], token: CancellationToken): Promise<IGalleryExtension[]> {
@@ -707,7 +739,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {

 	getAllVersions(extension: IGalleryExtension, compatible: boolean): Promise<IGalleryExtensionVersion[]> {
 		let query = new Query()
-			.withFlags(Flags.IncludeVersions, Flags.IncludeFiles, Flags.IncludeVersionProperties)
+			.withFlags(Flags.IncludeVersions, Flags.IncludeFiles, Flags.IncludeVersionProperties, Flags.ExcludeNonValidated)
 			.withPage(1, 1)
 			.withFilter(FilterType.Target, 'Microsoft.VisualStudio.Code')
 			.withFilter(FilterType.ExcludeWithFlags, flagsToString(Flags.Unpublished));
@@ -724,7 +756,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 					return Promise.all(galleryExtensions[0].versions.map(v => this.getEngine(v).then(engine => isEngineValid(engine) ? v : null)))
 						.then(versions => versions
 							.filter(v => !!v)
-							.map(v => ({ version: v.version, date: v.lastUpdated })));
+							.map(v => ({ version: v!.version, date: v!.lastUpdated })));
 				} else {
 					return galleryExtensions[0].versions.map(v => ({ version: v.version, date: v.lastUpdated }));
 				}
@@ -733,65 +765,6 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		});
 	}

-	loadCompatibleVersion(extension: IGalleryExtension, fromVersion: string = extension.version): Promise<IGalleryExtension> {
-		// {{SQL CARBON EDIT}}
-		// Change to original version: removed the extension version validation
-		// Reason: This method is used to find the matching gallery extension for the locally installed extension,
-		//         since we only have one entry for each extension (not in-scope to enable mutiple version support for now),
-		//         if the new version of extension is not compatible, the extension won't be displayed properly.
-		if (extension.version === fromVersion) {
-			return Promise.resolve(extension);
-		}
-		const query = new Query()
-			.withFlags(Flags.IncludeVersions, Flags.IncludeFiles, Flags.IncludeVersionProperties)
-			.withPage(1, 1)
-			.withFilter(FilterType.Target, 'Microsoft.VisualStudio.Code')
-			.withFilter(FilterType.ExcludeWithFlags, flagsToString(Flags.Unpublished))
-			.withAssetTypes(AssetType.Manifest, AssetType.VSIX)
-			.withFilter(FilterType.ExtensionId, extension.identifier.uuid);
-
-		return this.queryGallery(query, CancellationToken.None)
-			.then(({ galleryExtensions }) => {
-				const [rawExtension] = galleryExtensions;
-
-				if (!rawExtension) {
-					return null;
-				}
-
-				const versions: IRawGalleryExtensionVersion[] = this.getVersionsFrom(rawExtension.versions, fromVersion);
-				if (!versions.length) {
-					return null;
-				}
-
-				return this.getLastValidExtensionVersion(rawExtension, versions)
-					.then(rawVersion => {
-						if (rawVersion) {
-							return toExtension(rawExtension, rawVersion, 0, query);
-						}
-						return null;
-					});
-			});
-	}
-
-	private getVersionsFrom(versions: IRawGalleryExtensionVersion[], version: string): IRawGalleryExtensionVersion[] {
-		if (versions[0].version === version) {
-			return versions;
-		}
-		const result: IRawGalleryExtensionVersion[] = [];
-		let currentVersion: IRawGalleryExtensionVersion = null;
-		for (const v of versions) {
-			if (!currentVersion) {
-				if (v.version === version) {
-					currentVersion = v;
-				}
-			}
-			if (currentVersion) {
-				result.push(v);
-			}
-		}
-		return result;
-	}
-
 	private loadDependencies(extensionNames: string[], token: CancellationToken): Promise<IGalleryExtension[]> {
 		if (!extensionNames || extensionNames.length === 0) {
 			return Promise.resolve([]);
@@ -863,7 +836,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 					return asText(context)
 						.then(message => Promise.reject(new Error(`Expected 200, got back ${context.res.statusCode} instead.\n\n${message}`)));
 				})
-				.then(null, err => {
+				.then(undefined, err => {
 					if (isPromiseCanceledError(err)) {
 						return Promise.reject(err);
 					}
@@ -886,7 +859,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 					this.telemetryService.publicLog('galleryService:cdnFallback', { url, message });

 					const fallbackOptions = assign({}, options, { url: fallbackUrl });
-					return this.requestService.request(fallbackOptions, token).then(null, err => {
+					return this.requestService.request(fallbackOptions, token).then(undefined, err => {
 						if (isPromiseCanceledError(err)) {
 							return Promise.reject(err);
 						}
@@ -906,7 +879,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		});
 	}

-	private getLastValidExtensionVersion(extension: IRawGalleryExtension, versions: IRawGalleryExtensionVersion[]): Promise<IRawGalleryExtensionVersion> {
+	private getLastValidExtensionVersion(extension: IRawGalleryExtension, versions: IRawGalleryExtensionVersion[]): Promise<IRawGalleryExtensionVersion | null> {
 		const version = this.getLastValidExtensionVersionFromProperties(extension, versions);
 		if (version) {
 			return version;
@@ -914,7 +887,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		return this.getLastValidExtensionVersionReccursively(extension, versions);
 	}

-	private getLastValidExtensionVersionFromProperties(extension: IRawGalleryExtension, versions: IRawGalleryExtensionVersion[]): Promise<IRawGalleryExtensionVersion> {
+	private getLastValidExtensionVersionFromProperties(extension: IRawGalleryExtension, versions: IRawGalleryExtensionVersion[]): Promise<IRawGalleryExtensionVersion> | null {
 		for (const version of versions) {
 			const engine = getEngine(version);
 			if (!engine) {
@@ -933,17 +906,20 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			return Promise.resolve(engine);
 		}

-		const asset = getVersionAsset(version, AssetType.Manifest);
-		const headers = { 'Accept-Encoding': 'gzip' };
+		const manifest = getVersionAsset(version, AssetType.Manifest);
+		if (!manifest) {
+			return Promise.reject('Manifest was not found');
+		}

-		return this.getAsset(asset, { headers })
+		const headers = { 'Accept-Encoding': 'gzip' };
+		return this.getAsset(manifest, { headers })
 			.then(context => asJson<IExtensionManifest>(context))
-			.then(manifest => manifest.engines.vscode);
+			.then(manifest => manifest ? manifest.engines.vscode : Promise.reject('Error while reading manifest'));
 	}

-	private getLastValidExtensionVersionReccursively(extension: IRawGalleryExtension, versions: IRawGalleryExtensionVersion[]): Promise<IRawGalleryExtensionVersion> {
+	private getLastValidExtensionVersionReccursively(extension: IRawGalleryExtension, versions: IRawGalleryExtensionVersion[]): Promise<IRawGalleryExtensionVersion | null> {
 		if (!versions.length) {
-			return null;
+			return Promise.resolve(null);
 		}

 		const version = versions[0];
@@ -985,10 +961,12 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			return asJson<IRawExtensionsReport>(context).then(result => {
 				const map = new Map<string, IReportedExtension>();

-				for (const id of result.malicious) {
-					const ext = map.get(id) || { id: { id }, malicious: true, slow: false };
-					ext.malicious = true;
-					map.set(id, ext);
+				if (result) {
+					for (const id of result.malicious) {
+						const ext = map.get(id) || { id: { id }, malicious: true, slow: false };
+						ext.malicious = true;
+						map.set(id, ext);
+					}
 				}

 				return Promise.resolve(values(map));
@@ -1000,29 +978,21 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 export function resolveMarketplaceHeaders(environmentService: IEnvironmentService): Promise<{ [key: string]: string; }> {
 	const marketplaceMachineIdFile = path.join(environmentService.userDataPath, 'machineid');

-	return readFile(marketplaceMachineIdFile, 'utf8').then(contents => {
-		if (isUUID(contents)) {
-			return contents;
-		}
-
-		return Promise.resolve(null); // invalid marketplace UUID
-	}, error => {
-		return Promise.resolve(null); // error reading ID file
-	}).then(uuid => {
-		if (!uuid) {
-			uuid = generateUuid();
-
-			try {
-				writeFileAndFlushSync(marketplaceMachineIdFile, uuid);
-			} catch (error) {
-				//noop
+	return readFile(marketplaceMachineIdFile, 'utf8')
+		.then<string | null>(contents => isUUID(contents) ? contents : Promise.resolve(null), () => Promise.resolve(null) /* error reading ID file */)
+		.then(uuid => {
+			if (!uuid) {
+				uuid = generateUuid();
+				try {
+					writeFileAndFlushSync(marketplaceMachineIdFile, uuid);
+				} catch (error) {
+					//noop
+				}
 			}
-		}
-
-		return {
-			'X-Market-Client-Id': `VSCode ${pkg.version}`,
-			'User-Agent': `VSCode ${pkg.version}`,
-			'X-Market-User-Id': uuid
-		};
-	});
+			return {
+				'X-Market-Client-Id': `VSCode ${pkg.version}`,
+				'User-Agent': `VSCode ${pkg.version}`,
+				'X-Market-User-Id': uuid
+			};
+		});
 }