Revive extensionLocation when reading from cache

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

@@ -20,7 +20,7 @@ import { USER_MANIFEST_CACHE_FILE, BUILTIN_MANIFEST_CACHE_FILE, MANIFEST_CACHE_F
 import { IExtensionEnablementService, IExtensionIdentifier, EnablementState, IExtensionManagementService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions, BetterMergeId, BetterMergeDisabledNowKey, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionsRegistry, ExtensionPoint, IExtensionPointUser, ExtensionMessageCollector, IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ExtensionScanner, ILog, ExtensionScannerInput, IExtensionResolver, IExtensionReference, Translations } from 'vs/workbench/services/extensions/node/extensionPoints';
+import { ExtensionScanner, ILog, ExtensionScannerInput, IExtensionResolver, IExtensionReference, Translations, IRelaxedExtensionDescription } from 'vs/workbench/services/extensions/node/extensionPoints';
 import { ProxyIdentifier } from 'vs/workbench/services/extensions/node/proxyIdentifier';
 import { ExtHostContext, ExtHostExtensionServiceShape, IExtHostContext, MainContext } from 'vs/workbench/api/node/extHost.protocol';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -630,7 +630,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		const cacheFolder = path.join(environmentService.userDataPath, MANIFEST_CACHE_FOLDER);
 		const cacheFile = path.join(cacheFolder, cacheKey);
 
-		const expected = await ExtensionScanner.scanExtensions(input, new NullLogger());
+		const expected = JSON.parse(JSON.stringify(await ExtensionScanner.scanExtensions(input, new NullLogger())));
 
 		const cacheContents = await this._readExtensionCache(environmentService, cacheKey);
 		if (!cacheContents) {
@@ -715,7 +715,11 @@ export class ExtensionService extends Disposable implements IExtensionService {
 					errors.onUnexpectedError(err);
 				}
 			}, 5000);
-			return cacheContents.result;
+			return cacheContents.result.map((extensionDescription) => {
+				// revive URI object
+				(<IRelaxedExtensionDescription>extensionDescription).extensionLocation = URI.revive(extensionDescription.extensionLocation);
+				return extensionDescription;
+			});
 		}
 
 		const counterLogger = new CounterLogger(log);

src/vs/workbench/services/extensions/node/extensionPoints.ts

@@ -299,24 +299,25 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler {
 	}
 }
 
+// Relax the readonly properties here, it is the one place where we check and normalize values
+export interface IRelaxedExtensionDescription {
+	id: string;
+	name: string;
+	version: string;
+	publisher: string;
+	isBuiltin: boolean;
+	isUnderDevelopment: boolean;
+	extensionFolderPath: string;
+	extensionLocation: URI;
+	engines: {
+		vscode: string;
+	};
+	main?: string;
+	enableProposedApi?: boolean;
+}
+
 class ExtensionManifestValidator extends ExtensionManifestHandler {
 	validate(_extensionDescription: IExtensionDescription): IExtensionDescription {
-		// Relax the readonly properties here, it is the one place where we check and normalize values
-		interface IRelaxedExtensionDescription {
-			id: string;
-			name: string;
-			version: string;
-			publisher: string;
-			isBuiltin: boolean;
-			isUnderDevelopment: boolean;
-			extensionFolderPath: string;
-			extensionLocation: URI;
-			engines: {
-				vscode: string;
-			};
-			main?: string;
-			enableProposedApi?: boolean;
-		}
 		let extensionDescription = <IRelaxedExtensionDescription>_extensionDescription;
 		extensionDescription.isBuiltin = this._isBuiltin;
 		extensionDescription.isUnderDevelopment = this._isUnderDevelopment;