Merge from master

src/sqltest/stubs/connectionDialogTestService.ts

@@ -24,4 +24,9 @@ export class ConnectionDialogTestService implements IConnectionDialogService {
 		params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): TPromise<IConnectionProfile> {
 		return TPromise.as(undefined);
 	}
-}
+
+	public openDialogAndWaitButDontConnect(connectionManagementService: IConnectionManagementService,
+		params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): TPromise<IConnectionProfile> {
+		return TPromise.as(undefined);
+	}
+}

src/sqltest/stubs/connectionManagementService.test.ts

@@ -266,6 +266,10 @@ export class TestConnectionManagementService implements IConnectionManagementSer
 		return undefined;
 	}
 
+	providerRegistered(providerId: string): boolean {
+		return undefined;
+	}
+
 	getConnectionProfileById(profileId: string): IConnectionProfile {
 		return undefined;
 	}

src/sqltest/stubs/storageTestService.ts

@@ -4,11 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { IStorageService, StorageScope, IWorkspaceStorageChangeEvent, IWillSaveStateEvent } from 'vs/platform/storage/common/storage';
+import { Event } from 'vs/base/common/event';
 
 export class StorageTestService implements IStorageService {
 	_serviceBrand: any;
 
+	/**
+	 * Emitted whenever data is updated or deleted.
+	 */
+	readonly onDidChangeStorage: Event<IWorkspaceStorageChangeEvent>;
+
+	/**
+	 * Emitted when the storage is about to persist. This is the right time
+	 * to persist data to ensure it is stored before the application shuts
+	 * down.
+	 *
+	 * The will save state event allows to optionally ask for the reason of
+	 * saving the state, e.g. to find out if the state is saved due to a
+	 * shutdown.
+	 */
+	readonly onWillSaveState: Event<IWillSaveStateEvent>;
+
 	/**
 	 * Store a string value under the given key to local storage.
 	 *

src/sqltest/stubs/themeTestService.ts

@@ -5,10 +5,11 @@
 
 'use strict';
 
-import { IThemeService, ITheme, IThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { IThemeService, ITheme, IThemingParticipant, IIconTheme } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
+import { Event } from 'vs/base/common/event';
 
 export class TestTheme implements ITheme {
 	selector: string;
@@ -32,6 +33,7 @@ const testTheme = new TestTheme();
 export class TestThemeService implements IThemeService {
 
 	_serviceBrand: any;
+	onIconThemeChange = Event.None;
 
 	getTheme(): ITheme {
 		return testTheme;
@@ -40,4 +42,8 @@ export class TestThemeService implements IThemeService {
 	onThemeChange(participant: IThemingParticipant): IDisposable {
 		return { dispose: () => { } };
 	}
+
+	getIconTheme(): IIconTheme {
+		return undefined;
+	}
 }

src/sqltest/stubs/workbenchEditorTestService.ts

@@ -106,4 +106,8 @@ export class WorkbenchEditorTestService implements IEditorService {
 	invokeWithinEditorContext<T>(fn: (accessor: ServicesAccessor) => T): T {
 		return undefined;
 	}
+
+	getOpened(editor: IResourceInput | IUntitledResourceInput, group?: IEditorGroup | GroupIdentifier): IEditorInput {
+		return undefined;
+	}
 }

src/sqltest/stubs/workspaceConfigurationTestService.ts

@@ -7,7 +7,6 @@
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IConfigurationData, IConfigurationOverrides, ConfigurationTarget, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { Event } from 'vs/base/common/event';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 
@@ -19,7 +18,7 @@ export class WorkspaceConfigurationTestService implements IWorkspaceConfiguratio
 	getValue<T>(overrides: IConfigurationOverrides): T;
 	getValue<T>(section: string, overrides: IConfigurationOverrides): T;
 	getValue(arg1?: any, arg2?: any): any {
-		return TPromise.as(null);
+		return Promise.resolve(null);
 	}
 
 	onDidChangeConfiguration: Event<IConfigurationChangeEvent>;
@@ -31,20 +30,20 @@ export class WorkspaceConfigurationTestService implements IWorkspaceConfiguratio
 	getConfiguration<T>(overrides: IConfigurationOverrides): T;
 	getConfiguration<T>(section: string, overrides: IConfigurationOverrides): T;
 	getConfiguration(arg1?: any, arg2?: any): any {
-		return TPromise.as(null);
+		return Promise.resolve(null);
 	}
 
-	updateValue(key: string, value: any): TPromise<void>;
-	updateValue(key: string, value: any, overrides: IConfigurationOverrides): TPromise<void>;
-	updateValue(key: string, value: any, target: ConfigurationTarget): TPromise<void>;
-	updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget): TPromise<void>;
-	updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget, donotNotifyError: boolean): TPromise<void>;
-	updateValue(key: string, value: any, arg3?: any, arg4?: any, donotNotifyError?: any): TPromise<void> {
-		return TPromise.as(null);
+	updateValue(key: string, value: any): Promise<void>;
+	updateValue(key: string, value: any, overrides: IConfigurationOverrides): Promise<void>;
+	updateValue(key: string, value: any, target: ConfigurationTarget): Promise<void>;
+	updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget): Promise<void>;
+	updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget, donotNotifyError: boolean): Promise<void>;
+	updateValue(key: string, value: any, arg3?: any, arg4?: any, donotNotifyError?: any): Promise<void> {
+		return Promise.resolve(null);
 	}
 
-	reloadConfiguration(folder?: IWorkspaceFolder, key?: string): TPromise<void> {
-		return TPromise.as(null);
+	reloadConfiguration(folder?: IWorkspaceFolder, key?: string): Promise<void> {
+		return Promise.resolve(null);
 	}
 
 	inspect<T>(key: string): {