Extensions Storage: do not dispose immediately

sandy081 · sandy081 · commit 251cd7360619 · 2016-10-12T20:34:13.000+02:00
diff --git a/src/vs/platform/extensions/node/extensions.ts b/src/vs/platform/extensions/node/extensions.ts
@@ -14,6 +14,9 @@ export class ExtensionsRuntimeService implements IExtensionsRuntimeService {
 
 	_serviceBrand: any;
 
+	private workspaceStorage: ExtensionsStorage;
+	private globalStorage: ExtensionsStorage;
+
 	constructor(
 		@IStorageService private storageService: IStorageService
 	) {
@@ -34,20 +37,50 @@ export class ExtensionsRuntimeService implements IExtensionsRuntimeService {
 	}
 
 	private getData(scope: StorageScope): IExtensionsStorageData {
+		const extensionsStorage = this.getStorage(scope);
+		return extensionsStorage ? extensionsStorage.data : {};
+	}
+
+	private getStorage(scope: StorageScope): ExtensionsStorage {
 		const path = this.getPath(scope);
 		if (path) {
-			const extensionsStorage = new ExtensionsStorage(path);
-			const data = extensionsStorage.data;
-			extensionsStorage.dispose();
-			return data;
+			if (StorageScope.WORKSPACE === scope) {
+				return this.getWorkspaceStorage(path);
+			}
+			return this.getGlobalStorage(path);
 		}
-		return {};
+		return null;
+	}
+
+	private getGlobalStorage(path: string): ExtensionsStorage {
+		if (!this.globalStorage) {
+			this.globalStorage = new ExtensionsStorage(path);
+		}
+		return this.globalStorage;
+	}
+
+	private getWorkspaceStorage(path: string): ExtensionsStorage {
+		if (!this.workspaceStorage) {
+			this.workspaceStorage = new ExtensionsStorage(path);
+		}
+		return this.workspaceStorage;
 	}
 
 	private getPath(scope: StorageScope): string {
 		const path = this.storageService.getStoragePath(scope);
 		return path ? paths.join(path, 'extensions.json') : void 0;
 	}
+
+	public dispose() {
+		if (this.workspaceStorage) {
+			this.workspaceStorage.dispose();
+			this.workspaceStorage = null;
+		}
+		if (this.globalStorage) {
+			this.globalStorage.dispose();
+			this.globalStorage = null;
+		}
+	}
 }
 
 export class ExtensionsStorage extends Disposable {
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
@@ -294,6 +294,7 @@ export class WorkbenchShell {
 
 		const extensionsRuntimeService = instantiationService.createInstance(ExtensionsRuntimeService);
 		serviceCollection.set(IExtensionsRuntimeService, extensionsRuntimeService);
+		disposables.add(extensionsRuntimeService);
 
 		const extensionHostProcessWorker = this.startExtensionHost(instantiationService);
 		this.threadService = instantiationService.createInstance(MainThreadService, extensionHostProcessWorker.messagingProtocol);
