remove localStorage migration code

src/vs/code/electron-main/app.ts

@@ -61,8 +61,6 @@ import { LogLevelSetterChannel } from 'vs/platform/log/common/logIpc';
 import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { ElectronURLListener } from 'vs/platform/url/electron-main/electronUrlListener';
 import { serve as serveDriver } from 'vs/platform/driver/electron-main/driver';
-import { join } from 'path';
-import { exists, rename } from 'vs/base/node/pfs';
 
 export class CodeApplication {
 
@@ -264,54 +262,50 @@ export class CodeApplication {
 		this.logService.debug(`from: ${this.environmentService.appRoot}`);
 		this.logService.debug('args:', this.environmentService.args);
 
-		// Handle local storage (TODO@Ben remove me after a while)
-		return this.handleLocalStorage().then(() => {
-
-			// Make sure we associate the program with the app user model id
-			// This will help Windows to associate the running program with
-			// any shortcut that is pinned to the taskbar and prevent showing
-			// two icons in the taskbar for the same app.
-			if (platform.isWindows && product.win32AppUserModelId) {
-				app.setAppUserModelId(product.win32AppUserModelId);
-			}
+		// Make sure we associate the program with the app user model id
+		// This will help Windows to associate the running program with
+		// any shortcut that is pinned to the taskbar and prevent showing
+		// two icons in the taskbar for the same app.
+		if (platform.isWindows && product.win32AppUserModelId) {
+			app.setAppUserModelId(product.win32AppUserModelId);
+		}
 
-			// Create Electron IPC Server
-			this.electronIpcServer = new ElectronIPCServer();
+		// Create Electron IPC Server
+		this.electronIpcServer = new ElectronIPCServer();
 
-			// Resolve unique machine ID
-			this.logService.trace('Resolving machine identifier...');
-			return this.resolveMachineId().then(machineId => {
-				this.logService.trace(`Resolved machine identifier: ${machineId}`);
+		// Resolve unique machine ID
+		this.logService.trace('Resolving machine identifier...');
+		return this.resolveMachineId().then(machineId => {
+			this.logService.trace(`Resolved machine identifier: ${machineId}`);
 
-				// Spawn shared process
-				this.sharedProcess = new SharedProcess(this.environmentService, this.lifecycleService, this.logService, machineId, this.userEnv);
-				this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
+			// Spawn shared process
+			this.sharedProcess = new SharedProcess(this.environmentService, this.lifecycleService, this.logService, machineId, this.userEnv);
+			this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
 
-				// Services
-				const appInstantiationService = this.initServices(machineId);
+			// Services
+			const appInstantiationService = this.initServices(machineId);
 
-				let promise: TPromise<any> = TPromise.as(null);
+			let promise: TPromise<any> = TPromise.as(null);
 
-				// Create driver
-				if (this.environmentService.driverHandle) {
-					serveDriver(this.electronIpcServer, this.environmentService.driverHandle, appInstantiationService).then(server => {
-						this.logService.info('Driver started at:', this.environmentService.driverHandle);
-						this.toDispose.push(server);
-					});
-				}
+			// Create driver
+			if (this.environmentService.driverHandle) {
+				serveDriver(this.electronIpcServer, this.environmentService.driverHandle, appInstantiationService).then(server => {
+					this.logService.info('Driver started at:', this.environmentService.driverHandle);
+					this.toDispose.push(server);
+				});
+			}
 
-				return promise.then(() => {
+			return promise.then(() => {
 
-					// Setup Auth Handler
-					const authHandler = appInstantiationService.createInstance(ProxyAuthHandler);
-					this.toDispose.push(authHandler);
+				// Setup Auth Handler
+				const authHandler = appInstantiationService.createInstance(ProxyAuthHandler);
+				this.toDispose.push(authHandler);
 
-					// Open Windows
-					appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor));
+				// Open Windows
+				appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor));
 
-					// Post Open Windows Tasks
-					appInstantiationService.invokeFunction(accessor => this.afterWindowOpen(accessor));
-				});
+				// Post Open Windows Tasks
+				appInstantiationService.invokeFunction(accessor => this.afterWindowOpen(accessor));
 			});
 		});
 	}
@@ -331,23 +325,6 @@ export class CodeApplication {
 		});
 	}
 
-	private handleLocalStorage(): TPromise<void> {
-		const localStorageFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage');
-		const localStorageJournalFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage-journal');
-		const localStorageBackupFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage.vscbak');
-		const localStorageJournalBackupFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage-journal.vscbak');
-
-		// Electron 1.7.12: Restore storage
-		return exists(localStorageBackupFile).then(localStorageBackupFileExists => {
-			return exists(localStorageJournalBackupFile).then(localStorageJournalBackupFileExists => {
-				return TPromise.join([
-					localStorageBackupFileExists ? rename(localStorageBackupFile, localStorageFile) : TPromise.as(void 0),
-					localStorageJournalBackupFileExists ? rename(localStorageJournalBackupFile, localStorageJournalFile) : TPromise.as(void 0)
-				]);
-			});
-		}).then(() => void 0, () => void 0);
-	}
-
 	private initServices(machineId: string): IInstantiationService {
 		const services = new ServiceCollection();