sqlite - renames

src/vs/platform/storage2/common/storage2.ts

@@ -6,9 +6,9 @@
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
 
-export const INextStorageService = createDecorator<INextStorageService>('nextStorageService');
+export const INextStorage2Service = createDecorator<INextStorage2Service>('nextStorage2Service');
 
-export interface INextStorageService {
+export interface INextStorage2Service {
 	_serviceBrand: any;
 
 	/**
@@ -79,4 +79,30 @@ export const enum StorageScope {
 export interface IWorkspaceStorageChangeEvent {
 	key: string;
 	scope: StorageScope;
-}
\ No newline at end of file
+}
+
+export const NullNextStorage2Service: INextStorage2Service = {
+	_serviceBrand: undefined,
+
+	onDidChangeStorage: Event.None,
+
+	get(key: string, scope: StorageScope, fallbackValue?: string): string {
+		return fallbackValue;
+	},
+
+	getBoolean(key: string, scope: StorageScope, fallbackValue?: boolean): boolean {
+		return fallbackValue;
+	},
+
+	getInteger(key: string, scope: StorageScope, fallbackValue?: number): number {
+		return fallbackValue;
+	},
+
+	set(key: string, value: any, scope: StorageScope): Promise<void> {
+		return Promise.resolve();
+	},
+
+	delete(key: string, scope: StorageScope): Promise<void> {
+		return Promise.resolve();
+	}
+};
\ No newline at end of file

src/vs/platform/storage2/node/nextStorageService.ts → src/vs/platform/storage2/node/nextStorage2Service.ts

@@ -7,11 +7,11 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWorkspaceStorageChangeEvent, INextStorageService, StorageScope } from 'vs/platform/storage2/common/storage2';
+import { IWorkspaceStorageChangeEvent, INextStorage2Service, StorageScope } from 'vs/platform/storage2/common/storage2';
 import { Storage, IStorageLoggingOptions } from 'vs/base/node/storage';
 import { IStorageService, StorageScope as LocalStorageScope } from 'vs/platform/storage/common/storage';
 
-export class NextStorageService extends Disposable implements INextStorageService {
+export class NextStorage2Service extends Disposable implements INextStorage2Service {
 	_serviceBrand: any;
 
 	private _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>());
@@ -84,25 +84,25 @@ export class NextStorageService extends Disposable implements INextStorageServic
 	}
 }
 
-export class NextDelegatingStorageService extends Disposable implements INextStorageService {
+export class NextDelegatingStorageService extends Disposable implements INextStorage2Service {
 	_serviceBrand: any;
 
 	private _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>());
 	get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; }
 
 	constructor(
-		@INextStorageService private nextStorageService: NextStorageService,
+		@INextStorage2Service private nextStorage2Service: NextStorage2Service,
 		@IStorageService private storageService: IStorageService,
 		@ILogService private logService: ILogService,
 		@IEnvironmentService environmentService: IEnvironmentService
 	) {
 		super();
 
-		this._register(this.nextStorageService.onDidChangeStorage(e => this._onDidChangeStorage.fire(e)));
+		this._register(this.nextStorage2Service.onDidChangeStorage(e => this._onDidChangeStorage.fire(e)));
 	}
 
 	get(key: string, scope: StorageScope, fallbackValue?: any): string {
-		const dbValue = this.nextStorageService.get(key, scope, fallbackValue);
+		const dbValue = this.nextStorage2Service.get(key, scope, fallbackValue);
 		const localStorageValue = this.storageService.get(key, this.convertScope(scope), fallbackValue);
 
 		this.assertStorageValue(key, scope, dbValue, localStorageValue);
@@ -111,7 +111,7 @@ export class NextDelegatingStorageService extends Disposable implements INextSto
 	}
 
 	getBoolean(key: string, scope: StorageScope, fallbackValue?: boolean): boolean {
-		const dbValue = this.nextStorageService.getBoolean(key, scope, fallbackValue);
+		const dbValue = this.nextStorage2Service.getBoolean(key, scope, fallbackValue);
 		const localStorageValue = this.storageService.getBoolean(key, this.convertScope(scope), fallbackValue);
 
 		this.assertStorageValue(key, scope, dbValue, localStorageValue);
@@ -120,7 +120,7 @@ export class NextDelegatingStorageService extends Disposable implements INextSto
 	}
 
 	getInteger(key: string, scope: StorageScope, fallbackValue?: number): number {
-		const dbValue = this.nextStorageService.getInteger(key, scope, fallbackValue);
+		const dbValue = this.nextStorage2Service.getInteger(key, scope, fallbackValue);
 		const localStorageValue = this.storageService.getInteger(key, this.convertScope(scope), fallbackValue);
 
 		this.assertStorageValue(key, scope, dbValue, localStorageValue);
@@ -137,17 +137,17 @@ export class NextDelegatingStorageService extends Disposable implements INextSto
 	set(key: string, value: any, scope: StorageScope): Promise<void> {
 		this.storageService.store(key, value, this.convertScope(scope));
 
-		return this.nextStorageService.set(key, value, scope);
+		return this.nextStorage2Service.set(key, value, scope);
 	}
 
 	delete(key: string, scope: StorageScope): Promise<void> {
 		this.storageService.remove(key, this.convertScope(scope));
 
-		return this.nextStorageService.delete(key, scope);
+		return this.nextStorage2Service.delete(key, scope);
 	}
 
 	close(): Promise<void> {
-		return this.nextStorageService.close();
+		return this.nextStorage2Service.close();
 	}
 
 	private convertScope(scope: StorageScope): LocalStorageScope {

src/vs/workbench/electron-browser/main.ts

@@ -36,7 +36,7 @@ import { IWorkspacesService, ISingleFolderWorkspaceIdentifier } from 'vs/platfor
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import * as fs from 'fs';
 import { ConsoleLogService, MultiplexLogService, ILogService } from 'vs/platform/log/common/log';
-import { NextStorageService, NextDelegatingStorageService } from 'vs/platform/storage2/node/nextStorageService';
+import { NextStorage2Service, NextDelegatingStorageService } from 'vs/platform/storage2/node/nextStorage2Service';
 import { IssueChannelClient } from 'vs/platform/issue/node/issueIpc';
 import { IIssueService } from 'vs/platform/issue/common/issue';
 import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/node/logIpc';
@@ -100,11 +100,11 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
 
 	return Promise.all([
 		createAndInitializeWorkspaceService(configuration, environmentService),
-		createNextStorageService(environmentService, logService)
+		createNextStorage2Service(environmentService, logService)
 	]).then(services => {
 		const workspaceService = services[0];
 		const storageService = createStorageService(workspaceService, environmentService);
-		const nextStorageService = new NextDelegatingStorageService(services[1], storageService, logService, environmentService);
+		const nextStorage2Service = new NextDelegatingStorageService(services[1], storageService, logService, environmentService);
 
 		return domContentLoaded().then(() => {
 			perf.mark('willStartWorkbench');
@@ -116,12 +116,12 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
 				environmentService,
 				logService,
 				storageService,
-				nextStorageService
+				nextStorage2Service
 			}, mainServices, mainProcessClient, configuration);
 
 			// Gracefully Shutdown Storage
 			shell.onShutdown(event => {
-				event.join(nextStorageService.close());
+				event.join(nextStorage2Service.close());
 			});
 
 			// Open Shell
@@ -166,15 +166,15 @@ function validateFolderUri(folderUri: ISingleFolderWorkspaceIdentifier, verbose:
 	});
 }
 
-function createNextStorageService(environmentService: IEnvironmentService, logService: ILogService): Promise<NextStorageService> {
-	perf.mark('willCreateNextStorageService');
+function createNextStorage2Service(environmentService: IEnvironmentService, logService: ILogService): Promise<NextStorage2Service> {
+	perf.mark('willCreateNextStorage2Service');
 
-	const nextStorageService = new NextStorageService(':memory:', logService, environmentService);
+	const nextStorage2Service = new NextStorage2Service(':memory:', logService, environmentService);
 
-	return nextStorageService.init().then(() => {
-		perf.mark('didCreateNextStorageService');
+	return nextStorage2Service.init().then(() => {
+		perf.mark('didCreateNextStorage2Service');
 
-		return nextStorageService;
+		return nextStorage2Service;
 	});
 }
 

src/vs/workbench/electron-browser/shell.ts

@@ -75,7 +75,7 @@ import { IBroadcastService, BroadcastService } from 'vs/platform/broadcast/elect
 import { HashService } from 'vs/workbench/services/hash/node/hashService';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { ILogService } from 'vs/platform/log/common/log';
-import { INextStorageService } from 'vs/platform/storage2/common/storage2';
+import { INextStorage2Service } from 'vs/platform/storage2/common/storage2';
 import { Event, Emitter } from 'vs/base/common/event';
 import { WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
 import { stat } from 'fs';
@@ -110,7 +110,7 @@ export interface ICoreServices {
 	environmentService: IEnvironmentService;
 	logService: ILogService;
 	storageService: IStorageService;
-	nextStorageService: INextStorageService;
+	nextStorage2Service: INextStorage2Service;
 }
 
 /**
@@ -123,7 +123,7 @@ export class WorkbenchShell extends Disposable {
 	get onShutdown(): Event<ShutdownEvent> { return this._onShutdown.event; }
 
 	private storageService: IStorageService;
-	private nextStorageService: INextStorageService;
+	private nextStorage2Service: INextStorage2Service;
 	private environmentService: IEnvironmentService;
 	private logService: ILogService;
 	private configurationService: IConfigurationService;
@@ -154,7 +154,7 @@ export class WorkbenchShell extends Disposable {
 		this.environmentService = coreServices.environmentService;
 		this.logService = coreServices.logService;
 		this.storageService = coreServices.storageService;
-		this.nextStorageService = coreServices.nextStorageService;
+		this.nextStorage2Service = coreServices.nextStorage2Service;
 
 		this.mainProcessServices = mainProcessServices;
 
@@ -335,7 +335,7 @@ export class WorkbenchShell extends Disposable {
 		serviceCollection.set(ILabelService, new SyncDescriptor(LabelService));
 		serviceCollection.set(ILogService, this._register(this.logService));
 		serviceCollection.set(IStorageService, this.storageService);
-		serviceCollection.set(INextStorageService, this.nextStorageService);
+		serviceCollection.set(INextStorage2Service, this.nextStorage2Service);
 
 		this.mainProcessServices.forEach((serviceIdentifier, serviceInstance) => {
 			serviceCollection.set(serviceIdentifier, serviceInstance);