Merge from master

src/vs/code/electron-browser/sharedProcess/contrib/contributions.ts

@@ -2,16 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import { NodeCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner';
 import { LanguagePackCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { StorageDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner';
 
 export function createSharedProcessContributions(service: IInstantiationService): IDisposable {
 	return combinedDisposable([
 		service.createInstance(NodeCachedDataCleaner),
-		service.createInstance(LanguagePackCachedDataCleaner)
+		service.createInstance(LanguagePackCachedDataCleaner),
+		service.createInstance(StorageDataCleaner)
 	]);
 }

src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as path from 'path';
 import * as pfs from 'vs/base/node/pfs';
@@ -51,7 +50,7 @@ export class LanguagePackCachedDataCleaner {
 	}
 
 	private _manageCachedDataSoon(): void {
-		let handle = setTimeout(async () => {
+		let handle: any = setTimeout(async () => {
 			handle = undefined;
 			this._logService.info('Starting to clean up unused language packs.');
 			const maxAge = product.nameLong.indexOf('Insiders') >= 0

src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts

@@ -2,12 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { basename, dirname, join } from 'path';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { join, basename, dirname } from 'path';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { readdir, rimraf, stat } from 'vs/base/node/pfs';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import product from 'vs/platform/node/product';
@@ -43,13 +41,13 @@ export class NodeCachedDataCleaner {
 		const nodeCachedDataRootDir = dirname(this._environmentService.nodeCachedDataDir);
 		const nodeCachedDataCurrent = basename(this._environmentService.nodeCachedDataDir);
 
-		let handle = setTimeout(() => {
+		let handle: any = setTimeout(() => {
 			handle = undefined;
 
 			readdir(nodeCachedDataRootDir).then(entries => {
 
 				const now = Date.now();
-				const deletes: TPromise<any>[] = [];
+				const deletes: Thenable<any>[] = [];
 
 				entries.forEach(entry => {
 					// name check
@@ -72,9 +70,9 @@ export class NodeCachedDataCleaner {
 					}
 				});
 
-				return TPromise.join(deletes);
+				return Promise.all(deletes);
 
-			}).done(undefined, onUnexpectedError);
+			}).then(undefined, onUnexpectedError);
 
 		}, 30 * 1000);
 

src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts

@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { join } from 'path';
+import { readdir, readFile, rimraf } from 'vs/base/node/pfs';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IBackupWorkspacesFormat } from 'vs/platform/backup/common/backup';
+
+export class StorageDataCleaner extends Disposable {
+
+	// Workspace/Folder storage names are MD5 hashes (128bits / 4 due to hex presentation)
+	private static NON_EMPTY_WORKSPACE_ID_LENGTH = 128 / 4;
+
+	constructor(
+		@IEnvironmentService private environmentService: IEnvironmentService
+	) {
+		super();
+
+		this.cleanUpStorageSoon();
+	}
+
+	private cleanUpStorageSoon(): void {
+		let handle: any = setTimeout(() => {
+			handle = void 0;
+
+			// Leverage the backup workspace file to find out which empty workspace is currently in use to
+			// determine which empty workspace storage can safely be deleted
+			readFile(this.environmentService.backupWorkspacesPath, 'utf8').then(contents => {
+				const workspaces = JSON.parse(contents) as IBackupWorkspacesFormat;
+				const emptyWorkspaces = workspaces.emptyWorkspaceInfos.map(info => info.backupFolder);
+
+				// Read all workspace storage folders that exist
+				return readdir(this.environmentService.workspaceStorageHome).then(storageFolders => {
+					const deletes: Promise<void>[] = [];
+
+					storageFolders.forEach(storageFolder => {
+						if (storageFolder.length === StorageDataCleaner.NON_EMPTY_WORKSPACE_ID_LENGTH) {
+							return;
+						}
+
+						if (emptyWorkspaces.indexOf(storageFolder) === -1) {
+							deletes.push(rimraf(join(this.environmentService.workspaceStorageHome, storageFolder)));
+						}
+					});
+
+					return Promise.all(deletes);
+				});
+			}).then(null, onUnexpectedError);
+		}, 30 * 1000);
+
+		this._register(toDisposable(() => clearTimeout(handle)));
+	}
+}