Merge branch 'master' into release/0.25

* Add cursor snippet

* Workaround to avoid issue #480

Remove SELECT and tab to the place for custom code

.vscode/launch.json

@@ -95,7 +95,7 @@
 			"name": "Unit Tests",
 			"protocol": "inspector",
 			"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-			"runtimeExecutable": "${workspaceFolder}/.build/electron/sqlops.app/Contents/MacOS/Electron",
+			"runtimeExecutable": "${workspaceFolder}/.build/electron/SQL Operations Studio.app/Contents/MacOS/Electron",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/.build/electron/sqlops.exe"
 			},

CHANGELOG.md

@@ -0,0 +1,62 @@
+# Change Log
+
+## Version 0.25.2
+* Release date: January 17, 2017
+* Release status: Public Preview
+
+## What's new in this version
+The January release focuses on addressing a few of the top upvoted feature suggestions, as well as fixing high-priority bugs.  This release period coincides with holiday vacations, so the churn in this release is
+relatively scoped.
+
+Here's some of the highlights in the January release.
+
+* Tab-coloring based on Server Group
+* Saved Server connections are available in Connection Dialog
+* Enable HotExit feature
+* Fix broken Run Current Query command
+* Fix drag-and-drop breaking scripting bug
+* Fix incorrect pinned Start Menu icon
+* Fix missing Azure Account branding icon
+* Change "Server name" to "Server" in Connection Dialog
+
+## Contributions and "thank you"
+We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
+
+* alextercete for `Fix "No extension gallery service configured" error (#427)`
+
+## Version 0.24.1
+* Release date: December 19, 2017
+* Release status: Public Preview
+
+## What's new in this version
+* Azure Integration with Create Firewall Rule
+* Windows Setup, Linux DEB and Linux RPM installation packages
+* Manage Dashboard visual layout editor
+* Script As Alter and Script As Execute commands
+* Integrate VS Code 1.18.1 editor platform
+* Enable Sideloading of VSIX Extension files
+* Support "GO N" batch iteration syntax
+* "Run Current Query with Actual Plan" command
+* Delete Recent Connection command in Connection Dialog
+* Performance fixes for Object Explorer expansion and Scripting sprocs
+* Fix IntelliSense settings namespace to be `mssql.*`
+* Only show `Disconnect` menu item if server is connected
+* Several snippet and default widget improvements
+* Improve Kerberos connection failure error message
+* Add command to hide query results window after running query
+* Retain cursor line positon when switching document tabs
+* Keep cursor focus in editor window after executing query
+* Support shortcuts to execute common queries like sp_who or sp_help
+* Fix tab order behavior when using keyboard to navigate dialog controls
+* Improved chart axis and label behavior
+* Allow expanding databases not in certain non-Online states
+* Connection Dialog selects most common default authentication method based on platform
+
+## Contributions and "thank you"
+We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
+* mwiedemeyer for `Fix #58: Default sort order for DB size widget (#111)`
+* AlexTroshkin for `Show disconnect in context menu only when connectionProfile connected (#150)`
+* AlexTroshkin for `Fix #138: Invalid syntax color highlighting (identity not highlighting) (#140))`
+* stebet for `Fix #153: Fixing sql snippets that failed on a DB with case-sensitive collation. (#152)`
+* SebastianPfliegel `Remove sqlExtensionHelp (#312)`
+* olljanat for `Implemented npm version check (#314)`

LICENSE.txt

@@ -2,21 +2,23 @@ MICROSOFT SOFTWARE LICENSE TERMS
 
 MICROSOFT SQL OPERATIONS STUDIO
 
-Microsoft Corporation (“Microsoft”) grants you a nonexclusive, perpetual,
+Microsoft Corporation ("Microsoft") grants you a nonexclusive, perpetual,
-royalty-free right to use, copy, and modify the software code provided by us
+royalty-free right to use, copy, and modify the software code provided by us
 ("Software Code"). You may not sublicense the Software Code or any use of it 
 (except to your affiliates and to vendors to perform work on your behalf) 
 through distribution, network access, service agreement, lease, rental, or 
 otherwise. Unless applicable law gives you more rights, Microsoft reserves all 
 other rights not expressly granted herein, whether by implication, estoppel or 
-otherwise. 
+otherwise.
- 
+
-THE SOFTWARE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE CODE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL MICROSOFT OR ITS
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
-LICENSORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+AND NONINFRINGEMENT. IN NO EVENT SHALL MICROSOFT OR ITS LICENSORS
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-THE USE OF THE SAMPLE CODE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
+SAMPLE CODE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -2,20 +2,25 @@
 
 SQL Operations Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux.
 
-**Download SQL Operations Studio Public Preview 1**
+**Download SQL Operations Studio December Public Preview**
 
 Platform | Link
 -- | --
-Windows | https://go.microsoft.com/fwlink/?linkid=862648
+Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=865305
-macOS | https://go.microsoft.com/fwlink/?linkid=862647
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=865304
-Linux | https://go.microsoft.com/fwlink/?linkid=862646
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=865306
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=865307
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=865308
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=865309
 
 Go to our [download page](https://aka.ms/sqlopsstudio) for more specific instructions.
 
+Try out the latest insiders build from `master` at https://github.com/Microsoft/sqlopsstudio/releases.
+
 **Feature Highlights**
 
 - Cross-Platform DB management for Windows, macOS and Linux with simple XCopy deployment
-- SQL Server Connection Management with Connection Dialog, Server Groups, and Registered Servers
+- SQL Server Connection Management with Connection Dialog, Server Groups, Azure Integration and Registered Servers
 - Object Explorer supporting schema browsing and contextual command execution
 - T-SQL Query Editor with advanced coding features such as autosuggestions, error diagnostics, tooltips, formatting and peek definition
 - Query Results Viewer with advanced data grid supporting large result sets, export to JSON\CSV\Excel, query plan and charting
@@ -23,7 +28,7 @@ Go to our [download page](https://aka.ms/sqlopsstudio) for more specific instruc
 - Visual Data Editor that enables direct row insertion, update and deletion into tables
 - Backup and Restore dialogs that enables advanced customization and remote filesystem browsing, configured tasks can be executed or scripted
 - Task History window to view current task execution status, completion results with error messages and task T-SQL scripting
-- Scripting support to generate CREATE, SELECT and DROP statements for database objects
+- Scripting support to generate CREATE, SELECT, ALTER and DROP statements for database objects
 - Workspaces with full Git integration and Find In Files support to managing T-SQL script libraries
 - Modern light-weight shell with theming, user settings, full screen support, integrated terminal and numerous other features
 

build/gulpfile.vscode.js

@@ -157,7 +157,7 @@ const config = {
 	version: packageJson.electronVersion,
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
-	copyright: 'Copyright (C) 2017 Microsoft. All rights reserved',
+	copyright: 'Copyright (C) 2018 Microsoft. All rights reserved',
 	darwinIcon: 'resources/darwin/code.icns',
 	darwinBundleIdentifier: product.darwinBundleIdentifier,
 	darwinApplicationCategoryType: 'public.app-category.developer-tools',
@@ -620,8 +620,8 @@ gulp.task('generate-vscode-configuration', () => {
 // {{SQL CARBON EDIT}}
 // Install service locally before building carbon
 
-function installService(extObj) {
+function installService(extObj, path) {
-	var installer = new serviceInstaller.ServiceInstaller(extObj, true);
+	var installer = new serviceInstaller.ServiceInstaller(extObj, path);
 	installer.getServiceInstallDirectoryRoot().then(serviceInstallFolder => {
 			console.log('Cleaning up the install folder: ' + serviceInstallFolder);
 			del(serviceInstallFolder + '/*').then(() => {
@@ -639,7 +639,8 @@ function installService(extObj) {
 gulp.task('install-sqltoolsservice', () => {
 	var mssqlExt = require('../extensions/mssql/client/out/models/constants');
 	var extObj = new mssqlExt.Constants();
-    return installService(extObj);
+	var path = '../extensions/mssql/client/out/config.json';
+    return installService(extObj, path);
 });
 
 

build/npm/postinstall.js

@@ -41,7 +41,8 @@ const extensions = [
 	'extension-editing',
 	'markdown',
 	'merge-conflict',
-	'insights-default'
+	'insights-default',
+	'account-provider-azure'
 ];
 
 extensions.forEach(extension => npmInstall(`extensions/${extension}`));

extensions-modules/.npmignore

@@ -0,0 +1,9 @@
+.vscode/
+lib/test/
+lib/**/*.map
+src/
+test/
+.eslintrc
+.gitignore
+gulpfile.js
+tsd.json

extensions-modules/src/configurations/config.ts

@@ -6,8 +6,8 @@
 'use strict';
 const fs = require('fs');
 import * as path from 'path';
-import {IConfig} from '../languageservice/interfaces';
+import { IConfig } from '../languageservice/interfaces';
-import * as SharedConstants from '../models/constants';
+import { Constants } from '../models/constants';
 
 /*
 * Config class handles getting values from config.json.
@@ -18,7 +18,7 @@ export default class Config implements IConfig {
     private _extensionConfigSectionName: string = undefined;
     private _fromBuild: boolean = undefined;
 
-     constructor(extensionConfigSectionName: string, fromBuild?: boolean) {
+     constructor(extensionConfigSectionName: string, private path: string, fromBuild?: boolean) {
         this._extensionConfigSectionName = extensionConfigSectionName;
         this._fromBuild = fromBuild;
      }
@@ -31,24 +31,24 @@ export default class Config implements IConfig {
     }
 
     public getDownloadUrl(): string {
-        return this.getConfigValue(SharedConstants.downloadUrlConfigKey);
+        return this.getConfigValue(Constants.downloadUrlConfigKey);
     }
 
     public getInstallDirectory(): string {
-        return this.getConfigValue(SharedConstants.installDirConfigKey);
+        return this.getConfigValue(Constants.installDirConfigKey);
     }
 
     public getExecutableFiles(): string[] {
-        return this.getConfigValue(SharedConstants.executableFilesConfigKey);
+        return this.getConfigValue(Constants.executableFilesConfigKey);
     }
 
     public getPackageVersion(): string {
-        return this.getConfigValue(SharedConstants.versionConfigKey);
+        return this.getConfigValue(Constants.versionConfigKey);
     }
 
     public getConfigValue(configKey: string): any {
         let json = this.configJsonContent;
-        let toolsConfig = json[SharedConstants.serviceConfigKey];
+        let toolsConfig = json[Constants.serviceConfigKey];
         let configValue: string = undefined;
         if (toolsConfig !== undefined) {
             configValue = toolsConfig[configKey];
@@ -82,7 +82,7 @@ export default class Config implements IConfig {
             configContent = fs.readFileSync(path.join(__dirname, remainingPath));
         }
         else {
-            configContent = fs.readFileSync(path.join(__dirname, '../../../../client/out/config.json'));
+            configContent = fs.readFileSync(this.path);
         }
         return JSON.parse(configContent);
     }

extensions-modules/src/configurations/extConfig.ts

@@ -7,8 +7,8 @@
 
 import Config from './config';
 import { workspace, WorkspaceConfiguration } from 'vscode';
-import {IConfig} from '../languageservice/interfaces';
+import { IConfig } from '../languageservice/interfaces';
-import * as Constants from '../models/constants';
+import { Constants } from '../models/constants';
 
 /*
 * ExtConfig class handles getting values from workspace config or config.json.
@@ -16,10 +16,11 @@ import * as Constants from '../models/constants';
 export default class ExtConfig implements IConfig {
 
     constructor(private _extensionConfigSectionName: string, private _config?: IConfig,
+                path?: string,
                 private _extensionConfig?: WorkspaceConfiguration,
                 private _workspaceConfig?: WorkspaceConfiguration) {
         if (this._config === undefined) {
-            this._config = new Config(_extensionConfigSectionName);
+            this._config = new Config(_extensionConfigSectionName, path);
         }
         if (this._extensionConfig === undefined) {
             this._extensionConfig = workspace.getConfiguration(_extensionConfigSectionName);

extensions-modules/src/controllers/vscodeWrapper.ts

@@ -4,11 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import vscode = require('vscode');
-import {IExtensionConstants} from '../models/contracts/contracts';
+import { IExtensionConstants } from '../models/contracts/contracts';
 
-export import TextEditor = vscode.TextEditor;
+export class VscodeWrapper {
-
-export default class VscodeWrapper {
     private _extensionConstants: IExtensionConstants;
     /**
      * Output channel for logging. Shared among all instances.

extensions-modules/src/languageservice/decompressProvider.ts

@@ -5,8 +5,8 @@
 
 'use strict';
 
-import {IDecompressProvider, IPackage} from './interfaces';
+import { IDecompressProvider, IPackage } from './interfaces';
-import  {ILogger} from '../models/interfaces';
+import  { ILogger } from '../models/interfaces';
 const decompress = require('decompress');
 
 export default class DecompressProvider implements IDecompressProvider {

extensions-modules/src/languageservice/httpClient.ts

@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 'use strict';
-import {IPackage, IStatusView, PackageError, IHttpClient} from './interfaces';
+import { IPackage, IStatusView, PackageError, IHttpClient } from './interfaces';
-import  {ILogger} from '../models/interfaces';
+import  { ILogger } from '../models/interfaces';
-import {parse as parseUrl, Url} from 'url';
+import { parse as parseUrl, Url } from 'url';
 import * as https from 'https';
 import * as http from 'http';
-import {getProxyAgent} from './proxy';
+import { getProxyAgent } from './proxy';
 
-let fs = require('fs');
+const fs = require('fs');
 
 /*
  * Http client class to handle downloading files using http or https urls

extensions-modules/src/languageservice/interfaces.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as tmp from 'tmp';
-import  {ILogger} from '../models/interfaces';
+import { ILogger } from '../models/interfaces';
 
 export interface IStatusView {
     installingService(): void;

extensions-modules/src/languageservice/proxy.ts

@@ -6,8 +6,8 @@
 'use strict';
 
 import { Url, parse as parseUrl } from 'url';
-let HttpProxyAgent = require('http-proxy-agent');
+const HttpProxyAgent = require('http-proxy-agent');
-let HttpsProxyAgent = require('https-proxy-agent');
+const HttpsProxyAgent = require('https-proxy-agent');
 
 function getSystemProxyURL(requestURL: Url): string {
     if (requestURL.protocol === 'http:') {

extensions-modules/src/languageservice/server.ts

@@ -6,10 +6,10 @@
 'use strict';
 
 import * as path from 'path';
-import {Runtime} from '../models/platform';
+import { Runtime } from '../models/platform';
 import ServiceDownloadProvider from './serviceDownloadProvider';
-import {IConfig, IStatusView} from './interfaces';
+import { IConfig, IStatusView } from './interfaces';
-let fs = require('fs-extra-promise');
+const fs = require('fs-extra-promise');
 
 
 /*

extensions-modules/src/languageservice/serverStatus.ts

@@ -5,10 +5,10 @@
 
 'use strict';
 
-import {IStatusView} from './interfaces';
+import { IStatusView } from './interfaces';
 import vscode = require('vscode');
-import {IExtensionConstants} from '../models/contracts/contracts';
+import { IExtensionConstants } from '../models/contracts/contracts';
-import * as Constants from '../models/constants';
+import { Constants } from '../models/constants';
 
 /*
 * The status class which includes the service initialization result.

extensions-modules/src/languageservice/serviceClient.ts

@@ -1,38 +1,36 @@
-/* --------------------------------------------------------------------------------------------
+/*---------------------------------------------------------------------------------------------
  *  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 { ExtensionContext, workspace, window, OutputChannel, languages } from 'vscode';
-import { LanguageClient, LanguageClientOptions, ServerOptions,
+import {
+	LanguageClient, LanguageClientOptions, ServerOptions,
 	TransportKind, RequestType, NotificationType, NotificationHandler,
-    ErrorAction, CloseAction } from 'dataprotocol-client';
+	ErrorAction, CloseAction
+} from 'dataprotocol-client';
 
-import VscodeWrapper from '../controllers/vscodeWrapper';
+import { VscodeWrapper } from '../controllers/vscodeWrapper';
-import Telemetry from '../models/telemetry';
+import { Telemetry } from '../models/telemetry';
-import * as Utils from '../models/utils';
+import { Utils } from '../models/utils';
-import {VersionRequest, IExtensionConstants} from '../models/contracts/contracts';
+import { VersionRequest, IExtensionConstants } from '../models/contracts/contracts';
-import {Logger} from '../models/logger';
+import { Logger } from '../models/logger';
-import Constants = require('../models/constants');
-import {ILanguageClientHelper} from '../models/contracts/languageService';
 import ServerProvider from './server';
 import ServiceDownloadProvider from './serviceDownloadProvider';
 import DecompressProvider from './decompressProvider';
 import HttpClient from './httpClient';
 import ExtConfig from '../configurations/extConfig';
-import {PlatformInformation, Runtime} from '../models/platform';
+import { PlatformInformation, Runtime } from '../models/platform';
-import {ServerInitializationResult, ServerStatusView} from './serverStatus';
+import { ServerInitializationResult, ServerStatusView } from './serverStatus';
 import StatusView from '../views/statusView';
 import * as LanguageServiceContracts from '../models/contracts/languageService';
-import * as SharedConstants from '../models/constants';
+import { Constants } from '../models/constants';
-import * as utils from '../models/utils';
-var path = require('path');
 import ServiceStatus from './serviceStatus';
 
-let opener = require('opener');
+const opener = require('opener');
+const path = require('path');
 let _channel: OutputChannel = undefined;
-const fs = require('fs-extra');
 
 /**
  * @interface IMessage
@@ -69,8 +67,8 @@ class LanguageClientErrorHandler {
 		Telemetry.sendTelemetryEvent(extensionConstants.serviceName + 'Crash');
 		this.vscodeWrapper.showErrorMessage(
 			extensionConstants.serviceCrashMessage,
-          SharedConstants.serviceCrashButton).then(action => {
+			Constants.serviceCrashButton).then(action => {
-            if (action && action === SharedConstants.serviceCrashButton) {
+				if (action && action === Constants.serviceCrashButton) {
 					opener(extensionConstants.serviceCrashLink);
 				}
 			});
@@ -111,7 +109,7 @@ class LanguageClientErrorHandler {
 }
 
 // The Service Client class handles communication with the VS Code LanguageClient
-export default class SqlToolsServiceClient {
+export class SqlToolsServiceClient {
 	// singleton instance
 	private static _instance: SqlToolsServiceClient = undefined;
 
@@ -126,13 +124,13 @@ export default class SqlToolsServiceClient {
 		Telemetry.getRuntimeId = this._constants.getRuntimeId;
 	}
 
-    private static _helper: ILanguageClientHelper = undefined;
+	private static _helper: LanguageServiceContracts.ILanguageClientHelper = undefined;
 
-    public static get helper(): ILanguageClientHelper {
+	public static get helper(): LanguageServiceContracts.ILanguageClientHelper {
 		return this._helper;
 	}
 
-    public static set helper(helperObject: ILanguageClientHelper) {
+	public static set helper(helperObject: LanguageServiceContracts.ILanguageClientHelper) {
 		this._helper = helperObject;
 	}
 
@@ -170,10 +168,10 @@ export default class SqlToolsServiceClient {
 	}
 
 	// gets or creates the singleton service client instance
-    public static get instance(): SqlToolsServiceClient {
+	public static getInstance(path: string): SqlToolsServiceClient {
 		if (this._instance === undefined) {
 			let constants = this._constants;
-            let config = new ExtConfig(constants.extensionConfigSectionName);
+			let config = new ExtConfig(constants.extensionConfigSectionName, undefined, path);
 			_channel = window.createOutputChannel(constants.serviceInitializingOutputChannelName);
 			let logger = new Logger(text => _channel.append(text), constants);
 			let serverStatusView = new ServerStatusView(constants);
@@ -196,12 +194,12 @@ export default class SqlToolsServiceClient {
 		return PlatformInformation.getCurrent(SqlToolsServiceClient._constants.getRuntimeId, SqlToolsServiceClient._constants.extensionName).then(platformInfo => {
 			return this.initializeForPlatform(platformInfo, context);
 		}).catch(err => {
-            this._vscodeWrapper.showErrorMessage(err)
+			this._vscodeWrapper.showErrorMessage(err);
 		});
 	}
 
 	public initializeForPlatform(platformInfo: PlatformInformation, context: ExtensionContext): Promise<ServerInitializationResult> {
-         return new Promise<ServerInitializationResult>( (resolve, reject) => {
+		return new Promise<ServerInitializationResult>((resolve, reject) => {
 			this._logger.appendLine(SqlToolsServiceClient._constants.commandsNotAvailableWhileInstallingTheService);
 			this._logger.appendLine();
 			this._logger.append(`Platform: ${platformInfo.toString()}`);
@@ -225,7 +223,7 @@ export default class SqlToolsServiceClient {
 						});
 				}
 
-                Telemetry.sendTelemetryEvent('UnsupportedPlatform', {platform: platformInfo.toString()} );
+				Telemetry.sendTelemetryEvent('UnsupportedPlatform', { platform: platformInfo.toString() });
 			}
 
 			if (platformInfo.runtimeId) {
@@ -242,7 +240,7 @@ export default class SqlToolsServiceClient {
 						_channel.show();
 					}
 					let installationStartTime = Date.now();
-                    this._server.downloadServerFiles(platformInfo.runtimeId).then ( installedServerPath => {
+					this._server.downloadServerFiles(platformInfo.runtimeId).then(installedServerPath => {
 						this._installationTime = Date.now() - installationStartTime;
 						this.initializeLanguageClient(installedServerPath, context, platformInfo.runtimeId);
 						resolve(new ServerInitializationResult(true, true, installedServerPath));
@@ -321,8 +319,8 @@ export default class SqlToolsServiceClient {
 		}
 	}
 
-    public createClient(context: ExtensionContext, runtimeId: Runtime, languageClientHelper: ILanguageClientHelper, executableFiles: string[]): Promise<LanguageClient> {
+	public createClient(context: ExtensionContext, runtimeId: Runtime, languageClientHelper: LanguageServiceContracts.ILanguageClientHelper, executableFiles: string[]): Promise<LanguageClient> {
-        return new Promise<LanguageClient>( (resolve, reject) => {
+		return new Promise<LanguageClient>((resolve, reject) => {
 			let client: LanguageClient;
 			this._server.findServerPath(this.installDirectory, executableFiles).then(serverPath => {
 				if (serverPath === undefined) {
@@ -383,7 +381,7 @@ export default class SqlToolsServiceClient {
 			}
 		}
 		serverArgs.push('--log-dir');
-        let logFileLocation = path.join(utils.getDefaultLogLocation(), SqlToolsServiceClient.constants.extensionName);
+		let logFileLocation = path.join(Utils.getDefaultLogLocation(), SqlToolsServiceClient.constants.extensionName);
 		serverArgs.push(logFileLocation);
 
 		// run the service host using dotnet.exe from the path
@@ -406,7 +404,7 @@ export default class SqlToolsServiceClient {
 		this._serviceStatus.showServiceLoading();
 		// cache the client instance for later use
 		let client = new LanguageClient(SqlToolsServiceClient._constants.serviceName, serverOptions, clientOptions);
-        client.onReady().then( () => {
+		client.onReady().then(() => {
 			this.checkServiceCompatibility();
 			this._serviceStatus.showServiceLoaded();
 			client.onNotification(LanguageServiceContracts.TelemetryNotification.type, this.handleLanguageServiceTelemetryNotification());

extensions-modules/src/languageservice/serviceDownloadProvider.ts

@@ -9,11 +9,11 @@ import { Runtime, getRuntimeDisplayName } from '../models/platform';
 import * as path from 'path';
 import { IConfig, IStatusView, IPackage, PackageError, IHttpClient, IDecompressProvider } from './interfaces';
 import { ILogger } from '../models/interfaces';
-import Constants = require('../models/constants');
+import { Constants } from '../models/constants';
 import * as tmp from 'tmp';
-import {IExtensionConstants} from '../models/contracts/contracts';
+import { IExtensionConstants } from '../models/contracts/contracts';
 
-let fse = require('fs-extra');
+const fse = require('fs-extra');
 
 /*
 * Service Download Provider class which handles downloading the SQL Tools service.
@@ -100,10 +100,9 @@ export default class ServiceDownloadProvider {
 			basePath = installDirFromConfig;
 		} else if (this._fromBuild) {
 			basePath = path.join(__dirname, '../../../../../extensions/' + extensionConfigSectionName + '/' + installDirFromConfig);
-		}
+		} else {
-		else {
 			// The path from config is relative to the out folder
-			basePath = path.join(__dirname, '../../../../' + installDirFromConfig);
+			basePath = path.join(__dirname, '../../../../' + extensionConfigSectionName + '/' +  installDirFromConfig);
 		}
 		return basePath;
 	}

extensions-modules/src/languageservice/serviceInstallerUtil.ts

@@ -61,9 +61,9 @@ export class ServiceInstaller {
 	private _serverProvider = undefined;
 	private _extensionConstants = undefined;
 
-	constructor(extensionConstants: IExtensionConstants) {
+	constructor(extensionConstants: IExtensionConstants, path?: string) {
 		this._extensionConstants = extensionConstants;
-		this._config = new Config(extensionConstants.extensionConfigSectionName, true);
+		this._config = new Config(extensionConstants.extensionConfigSectionName, path, true);
 		this._downloadProvider = new ServiceDownloadProvider(this._config, this._logger, this._statusView, this._httpClient, this._decompressProvider, extensionConstants, true);
 		this._serverProvider = new ServerProvider(this._downloadProvider, this._config, this._statusView, extensionConstants.extensionConfigSectionName);
 	}

extensions-modules/src/languageservice/serviceStatus.ts

@@ -1,7 +1,7 @@
-/* --------------------------------------------------------------------------------------------
+/*---------------------------------------------------------------------------------------------
  *  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 vscode = require('vscode');

extensions-modules/src/main.ts

@@ -1,13 +1,15 @@
-import SqlToolsServiceClient from './languageservice/serviceClient';
+/*---------------------------------------------------------------------------------------------
-import ServerProvider from './languageservice/server';
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-import VscodeWrapper from './controllers/vscodeWrapper';
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
-import * as SharedConstants from './models/constants';
+ *--------------------------------------------------------------------------------------------*/
-import * as Utils from './models/utils';
+export * from './controllers/vscodeWrapper';
+export * from './models/constants';
+export * from './models/utils';
 
-export {SqlToolsServiceClient, VscodeWrapper, SharedConstants, Utils};
+export { SqlToolsServiceClient } from './languageservice/serviceClient';
-export {IExtensionConstants} from './models/contracts/contracts';
+export { IExtensionConstants } from './models/contracts/contracts';
-export {ILanguageClientHelper} from './models/contracts/languageService';
+export { ILanguageClientHelper } from './models/contracts/languageService';
-export {Runtime, PlatformInformation} from './models/platform';
+export { Runtime, PlatformInformation } from './models/platform';
-export {Telemetry} from './models/telemetry';
+export { Telemetry } from './models/telemetry';
-export {LinuxDistribution} from './models/platform';
+export { LinuxDistribution } from './models/platform';
-export {ServiceInstaller} from './languageservice/serviceInstallerUtil';
+export { ServiceInstaller } from './languageservice/serviceInstallerUtil';

extensions-modules/src/models/constants.ts

@@ -3,24 +3,23 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//constants
+export namespace Constants {
-export const configLogDebugInfo: string = 'logDebugInfo';
+	//constants
-export const serviceNotCompatibleError: string = "Client is not compatible with the service layer";
+	export const configLogDebugInfo: string = 'logDebugInfo';
-export const serviceDownloading: string = "Downloading";
+	export const serviceNotCompatibleError: string = 'Client is not compatible with the service layer';
-export const serviceInstalling: string = "Installing";
+	export const serviceDownloading: string = 'Downloading';
-export const unsupportedPlatformErrorMessage: string = "This platform is unsupported and application services may not function correctly";
+	export const serviceInstalling: string = 'Installing';
-export const extensionActivated: string = 'activated.';
+	export const unsupportedPlatformErrorMessage: string = 'This platform is unsupported and application services may not function correctly';
-export const extensionDeactivated: string = 'de-activated.';
+	export const serviceConfigKey = 'service';
-export const configEnabled: string = 'enabled';
+	export const executableFilesConfigKey = 'executableFiles';
-export const configUseDebugSource = 'useDebugSource';
+	export const versionConfigKey = 'version';
-export const serviceConfigKey = 'service';
+	export const downloadUrlConfigKey = 'downloadUrl';
-export const executableFilesConfigKey = 'executableFiles';
+	export const installDirConfigKey = 'installDir';
-export const versionConfigKey = 'version';
+	export const serviceCrashButton = 'View Known Issues';
-export const downloadUrlConfigKey = 'downloadUrl';
+	export const neverShowAgain = 'Do not show again';
-export const installDirConfigKey = 'installDir';
+	export const ignorePlatformWarning = 'ignorePlatformWarning';
-export const serviceCrashButton = "View Known Issues";
+	export const usingDefaultPlatformMessage = 'Unknown platform detected, defaulting to Linux_x64 platform';
-export const configDebugSourcePath = 'debugSourcePath';
+	export const serverConnectionMetadata = 'serverConnectionMetadata';
-export const neverShowAgain = "Don't show again";
+	export const extensionDeactivated: string = 'de-activated.';
-export const ignorePlatformWarning = 'ignorePlatformWarning';
+	export const extensionActivated: string = 'activated.';
-export const usingDefaultPlatformMessage = "Unknown platform detected, defaulting to Linux_x64 platform";
+}
-export const serverConnectionMetadata = "serverConnectionMetadata";

extensions-modules/src/models/contracts/contracts.ts

@@ -2,10 +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'
+'use strict';
 
-import {RequestType} from 'dataprotocol-client';
+import { RequestType } from 'dataprotocol-client';
-import {Runtime, LinuxDistribution} from '../platform';
+import { Runtime, LinuxDistribution } from '../platform';
 
 // --------------------------------- < Version Request > -------------------------------------------------
 
@@ -37,7 +37,7 @@ export interface IExtensionConstants {
 	serviceLoadingFailed: string;
 	serviceInstallationFailed: string;
 	serviceInitializingOutputChannelName: string;
-    commandsNotAvailableWhileInstallingTheService : string;
+	commandsNotAvailableWhileInstallingTheService: string;
 	providerId: string;
 	serviceCrashMessage: string;
 	serviceCrashLink: string;

extensions-modules/src/models/contracts/languageService.ts

@@ -1,6 +1,10 @@
-import {NotificationType, ServerOptions} from 'dataprotocol-client';
+/*---------------------------------------------------------------------------------------------
-import {ITelemetryEventProperties, ITelemetryEventMeasures} from '../telemetry';
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-import {Runtime} from '../platform';
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { NotificationType, ServerOptions } from 'dataprotocol-client';
+import { ITelemetryEventProperties, ITelemetryEventMeasures } from '../telemetry';
+import { Runtime } from '../platform';
 
 // ------------------------------- < Telemetry Sent Event > ------------------------------------
 

extensions-modules/src/models/interfaces.ts

@@ -1,3 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 'use strict';
 
 export interface ILogger {
@@ -7,7 +11,3 @@ export interface ILogger {
 	append(message?: string): void;
 	appendLine(message?: string): void;
 }
-
-export interface IRuntime {
-    getRuntimeDisplayName();
-}

extensions-modules/src/models/logger.ts

@@ -3,9 +3,10 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as os from 'os';
-import {ILogger} from './interfaces';
+import { ILogger } from './interfaces';
-import * as Utils from './utils';
+import { Utils } from './utils';
-import {IExtensionConstants} from './contracts/contracts';
+import { IExtensionConstants } from './contracts/contracts';
+
 /*
 * Logger class handles logging messages using the Util functions.
 */

extensions-modules/src/models/platform.ts

@@ -16,7 +16,7 @@ export enum Runtime {
 	UnknownVersion = <any>'Unknown',
 	Windows_86 = <any>'Windows_86',
 	Windows_64 = <any>'Windows_64',
-    OSX = <any> 'OSX',
+	OSX = <any>'OSX',
 	CentOS_7 = <any>'CentOS_7',
 	Debian_8 = <any>'Debian_8',
 	Fedora_23 = <any>'Fedora_23',
@@ -134,7 +134,7 @@ export class PlatformInformation {
 			case 'darwin':
 				let osVersion = os.release();
 				if (parseFloat(osVersion) < 16.0 && extensionName === 'mssql') {
-                    return Promise.reject('The current version of macOS is not supported. Only macOS Sierra and above (>= 10.12) are supported.')
+					return Promise.reject('The current version of macOS is not supported. Only macOS Sierra and above (>= 10.12) are supported.');
 				}
 				architecturePromise = PlatformInformation.getUnixArchitecture();
 				distributionPromise = Promise.resolve(undefined);
@@ -149,7 +149,7 @@ export class PlatformInformation {
 				return Promise.reject(`Unsupported platform: ${platform}`);
 		}
 
-        return architecturePromise.then( arch => {
+		return architecturePromise.then(arch => {
 			return distributionPromise.then(distro => {
 				return new PlatformInformation(platform, arch, distro, getRuntimeId);
 			});
@@ -235,61 +235,6 @@ export class PlatformInformation {
 			});
 		});
 	}
-
-    private static getRuntimeIdHelper(distributionName: string, distributionVersion: string): Runtime {
-        switch (distributionName) {
-            case 'ubuntu':
-                if (distributionVersion.startsWith('14')) {
-                    // This also works for Linux Mint
-                    return Runtime.Ubuntu_14;
-                } else if (distributionVersion.startsWith('16')) {
-                    return Runtime.Ubuntu_16;
-                }
-
-                break;
-            case 'elementary':
-            case 'elementary OS':
-                if (distributionVersion.startsWith('0.3')) {
-                    // Elementary OS 0.3 Freya is binary compatible with Ubuntu 14.04
-                    return Runtime.Ubuntu_14;
-                } else if (distributionVersion.startsWith('0.4')) {
-                    // Elementary OS 0.4 Loki is binary compatible with Ubuntu 16.04
-                    return Runtime.Ubuntu_16;
-                }
-
-                break;
-            case 'linuxmint':
-                if (distributionVersion.startsWith('18')) {
-                    // Linux Mint 18 is binary compatible with Ubuntu 16.04
-                    return Runtime.Ubuntu_16;
-                }
-
-                break;
-            case 'centos':
-            case 'ol':
-                // Oracle Linux is binary compatible with CentOS
-                return Runtime.CentOS_7;
-            case 'fedora':
-                return Runtime.Fedora_23;
-            case 'opensuse':
-                return Runtime.OpenSUSE_13_2;
-            case 'sles':
-                return Runtime.SLES_12_2;
-            case 'rhel':
-                return Runtime.RHEL_7;
-            case 'debian':
-                return Runtime.Debian_8;
-            case 'galliumos':
-                if (distributionVersion.startsWith('2.0')) {
-                    return Runtime.Ubuntu_16;
-                }
-                break;
-            default:
-                return Runtime.Linux_64;
-        }
-
-        return Runtime.Linux_64;
-    }
 }
 
 /**

extensions-modules/src/models/telemetry.ts

@@ -6,13 +6,13 @@
 'use strict';
 import vscode = require('vscode');
 import TelemetryReporter from 'vscode-extension-telemetry';
-import Utils = require('./utils');
+import { Utils } from './utils';
 import { PlatformInformation, Runtime, LinuxDistribution } from './platform';
 import { IExtensionConstants } from './contracts/contracts';
 
 export interface ITelemetryEventProperties {
 	[key: string]: string;
-	}
+}
 
 export interface ITelemetryEventMeasures {
 	[key: string]: number;
@@ -157,5 +157,3 @@ export class Telemetry {
 		});
 	}
 }
-
-export default Telemetry;

extensions-modules/src/models/utils.ts

@@ -1,30 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 crypto from 'crypto';
 import * as os from 'os';
 import vscode = require('vscode');
-import Constants = require('./constants');
+import { Constants } from './constants';
-import {ExtensionContext} from 'vscode';
+import { ExtensionContext } from 'vscode';
-import fs = require('fs');
 var path = require('path');
 
-// CONSTANTS //////////////////////////////////////////////////////////////////////////////////////
+export namespace Utils {
-const msInH = 3.6e6;
+	// INTERFACES /////////////////////////////////////////////////////////////////////////////////////
-const msInM = 60000;
-const msInS = 1000;
 
-// INTERFACES /////////////////////////////////////////////////////////////////////////////////////
+	// Interface for package.json information
-
+	export interface IPackageInfo {
-// Interface for package.json information
-export interface IPackageInfo {
 		name: string;
 		version: string;
 		aiKey: string;
-}
+	}
 
-// FUNCTIONS //////////////////////////////////////////////////////////////////////////////////////
+	// FUNCTIONS //////////////////////////////////////////////////////////////////////////////////////
 
-// Get information from the extension's package.json file
+	// Get information from the extension's package.json file
-export function getPackageInfo(context: ExtensionContext): IPackageInfo {
+	export function getPackageInfo(context: ExtensionContext): IPackageInfo {
 		let extensionPackage = require(context.asAbsolutePath('./package.json'));
 		if (extensionPackage) {
 			return {
@@ -33,10 +32,10 @@ export function getPackageInfo(context: ExtensionContext): IPackageInfo {
 				aiKey: extensionPackage.aiKey
 			};
 		}
-}
+	}
 
-// Generate a new GUID
+	// Generate a new GUID
-export function generateGuid(): string {
+	export function generateGuid(): string {
 		let hexValues: string[] = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'];
 		// c.f. rfc4122 (UUID version 4 = xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx)
 		let oct: string = '';
@@ -58,15 +57,15 @@ export function generateGuid(): string {
 		let clockSequenceHi: string = hexValues[8 + (Math.random() * 4) | 0];
 		return oct.substr(0, 8) + '-' + oct.substr(9, 4) + '-4' + oct.substr(13, 3) + '-' + clockSequenceHi + oct.substr(16, 3) + '-' + oct.substr(19, 12);
 		/* tslint:enable:no-bitwise */
-}
+	}
 
-// Generate a unique, deterministic ID for the current user of the extension
+	// Generate a unique, deterministic ID for the current user of the extension
-export function generateUserId(): Promise<string> {
+	export function generateUserId(): Promise<string> {
 		return new Promise<string>(resolve => {
 			try {
 				let interfaces = os.networkInterfaces();
 				let mac;
-            for(let key of Object.keys(interfaces)) {
+				for (let key of Object.keys(interfaces)) {
 					let item = interfaces[key][0];
 					if (!item.internal) {
 						mac = item.mac;
@@ -82,53 +81,19 @@ export function generateUserId(): Promise<string> {
 				resolve(generateGuid()); // fallback
 			}
 		});
-}
-
-// Return 'true' if the active editor window has a .sql file, false otherwise
-export function isEditingSqlFile(languageId: string): boolean {
-    let sqlFile = false;
-    let editor = getActiveTextEditor();
-    if (editor) {
-        if (editor.document.languageId === languageId) {
-            sqlFile = true;
 	}
-    }
-    return sqlFile;
-}
 
-// Return the active text editor if there's one
+	// Retrieve the URI for the currently open file if there is one; otherwise return the empty string
-export function getActiveTextEditor(): vscode.TextEditor {
+	export function getActiveTextEditorUri(): string {
-    let editor = undefined;
-    if (vscode.window && vscode.window.activeTextEditor) {
-        editor = vscode.window.activeTextEditor;
-    }
-    return editor;
-}
-
-// Retrieve the URI for the currently open file if there is one; otherwise return the empty string
-export function getActiveTextEditorUri(): string {
 		if (typeof vscode.window.activeTextEditor !== 'undefined' &&
 			typeof vscode.window.activeTextEditor.document !== 'undefined') {
 			return vscode.window.activeTextEditor.document.uri.toString();
 		}
 		return '';
-}
-
-// Helper to log messages to output channel
-export function logToOutputChannel(msg: any, outputChannelName: string): void {
-    let outputChannel = vscode.window.createOutputChannel(outputChannelName);
-    outputChannel.show();
-    if (msg instanceof Array) {
-        msg.forEach(element => {
-            outputChannel.appendLine(element.toString());
-        });
-    } else {
-        outputChannel.appendLine(msg.toString());
 	}
-}
 
-// Helper to log debug messages
+	// Helper to log debug messages
-export function logDebug(msg: any, extensionConfigSectionName: string): void {
+	export function logDebug(msg: any, extensionConfigSectionName: string): void {
 		let config = vscode.workspace.getConfiguration(extensionConfigSectionName);
 		let logDebugInfo = config[Constants.configLogDebugInfo];
 		if (logDebugInfo === true) {
@@ -136,121 +101,20 @@ export function logDebug(msg: any, extensionConfigSectionName: string): void {
 			let outputMsg = '[' + currentTime + ']: ' + msg ? msg.toString() : '';
 			console.log(outputMsg);
 		}
-}
+	}
 
-// Helper to show an info message
+	// Helper to show an error message
-export function showInfoMsg(msg: string, extensionName: string): void {
+	export function showErrorMsg(msg: string, extensionName: string): void {
-    vscode.window.showInformationMessage(extensionName + ': ' + msg );
+		vscode.window.showErrorMessage(extensionName + ': ' + msg);
-}
+	}
 
-// Helper to show an warn message
+	export function isEmpty(str: any): boolean {
-export function showWarnMsg(msg: string, extensionName: string): void {
-    vscode.window.showWarningMessage(extensionName + ': ' + msg );
-}
-
-// Helper to show an error message
-export function showErrorMsg(msg: string, extensionName: string): void {
-    vscode.window.showErrorMessage(extensionName + ': ' + msg );
-}
-
-export function isEmpty(str: any): boolean {
 		return (!str || '' === str);
-}
-
-export function isNotEmpty(str: any): boolean {
-    return <boolean>(str && '' !== str);
-}
-
-/**
- * Format a string. Behaves like C#'s string.Format() function.
- */
-export function formatString(str: string, ...args: any[]): string {
-    // This is based on code originally from https://github.com/Microsoft/vscode/blob/master/src/vs/nls.js
-    // License: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
-    let result: string;
-    if (args.length === 0) {
-        result = str;
-    } else {
-        result = str.replace(/\{(\d+)\}/g, (match, rest) => {
-            let index = rest[0];
-            return typeof args[index] !== 'undefined' ? args[index] : match;
-        });
-    }
-    return result;
-}
-
-
-/**
- * Check if a file exists on disk
- */
-export function isFileExisting(filePath: string): boolean {
-        try {
-            fs.statSync(filePath);
-            return true;
-        } catch (err) {
-            return false;
-        }
 	}
 
-/**
+	// The function is a duplicate of \src\paths.js. IT would be better to import path.js but it doesn't
- * Takes a string in the format of HH:MM:SS.MS and returns a number representing the time in
+	// work for now because the extension is running in different process.
- * miliseconds
+	export function getAppDataPath() {
- * @param value The string to convert to milliseconds
- * @return False is returned if the string is an invalid format,
- *         the number of milliseconds in the time string is returned otherwise.
- */
-export function parseTimeString(value: string): number | boolean {
-    if (!value) {
-        return false;
-    }
-    let tempVal = value.split('.');
-
-    if (tempVal.length !== 2) {
-        return false;
-    }
-
-    let ms = parseInt(tempVal[1].substring(0, 3), 10);
-    tempVal = tempVal[0].split(':');
-
-    if (tempVal.length !== 3) {
-        return false;
-    }
-
-    let h = parseInt(tempVal[0], 10);
-    let m = parseInt(tempVal[1], 10);
-    let s = parseInt(tempVal[2], 10);
-
-    return ms + (h * msInH) + (m * msInM) + (s * msInS);
-}
-
-/**
- * Takes a number of milliseconds and converts it to a string like HH:MM:SS.fff
- * @param value The number of milliseconds to convert to a timespan string
- * @returns A properly formatted timespan string.
- */
-export function parseNumAsTimeString(value: number): string {
-    let tempVal = value;
-    let h = Math.floor(tempVal / msInH);
-    tempVal %= msInH;
-    let m = Math.floor(tempVal / msInM);
-    tempVal %= msInM;
-    let s = Math.floor(tempVal / msInS);
-    tempVal %= msInS;
-
-    let hs = h < 10 ? '0' + h : '' + h;
-    let ms = m < 10 ? '0' + m : '' + m;
-    let ss = s < 10 ? '0' + s : '' + s;
-    let mss = tempVal < 10 ? '00' + tempVal : tempVal < 100 ? '0' + tempVal : '' + tempVal;
-
-    let rs = hs + ':' + ms + ':' + ss;
-
-    return tempVal > 0 ? rs + '.' + mss : rs;
-}
-
-
-// The function is a duplicate of \src\paths.js. IT would be better to import path.js but it doesn't
-// work for now because the extension is running in different process.
-export function getAppDataPath() {
 		var platform = process.platform;
 		switch (platform) {
 			case 'win32': return process.env['APPDATA'] || path.join(process.env['USERPROFILE'], 'AppData', 'Roaming');
@@ -258,7 +122,9 @@ export function getAppDataPath() {
 			case 'linux': return process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
 			default: throw new Error('Platform not supported');
 		}
-}
+	}
-export function getDefaultLogLocation() {
+
+	export function getDefaultLogLocation() {
 		return path.join(getAppDataPath(), 'sqlops');
+	}
 }

extensions-modules/src/utils/escapeException.ts

@@ -1,3 +0,0 @@
-'use strict';
-
-export default require('error-ex')('EscapeException');

extensions-modules/src/utils/validationException.ts

@@ -1,3 +0,0 @@
-'use strict';
-
-export default require('error-ex')('ValidationException');

extensions-modules/src/views/statusView.ts

@@ -1,5 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 import vscode = require('vscode');
-import * as Utils from '../models/utils';
+import { Utils } from '../models/utils';
 
 // Status bar element for each file in the editor
 class FileStatusBar {
@@ -130,7 +134,7 @@ export default class StatusView implements vscode.Disposable {
 		let currentOpenFile = Utils.getActiveTextEditorUri();
 
 		// Only show the status bar if it matches the currently open file and is not empty
-        if (fileUri === currentOpenFile && !Utils.isEmpty(statusBarItem.text) ) {
+		if (fileUri === currentOpenFile && !Utils.isEmpty(statusBarItem.text)) {
 			statusBarItem.show();
 			if (fileUri in this._statusBars) {
 				this._lastShownStatusBar = this._statusBars[fileUri];

extensions/account-provider-azure/.vscodeignore

@@ -0,0 +1,3 @@
+src/**
+tsconfig.json
+npm-shrinkwrap.json

extensions/account-provider-azure/npm-shrinkwrap.json

@@ -0,0 +1,348 @@
+{
+  "name": "account-provider-azure",
+  "version": "0.0.1",
+  "dependencies": {
+    "@types/node": {
+      "version": "8.5.1",
+      "from": "@types/node@>=8.0.47 <9.0.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.1.tgz"
+    },
+    "adal-node": {
+      "version": "0.1.25",
+      "from": "adal-node@0.1.25",
+      "resolved": "https://registry.npmjs.org/adal-node/-/adal-node-0.1.25.tgz"
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "from": "ansi-regex@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "from": "ansi-styles@>=2.2.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
+    },
+    "asn1": {
+      "version": "0.1.11",
+      "from": "asn1@0.1.11",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+    },
+    "assert-plus": {
+      "version": "0.1.5",
+      "from": "assert-plus@>=0.1.5 <0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+    },
+    "async": {
+      "version": "2.6.0",
+      "from": "async@>=0.6.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz"
+    },
+    "aws-sign2": {
+      "version": "0.5.0",
+      "from": "aws-sign2@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+    },
+    "base64url": {
+      "version": "2.0.0",
+      "from": "base64url@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz"
+    },
+    "bl": {
+      "version": "1.0.3",
+      "from": "bl@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"
+    },
+    "bluebird": {
+      "version": "2.11.0",
+      "from": "bluebird@>=2.9.30 <3.0.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"
+    },
+    "boom": {
+      "version": "2.10.1",
+      "from": "boom@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+    },
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "from": "buffer-equal-constant-time@1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"
+    },
+    "caseless": {
+      "version": "0.11.0",
+      "from": "caseless@>=0.11.0 <0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "from": "chalk@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "from": "combined-stream@>=1.0.1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+    },
+    "commander": {
+      "version": "2.12.2",
+      "from": "commander@>=2.8.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz"
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "from": "core-util-is@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "from": "cryptiles@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+    },
+    "ctype": {
+      "version": "0.5.3",
+      "from": "ctype@0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+    },
+    "date-utils": {
+      "version": "1.2.21",
+      "from": "date-utils@*",
+      "resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "from": "delayed-stream@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+    },
+    "ecdsa-sig-formatter": {
+      "version": "1.0.9",
+      "from": "ecdsa-sig-formatter@1.0.9",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz"
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+    },
+    "extend": {
+      "version": "3.0.1",
+      "from": "extend@>=3.0.0 <3.1.0",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "from": "forever-agent@>=0.6.0 <0.7.0",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+    },
+    "form-data": {
+      "version": "1.0.1",
+      "from": "form-data@>=1.0.0-rc1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "from": "generate-function@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "from": "generate-object-property@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+    },
+    "har-validator": {
+      "version": "1.8.0",
+      "from": "har-validator@>=1.6.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "from": "has-ansi@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "from": "hawk@>=3.1.0 <3.2.0",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "from": "hoek@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+    },
+    "http-signature": {
+      "version": "0.11.0",
+      "from": "http-signature@>=0.11.0 <0.12.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "from": "inherits@>=2.0.1 <2.1.0",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+    },
+    "is-my-json-valid": {
+      "version": "2.17.1",
+      "from": "is-my-json-valid@>=2.12.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz"
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "from": "is-property@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "from": "isarray@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "from": "isstream@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+    },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "from": "jsonpointer@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"
+    },
+    "jwa": {
+      "version": "1.1.5",
+      "from": "jwa@>=1.1.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz"
+    },
+    "jws": {
+      "version": "3.1.4",
+      "from": "jws@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"
+    },
+    "lodash": {
+      "version": "4.17.4",
+      "from": "lodash@>=4.14.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+    },
+    "mime-db": {
+      "version": "1.30.0",
+      "from": "mime-db@>=1.30.0 <1.31.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"
+    },
+    "mime-types": {
+      "version": "2.1.17",
+      "from": "mime-types@>=2.1.2 <2.2.0",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "from": "oauth-sign@>=0.8.0 <0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "from": "process-nextick-args@>=1.0.6 <1.1.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "from": "punycode@>=1.4.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+    },
+    "qs": {
+      "version": "5.1.0",
+      "from": "qs@>=5.1.0 <5.2.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
+    },
+    "readable-stream": {
+      "version": "2.0.6",
+      "from": "readable-stream@>=2.0.5 <2.1.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+    },
+    "request": {
+      "version": "2.63.0",
+      "from": "request@2.63.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.63.0.tgz",
+      "dependencies": {
+        "node-uuid": {
+          "version": "1.4.8",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"
+        }
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "from": "safe-buffer@>=5.0.1 <6.0.0",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "from": "sntp@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+    },
+    "string_decoder": {
+      "version": "0.10.31",
+      "from": "string_decoder@>=0.10.0 <0.11.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "from": "stringstream@>=0.0.4 <0.1.0",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "from": "strip-ansi@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "from": "supports-color@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+    },
+    "tough-cookie": {
+      "version": "2.3.3",
+      "from": "tough-cookie@>=0.12.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"
+    },
+    "tunnel-agent": {
+      "version": "0.4.3",
+      "from": "tunnel-agent@>=0.4.0 <0.5.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
+    },
+    "underscore": {
+      "version": "1.8.3",
+      "from": "underscore@>=1.3.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "from": "util-deprecate@>=1.0.1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+    },
+    "uuid": {
+      "version": "3.1.0",
+      "from": "uuid@>=3.1.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"
+    },
+    "vscode-nls": {
+      "version": "2.0.2",
+      "from": "vscode-nls@2.0.2",
+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz"
+    },
+    "xmldom": {
+      "version": "0.1.27",
+      "from": "xmldom@>=0.1.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"
+    },
+    "xpath.js": {
+      "version": "1.0.7",
+      "from": "xpath.js@>=1.0.5 <1.1.0",
+      "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz"
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "from": "xtend@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+    }
+  }
+}

extensions/account-provider-azure/package.json

@@ -0,0 +1,55 @@
+{
+  "name": "account-provider-azure",
+  "version": "0.0.1",
+  "publisher": "Microsoft",
+  "engines": { "vscode": "*" },
+  "main": "./out/main",
+  "activationEvents": [ "*" ],
+  "scripts": {
+    "compile": "gulp compile-extension:account-provider-azure"
+  },
+  "dependencies": {
+    "adal-node": "0.1.25",
+    "request": "2.63.0",
+    "vscode-nls": "2.0.2"
+  },
+  "devDependencies": {
+    "@types/node": "^8.0.24"
+  },
+  "contributes": {
+    "commands": [
+      {
+        "command": "extension.clearTokenCache",
+        "title": "%extension.clearTokenCache%",
+        "category": "Azure Accounts"
+      }
+    ],
+    "configuration": {
+      "type": "object",
+      "title": "Azure Account Configuration",
+      "properties": {
+        "accounts.azure.enablePublicCloud": {
+          "type": "boolean",
+          "default": true,
+          "description": "%config.enablePublicCloudDescription%"
+        }
+      }
+    },
+    "account-type": [
+      {
+        "id": "microsoft",
+        "icon": {
+          "light": "./out/account-provider/media/microsoft_account_light.svg",
+          "dark": "./out/account-provider/media/microsoft_account_dark.svg"
+        }
+      },
+      {
+        "id": "work_school",
+        "icon": {
+          "light": "./out/account-provider/media/work_school_account_light.svg",
+          "dark": "./out/account-provider/media/work_school_account_dark.svg"
+        }
+      }
+    ]
+  }
+}

extensions/account-provider-azure/package.nls.json

@@ -0,0 +1,7 @@
+{
+	"extension.clearTokenCache": "Clear Azure Account Token Cache",
+	"config.enablePublicCloudDescription": "Should Azure public cloud integration be enabled",
+	"config.enableUsGovCloudDescription": "Should US Government Azure cloud (Fairfax) integration be enabled",
+	"config.enableChinaCloudDescription": "Should Azure China integration be enabled",
+	"config.enableGermanyCloudDescription": "Should Azure Germany integration be enabled"
+}

extensions/account-provider-azure/src/account-provider/azureAccountProviderService.ts

@@ -5,16 +5,18 @@
 
 'use strict';
 
+import * as constants from '../constants';
 import * as data from 'data';
 import * as events from 'events';
+import * as nls from 'vscode-nls';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import CredentialServiceTokenCache from './tokenCache';
 import providerSettings from './providerSettings';
 import { AzureAccountProvider } from './azureAccountProvider';
 import { AzureAccountProviderMetadata, ProviderSettings } from './interfaces';
-import * as nls from 'vscode-nls';
+
-const localize = nls.loadMessageBundle();
+let localize = nls.loadMessageBundle();
 
 export class AzureAccountProviderService implements vscode.Disposable {
 	// CONSTANTS ///////////////////////////////////////////////////////////////
@@ -77,11 +79,11 @@ export class AzureAccountProviderService implements vscode.Disposable {
 			.then(
 			() => {
 				let message = localize('clearTokenCacheSuccess', 'Token cache successfully cleared');
-					vscode.window.showInformationMessage(`mssql: ${message}`);
+				vscode.window.showInformationMessage(`${constants.extensionName}: ${message}`);
 			},
 			err => {
 				let message = localize('clearTokenCacheFailure', 'Failed to clear token cache');
-					vscode.window.showErrorMessage(`mssql: ${message}: ${err}`);
+				vscode.window.showErrorMessage(`${constants.extensionName}: ${message}: ${err}`);
 			});
 	}
 
@@ -97,7 +99,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
 
 			// Determine what providers need to be changed
 			let providerChanges: Thenable<void>[] = [];
-			for(let provider of providerSettings) {
+			for (let provider of providerSettings) {
 				// If the old config doesn't exist, then assume everything was disabled
 				// There will always be a new config value
 				let oldConfigValue = oldConfig
@@ -138,7 +140,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
 				self._accountProviders[provider.metadata.id] = accountProvider;
 				self._accountDisposals[provider.metadata.id] = data.accounts.registerAccountProvider(provider.metadata, accountProvider);
 				resolve();
-			} catch(e) {
+			} catch (e) {
 				console.error(`Failed to register account provider: ${e}`);
 				reject(e);
 			}
@@ -154,7 +156,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
 				delete self._accountProviders[provider.metadata.id];
 				delete self._accountDisposals[provider.metadata.id];
 				resolve();
-			} catch(e) {
+			} catch (e) {
 				console.error(`Failed to unregister account provider: ${e}`);
 				reject(e);
 			}

extensions/account-provider-azure/src/account-provider/providerSettings.ts

@@ -32,6 +32,7 @@ const publicAzureSettings: ProviderSettings = {
 	}
 };
 
+/* Leaving for reference
 const usGovAzureSettings: ProviderSettings = {
 	configKey: 'enableUsGovCloud',
 	metadata: {
@@ -97,6 +98,7 @@ const germanyAzureSettings: ProviderSettings = {
 		}
 	}
 };
+*/
 
 // TODO: Enable China, Germany, and US Gov clouds: (#3031)
 export default <ProviderSettings[]>[publicAzureSettings, /*chinaAzureSettings, germanyAzureSettings, usGovAzureSettings*/];

extensions/account-provider-azure/src/account-provider/tokenCache.ts

@@ -56,7 +56,7 @@ export default class TokenCache implements adal.TokenCache {
 			});
 		})
 			.then(() => { return self._credentialProvider.deleteCredential(self._credentialServiceKey); })
-		.then(() => {});
+			.then(() => { });
 	}
 
 	public find(query: any, callback: (error: Error, results: any[]) => void): void {
@@ -189,7 +189,7 @@ export default class TokenCache implements adal.TokenCache {
 								key: new Buffer(splitValues[0], 'hex'),
 								initializationVector: new Buffer(splitValues[1], 'hex')
 							};
-						} catch(e) {
+						} catch (e) {
 							// Swallow the error and fall through to generate new params
 							console.warn('Failed to deserialize encryption params, new ones will be generated.');
 						}
@@ -204,7 +204,7 @@ export default class TokenCache implements adal.TokenCache {
 				let serializedValues = `${encryptKey.toString('hex')}|${initializationVector.toString('hex')}`;
 				return self._credentialProvider.saveCredential(self._credentialServiceKey, serializedValues)
 					.then(() => {
-						return <EncryptionParams> {
+						return <EncryptionParams>{
 							key: encryptKey,
 							initializationVector: initializationVector
 						};
@@ -237,7 +237,7 @@ export default class TokenCache implements adal.TokenCache {
 					}
 
 					return cacheObj;
-				} catch(e) {
+				} catch (e) {
 					throw e;
 				}
 			})

extensions/account-provider-azure/src/constants.ts

@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();
+
+export const extensionName = localize('extensionName', 'Azure Accounts');

extensions/account-provider-azure/src/main.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs from 'fs';
+import * as path from 'path';
+import * as vscode from 'vscode';
+import { Utils } from 'extensions-modules';
+
+import * as constants from './constants';
+import { AzureAccountProviderService } from './account-provider/azureAccountProviderService';
+
+// EXTENSION ACTIVATION ////////////////////////////////////////////////////
+export function activate(context: vscode.ExtensionContext): void {
+	// Create the folder for storing the token caches
+	let storagePath = path.join(Utils.getDefaultLogLocation(), constants.extensionName);
+	try {
+		if (!fs.existsSync(storagePath)) {
+			fs.mkdirSync(storagePath);
+			console.log('Initialized Azure account extension storage.');
+		}
+	} catch (e) {
+		console.error(`Initialization of Azure account extension storage failed: ${e}`);
+		console.error('Azure accounts will not be available');
+		return;
+	}
+
+	// Create the provider service and activate
+	const accountProviderService = new AzureAccountProviderService(context, storagePath);
+	context.subscriptions.push(accountProviderService);
+	accountProviderService.activate();
+}

extensions/account-provider-azure/src/typings/ref.d.ts

@@ -0,0 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/// <reference path='../../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../../src/sql/data.d.ts'/>

extensions/account-provider-azure/tsconfig.json

@@ -0,0 +1,20 @@
+{
+	"compileOnSave": true,
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es6",
+		"outDir": "./out",
+		"lib": [
+			"es6", "es2015.promise"
+		],
+		"sourceMap": true,
+		"emitDecoratorMetadata": true,
+		"experimentalDecorators": true,
+		"moduleResolution": "node",
+		"declaration": true,
+		"types": ["node"]
+	},
+	"exclude": [
+		"./node_modules"
+	]
+}

extensions/mssql/.vscodeignore

@@ -0,0 +1,4 @@
+client/src/**
+client/tsconfig.json
+npm-shrinkwrap.json
+test/**

extensions/mssql/client/src/config.json

@@ -1,7 +1,7 @@
 {
 	"service": {
 		"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-		"version": "1.2.0-alpha.49",
+		"version": "1.4.0-alpha.3",
 			"downloadFileNames": {
 			"Windows_86": "win-x86-netcoreapp2.0.zip",
 			"Windows_64": "win-x64-netcoreapp2.0.zip",
@@ -28,7 +28,7 @@
 							"specialValueType": "serverName",
 							"isIdentity": true,
 							"name": "server",
-							"displayName": "Server name",
+							"displayName": "Server",
 							"description": "Name of the SQL Server instance",
 							"groupName": "Source",
 							"valueType": "string",
@@ -42,7 +42,7 @@
 							"specialValueType": "databaseName",
 							"isIdentity": true,
 							"name": "database",
-							"displayName": "Database name",
+							"displayName": "Database",
 							"description": "The name of the initial catalog or database int the data source",
 							"groupName": "Source",
 							"valueType": "string",

extensions/mssql/client/src/controllers/mainController.ts

@@ -8,16 +8,12 @@ import vscode = require('vscode');
 import data = require('data');
 import { Constants } from '../models/constants';
 import { Serialization } from '../serialize/serialization';
-import { AzureResourceProvider } from '../resourceprovider/resourceprovider';
+import { AzureResourceProvider } from '../resourceProvider/resourceProvider';
 import { CredentialStore } from '../credentialstore/credentialstore';
-import {IExtensionConstants, Telemetry, SharedConstants, SqlToolsServiceClient, VscodeWrapper, Utils, PlatformInformation} from 'extensions-modules';
+import { IExtensionConstants, Telemetry, Constants as SharedConstants, SqlToolsServiceClient, VscodeWrapper, Utils, PlatformInformation } from 'extensions-modules';
 import { LanguageClient } from 'dataprotocol-client';
-import * as fs from 'fs';
 import * as path from 'path';
 
-
-import { AzureAccountProviderService } from '../account-provider/azureAccountProviderService';
-
 /**
  * The main controller class that initializes the extension
  */
@@ -38,7 +34,7 @@ export default class MainController implements vscode.Disposable {
 		this._context = context;
 		this._vscodeWrapper = vscodeWrapper || new VscodeWrapper(MainController._extensionConstants);
 		SqlToolsServiceClient.constants = MainController._extensionConstants;
-        this._client = SqlToolsServiceClient.instance;
+		this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
 		this._credentialStore = new CredentialStore(this._client);
 		this._serialization = new Serialization(this._client);
 	}
@@ -71,9 +67,9 @@ export default class MainController implements vscode.Disposable {
 		return this._initialized;
 	}
 
-    private createClient( executableFiles: string[]):  Promise<LanguageClient> {
+	private createClient(executableFiles: string[]): Promise<LanguageClient> {
-         return PlatformInformation.getCurrent(SqlToolsServiceClient.constants.getRuntimeId, SqlToolsServiceClient.constants.extensionName).then( platformInfo => {
+		return PlatformInformation.getCurrent(SqlToolsServiceClient.constants.getRuntimeId, SqlToolsServiceClient.constants.extensionName).then(platformInfo => {
-            return SqlToolsServiceClient.instance.createClient(this._context, platformInfo.runtimeId, undefined, executableFiles);
+			return SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json')).createClient(this._context, platformInfo.runtimeId, undefined, executableFiles);
 		});
 	}
 
@@ -93,33 +89,11 @@ export default class MainController implements vscode.Disposable {
 	 * Initializes the extension
 	 */
 	public initialize(): Promise<boolean> {
-        const self = this;
 
 		// initialize language service client
-        return new Promise<boolean>( (resolve, reject) => {
+		return new Promise<boolean>((resolve, reject) => {
-
-            let constants = new Constants();
-
-            // Create the folder for storing the token caches
-            let storagePath = path.join(Utils.getDefaultLogLocation(), constants.extensionName);
-            try {
-                if (!fs.existsSync(storagePath)) {
-                    fs.mkdirSync(storagePath);
-                    console.log('Initialized Azure account extension storage.');
-                }
-            } catch(e) {
-                console.error(`Initialization of Azure account extension storage failed: ${e}`);
-                console.error('Azure accounts will not be available');
-                return;
-            }
-
-            // Create the provider service and activate
-            const accountProviderService = new AzureAccountProviderService(this._context, storagePath);
-            this._context.subscriptions.push(accountProviderService);
-            accountProviderService.activate();
-
 			const self = this;
-            SqlToolsServiceClient.instance.initialize(self._context).then(serverResult => {
+			SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json')).initialize(self._context).then(serverResult => {
 
 				// Initialize telemetry
 				Telemetry.initialize(self._context, new Constants());
@@ -130,7 +104,6 @@ export default class MainController implements vscode.Disposable {
 				);
 
 				self.createSerializationClient().then(serializationClient => {
-                    let serialization = new Serialization(self._client, serializationClient);
 					// Serialization
 					let serializationProvider: data.SerializationProvider = {
 						handle: 0,
@@ -140,7 +113,7 @@ export default class MainController implements vscode.Disposable {
 					};
 					data.serialization.registerProvider(serializationProvider);
 				}, error => {
-                    Utils.logDebug('Cannot find Serialization executables. error: ' + error , MainController._extensionConstants.extensionConfigSectionName);
+					Utils.logDebug('Cannot find Serialization executables. error: ' + error, MainController._extensionConstants.extensionConfigSectionName);
 				});
 
 				self.createResourceProviderClient().then(rpClient => {
@@ -154,7 +127,7 @@ export default class MainController implements vscode.Disposable {
 					}, resourceProvider);
 					Utils.logDebug('resourceProvider registered', MainController._extensionConstants.extensionConfigSectionName);
 				}, error => {
-                    Utils.logDebug('Cannot find ResourceProvider executables. error: ' + error , MainController._extensionConstants.extensionConfigSectionName);
+					Utils.logDebug('Cannot find ResourceProvider executables. error: ' + error, MainController._extensionConstants.extensionConfigSectionName);
 				});
 
 				self.createCredentialClient().then(credentialClient => {
@@ -175,9 +148,11 @@ export default class MainController implements vscode.Disposable {
 					data.credentials.registerProvider(credentialProvider);
 					Utils.logDebug('credentialProvider registered', MainController._extensionConstants.extensionConfigSectionName);
 				}, error => {
-                        Utils.logDebug('Cannot find credentials executables. error: ' + error , MainController._extensionConstants.extensionConfigSectionName);
+					Utils.logDebug('Cannot find credentials executables. error: ' + error, MainController._extensionConstants.extensionConfigSectionName);
 				});
 
+
+
 				Utils.logDebug(SharedConstants.extensionActivated, MainController._extensionConstants.extensionConfigSectionName);
 				self._initialized = true;
 				resolve(true);

extensions/mssql/client/src/credentialstore/credentialstore.ts

@@ -1,13 +1,14 @@
 /*---------------------------------------------------------------------------------------------
-*  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-*  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
-*--------------------------------------------------------------------------------------------*/
+ *--------------------------------------------------------------------------------------------*/
 'use strict';
 
 import * as Contracts from '../models/contracts';
 import { ICredentialStore } from './icredentialstore';
 import { SqlToolsServiceClient, Utils } from 'extensions-modules';
 import { LanguageClient } from 'dataprotocol-client';
+import * as path from 'path';
 
 /**
  * Implements a credential storage for Windows, Mac (darwin), or Linux.
@@ -20,7 +21,7 @@ export class CredentialStore implements ICredentialStore {
 
 	constructor(private _client?: SqlToolsServiceClient) {
 		if (!this._client) {
-            this._client = SqlToolsServiceClient.instance;
+			this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
 		}
 	}
 
@@ -35,7 +36,7 @@ export class CredentialStore implements ICredentialStore {
 		let self = this;
 		let cred: Contracts.Credential = new Contracts.Credential();
 		cred.credentialId = credentialId;
-        return new Promise<Contracts.Credential>( (resolve, reject) => {
+		return new Promise<Contracts.Credential>((resolve, reject) => {
 			self._client
 				.sendRequest(Contracts.ReadCredentialRequest.type, cred, this.languageClient)
 				.then(returnedCred => {
@@ -49,7 +50,7 @@ export class CredentialStore implements ICredentialStore {
 		let cred: Contracts.Credential = new Contracts.Credential();
 		cred.credentialId = credentialId;
 		cred.password = password;
-        return new Promise<boolean>( (resolve, reject) => {
+		return new Promise<boolean>((resolve, reject) => {
 			self._client
 				.sendRequest(Contracts.SaveCredentialRequest.type, cred, this.languageClient)
 				.then(status => {
@@ -62,7 +63,7 @@ export class CredentialStore implements ICredentialStore {
 		let self = this;
 		let cred: Contracts.Credential = new Contracts.Credential();
 		cred.credentialId = credentialId;
-        return new Promise<boolean>( (resolve, reject) => {
+		return new Promise<boolean>((resolve, reject) => {
 			self._client
 				.sendRequest(Contracts.DeleteCredentialRequest.type, cred, this.languageClient)
 				.then(status => {

extensions/mssql/client/src/credentialstore/icredentialstore.ts

@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------------------------
-*  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-*  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
-*--------------------------------------------------------------------------------------------*/
+ *--------------------------------------------------------------------------------------------*/
 'use strict';
 
 

extensions/mssql/client/src/main.ts

@@ -7,7 +7,7 @@
 import vscode = require('vscode');
 import MainController from './controllers/mainController';
 
-let controller: MainController = undefined;
+export let controller: MainController;
 
 export function activate(context: vscode.ExtensionContext) {
 	controller = new MainController(context);
@@ -21,10 +21,3 @@ export function deactivate(): void {
 		controller.deactivate();
 	}
 }
-
-/**
- * Exposed for testing purposes
- */
-export function getController(): MainController {
-    return controller;
-}

extensions/mssql/client/src/models/constants.ts

@@ -3,165 +3,21 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import {IExtensionConstants} from 'extensions-modules/lib/models/contracts/contracts';
+import { IExtensionConstants } from 'extensions-modules/lib/models/contracts/contracts';
-import {Runtime, LinuxDistribution} from 'extensions-modules/lib/models/platform';
+import { Runtime, LinuxDistribution } from 'extensions-modules/lib/models/platform';
 
 // constants
 export class Constants implements IExtensionConstants {
 	public readonly languageId = 'sql';
 	public readonly extensionName = 'mssql';
 	public readonly extensionConfigSectionName = 'mssql';
-    public readonly connectionApplicationName = 'vscode-mssql';
 	public readonly outputChannelName = 'MSSQL';
-    public readonly connectionConfigFilename = 'settings.json';
-    public readonly connectionsArrayName = 'mssql.connections';
-    public readonly cmdRunQuery = 'extension.runQuery';
-    public readonly cmdCancelQuery = 'extension.cancelQuery';
-    public readonly cmdConnect = 'extension.connect';
-    public readonly cmdDisconnect = 'extension.disconnect';
-    public readonly cmdChooseDatabase = 'extension.chooseDatabase';
-    public readonly cmdShowReleaseNotes = 'extension.showReleaseNotes';
-    public readonly cmdShowGettingStarted = 'extension.showGettingStarted';
-    public readonly cmdNewQuery = 'extension.newQuery';
-    public readonly cmdManageConnectionProfiles = 'extension.manageProfiles';
-    public readonly sqlDbPrefix = '.database.windows.net';
-    public readonly defaultConnectionTimeout = 15;
-    public readonly azureSqlDbConnectionTimeout = 30;
-    public readonly azureDatabase = 'Azure';
-    public readonly defaultPortNumber = 1433;
-    public readonly sqlAuthentication = 'SqlLogin';
-    public readonly defaultDatabase = 'master';
-    public readonly errorPasswordExpired = 18487;
-    public readonly errorPasswordNeedsReset = 18488;
-    public readonly maxDisplayedStatusTextLength = 50;
-    public readonly outputContentTypeRoot = 'root';
-    public readonly outputContentTypeMessages = 'messages';
-    public readonly outputContentTypeResultsetMeta = 'resultsetsMeta';
-    public readonly outputContentTypeColumns = 'columns';
-    public readonly outputContentTypeRows = 'rows';
-    public readonly outputContentTypeConfig = 'config';
-    public readonly outputContentTypeSaveResults = 'saveResults';
-    public readonly outputContentTypeOpenLink = 'openLink';
-    public readonly outputContentTypeCopy = 'copyResults';
-    public readonly outputContentTypeEditorSelection = 'setEditorSelection';
-    public readonly outputContentTypeShowError = 'showError';
-    public readonly outputContentTypeShowWarning = 'showWarning';
-    public readonly outputServiceLocalhost = 'http://localhost:';
-    public readonly msgContentProviderSqlOutputHtml = 'dist/html/sqlOutput.ejs';
-    public readonly contentProviderMinFile = 'dist/js/app.min.js';
-    public readonly configLogDebugInfo = 'logDebugInfo';
 	public readonly providerId = 'MSSQL';
 	public readonly installFolderName = 'sqltoolsservice';
 	public readonly telemetryExtensionName = 'carbon-mssql';
 
 	// localizable strings
-    public readonly configMyConnectionsNoServerName = 'Missing server name in user preferences connection: ';
-    public readonly msgLocalWebserviceStaticContent = 'LocalWebService: added static html content path: ';
-    public readonly msgLocalWebserviceStarted = 'LocalWebService listening on port ';
-    public readonly msgRunQueryAllBatchesExecuted = 'runQuery: all batches executed';
-    public readonly msgStartedExecute = 'Started query execution for document "{0}"';
-    public readonly msgFinishedExecute = 'Finished query execution for document "{0}"';
-    public readonly msgRunQueryError = 'runQuery: error: ';
-    public readonly msgRunQueryExecutingBatch = 'runQuery: executeBatch called with SQL: ';
-    public readonly msgRunQueryAddBatchResultsets = 'runQuery: adding resultsets for batch: ';
-    public readonly msgRunQueryAddBatchError = 'runQuery: adding error message for batch: ';
-    public readonly msgRunQueryConnectionActive = 'runQuery: active connection is connected, using it to run query';
-    public readonly msgRunQueryConnectionDisconnected = 'runQuery: active connection is disconnected, reconnecting';
-    public readonly msgRunQueryNoConnection = 'runQuery: no active connection - prompting for user';
-    public readonly msgRunQueryInProgress = 'A query is already running for this editor session. Please cancel this query or wait for its completion.';
-    public readonly runQueryBatchStartMessage = 'Started executing query at ';
-    public readonly runQueryBatchStartLine = 'Line {0}';
-    public readonly msgCancelQueryFailed = 'Canceling the query failed: {0}';
-    public readonly msgCancelQueryNotRunning = 'Cannot cancel query as no query is running.';
-    public readonly msgCancelQuerySuccess = 'Successfully canceled the query.';
-    public readonly msgContentProviderOnContentUpdated = 'Content provider: onContentUpdated called';
-    public readonly msgContentProviderAssociationFailure = 'Content provider: Unable to associate status view for current file';
-    public readonly msgContentProviderOnRootEndpoint = 'LocalWebService: Root end-point called';
-    public readonly msgContentProviderOnResultsEndpoint = 'LocalWebService: ResultsetsMeta endpoint called';
-    public readonly msgContentProviderOnMessagesEndpoint = 'LocalWebService: Messages end-point called';
-    public readonly msgContentProviderOnColumnsEndpoint = 'LocalWebService:  Columns end-point called for index = ';
-    public readonly msgContentProviderOnRowsEndpoint = 'LocalWebService: Rows end-point called for index = ';
-    public readonly msgContentProviderOnClear = 'Content provider: clear called';
-    public readonly msgContentProviderOnUpdateContent = 'Content provider: updateContent called';
-    public readonly msgContentProviderProvideContent = 'Content provider: provideTextDocumentContent called: ';
-    public readonly msgChooseDatabaseNotConnected = 'No connection was found. Please connect to a server first.';
-    public readonly msgChooseDatabasePlaceholder = 'Choose a database from the list below';
-    public readonly msgConnectionError = 'Error {0}: {1}';
-    public readonly msgConnectionError2 = 'Failed to connect: {0}';
-    public readonly msgConnectionErrorPasswordExpired = 'Error {0}: {1} Please login as a different user and change the password using ALTER LOGIN.';
-    public readonly connectionErrorChannelName = 'Connection Errors';
-    public readonly msgPromptCancelConnect = 'Server connection in progress. Do you want to cancel?';
-    public readonly msgPromptClearRecentConnections = 'Confirm to clear recent connections list';
-    public readonly msgOpenSqlFile = 'To use this command, Open a .sql file -or- ' +
-                                      'Change editor language to "SQL" -or- ' +
-                                      'Select T-SQL text in the active SQL editor.';
-    public readonly recentConnectionsPlaceholder = 'Choose a connection profile from the list below';
-    public readonly msgNoConnectionsInSettings = 'To use this command, add connection profile to User Settings.';
-    public readonly labelOpenGlobalSettings = 'Open Global Settings';
-    public readonly labelOpenWorkspaceSettings = 'Open Workspace Settings';
-    public readonly CreateProfileFromConnectionsListLabel = 'Create Connection Profile';
-    public readonly CreateProfileLabel = 'Create';
-    public readonly ClearRecentlyUsedLabel = 'Clear Recent Connections List';
-    public readonly EditProfilesLabel = 'Edit';
-    public readonly RemoveProfileLabel = 'Remove';
-    public readonly ManageProfilesPrompt = 'Manage Connection Profiles';
-    public readonly SampleServerName = '{{put-server-name-here}}';
-    public readonly serverPrompt = 'Server name';
-    public readonly serverPlaceholder = 'hostname\\instance or <server>.database.windows.net';
-    public readonly databasePrompt = 'Database name';
-    public readonly databasePlaceholder = '[Optional] Database to connect (press Enter to connect to <default> database)';
-    public readonly databaseDefaultValue = 'master';
-    public readonly authTypePrompt = 'Authentication Type';
-    public readonly authTypeIntegrated = 'Integrated';
-    public readonly authTypeSql = 'SQL Login';
-    public readonly authTypeAdUniversal = 'Active Directory Universal';
-    public readonly usernamePrompt = 'User name';
-    public readonly usernamePlaceholder = 'User name (SQL Login)';
-    public readonly passwordPrompt = 'Password';
-    public readonly passwordPlaceholder = 'Password (SQL Login)';
-    public readonly msgSavePassword = 'Save Password? If \'No\', password will be required each time you connect';
-    public readonly profileNamePrompt = 'Profile Name';
-    public readonly profileNamePlaceholder = '[Optional] Enter a name for this profile';
-    public readonly filepathPrompt = 'File path';
-    public readonly filepathPlaceholder = 'File name';
-    public readonly filepathMessage = 'File name';
-    public readonly overwritePrompt = 'A file with this name already exists. Do you want to replace the existing file?';
-    public readonly overwritePlaceholder = 'A file with this name already exists';
-    public readonly msgSaveResultInProgress = 'A save request is already executing. Please wait for its completion.';
-    public readonly msgCannotOpenContent = 'Error occurred opening content in editor.';
-    public readonly msgSaveStarted = 'Started saving results to ';
-    public readonly msgSaveFailed = 'Failed to save results. ';
-    public readonly msgSaveSucceeded = 'Successfully saved results to ';
-    public readonly msgSelectProfile = 'Select connection profile';
-    public readonly msgSelectProfileToRemove = 'Select profile to remove';
-    public readonly confirmRemoveProfilePrompt = 'Confirm to remove this profile.';
-    public readonly msgNoProfilesSaved = 'No connection profile to remove.';
-    public readonly msgProfileRemoved = 'Profile removed successfully';
-    public readonly msgProfileCreated = 'Profile created successfully';
-    public readonly msgProfileCreatedAndConnected = 'Profile created and connected';
-    public readonly msgClearedRecentConnections = 'Recent connections list cleared';
-    public readonly msgSelectionIsRequired = 'Selection is required.';
-    public readonly msgIsRequired = ' is required.';
-    public readonly msgRetry = 'Retry';
-    public readonly msgError = 'Error: ';
-    public readonly msgYes = 'Yes';
-    public readonly msgNo = 'No';
-    public readonly defaultDatabaseLabel = '<default>';
-    public readonly notConnectedLabel = 'Disconnected';
-    public readonly notConnectedTooltip = 'Click to connect to a database';
-    public readonly connectingLabel = 'Connecting';
-    public readonly connectingTooltip = 'Connecting to: ';
-    public readonly connectedLabel = 'Connected.';
-    public readonly connectErrorLabel = 'Connection error';
-    public readonly connectErrorTooltip = 'Error connecting to: ';
-    public readonly connectErrorCode = 'Errorcode: ';
-    public readonly connectErrorMessage = 'ErrorMessage: ';
-    public readonly executeQueryLabel = 'Executing query ';
-    public readonly cancelingQueryLabel = 'Canceling query ';
-    public readonly updatingIntelliSenseLabel = 'Updating IntelliSense...';
-    public readonly unfoundResult = 'Data was disposed when text editor was closed; to view data please reexecute query.';
 	public readonly serviceCompatibleVersion = '1.0.0';
-    public readonly serviceNotCompatibleError = 'Client is not compatible with the service layer';
 	public readonly serviceInstallingTo = 'Installing SQL tools service to';
 	public readonly serviceInitializing = 'Initializing SQL tools service for the mssql extension.';
 	public readonly commandsNotAvailableWhileInstallingTheService = 'Note: mssql commands will be available after installing the service.';
@@ -169,40 +25,10 @@ export class Constants implements IExtensionConstants {
 	public readonly serviceInstallationFailed = 'Failed to install Sql Tools Service';
 	public readonly serviceLoadingFailed = 'Failed to load Sql Tools Service';
 	public readonly invalidServiceFilePath = 'Invalid file path for Sql Tools Service';
-    public readonly extensionNotInitializedError = 'Unable to execute the command while the extension is initializing. Please try again later.';
-    public readonly untitledScheme = 'untitled';
-    public readonly untitledSaveTimeThreshold = 10.0;
-    public readonly renamedOpenTimeThreshold = 10.0;
-    public readonly msgChangeLanguageMode = 'To use this command, you must set the language to \"SQL\". Confirm to change language mode.';
-    public readonly timeToWaitForLanguageModeChange = 10000.0;
-    public readonly msgChangedDatabaseContext = 'Changed database context to \"{0}\" for document \"{1}\"';
-    public readonly msgPromptRetryCreateProfile = 'Error: Unable to connect using the connection information provided. Retry profile creation?';
-    public readonly retryLabel = 'Retry';
-    public readonly msgConnecting = 'Connecting to server \"{0}\" on document \"{1}\".';
-    public readonly msgConnectedServerInfo = 'Connected to server \"{0}\" on document \"{1}\". Server information: {2}';
-    public readonly msgConnectionFailed = 'Error connecting to server \"{0}\". Details: {1}';
-    public readonly msgChangingDatabase = 'Changing database context to \"{0}\" on server \"{1}\" on document \"{2}\".';
-    public readonly msgChangedDatabase = 'Changed database context to \"{0}\" on server \"{1}\" on document \"{2}\".';
-    public readonly msgDisconnected = 'Disconnected on document \"{0}\"';
-    public readonly msgErrorReadingConfigFile = 'Error: Unable to load connection profiles from [{0}]. Check if the file is formatted correctly.';
-    public readonly msgErrorOpeningConfigFile = 'Error: Unable to open connection profile settings file.';
-    public readonly extConfigResultKeys = ['shortcuts', 'messagesDefaultOpen'];
-    public readonly extConfigResultFontFamily = 'resultsFontFamily';
-    public readonly extConfigResultFontSize = 'resultsFontSize';
-    public readonly titleResultsPane = 'Results: {0}';
-    public readonly macOpenSslErrorMessage = `OpenSSL version >=1.0.1 is required to connect.`;
-    public readonly macOpenSslHelpButton = 'Help';
-    public readonly macOpenSslHelpLink = 'https://github.com/Microsoft/vscode-mssql/wiki/OpenSSL-Configuration';
 	public readonly serviceName = 'SQLToolsService';
 	public readonly serviceInitializingOutputChannelName = 'SqlToolsService Initialization';
-    public readonly gettingStartedGuideLink = 'https://aka.ms/mssql-getting-started';
 	public readonly serviceCrashMessage = 'SQL Tools Service component exited unexpectedly. Please restart SQL Operations Studio.';
 	public readonly serviceCrashLink = 'https://github.com/Microsoft/vscode-mssql/wiki/SqlToolsService-Known-Issues';
-    public readonly gettingDefinitionMessage = 'Getting definition ...';
-    public readonly definitionRequestedStatus = 'DefinitionRequested';
-    public readonly definitionRequestCompletedStatus = 'DefinitionRequestCompleted';
-    public readonly updatingIntelliSenseStatus = 'updatingIntelliSense';
-    public readonly intelliSenseUpdatedStatus = 'intelliSenseUpdated';
 
 	/**
 	 * Returns a supported .NET Core Runtime ID (RID) for the current platform. The list of Runtime IDs
@@ -253,7 +79,7 @@ export class Constants implements IExtensionConstants {
 
 				// If we got here, this is not a Linux distro or architecture that we currently support.
 				throw new Error(`Unsupported Linux distro: ${distribution.name}, ${distribution.version}, ${architecture}`);
-            default :
+			default:
 				// If we got here, we've ended up with a platform we don't support  like 'freebsd' or 'sunos'.
 				// Chances are, VS Code doesn't support these platforms either.
 				throw Error('Unsupported platform ' + platform);

extensions/mssql/client/src/models/contracts.ts

@@ -1,10 +1,10 @@
 /*---------------------------------------------------------------------------------------------
-*  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-*  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
-*--------------------------------------------------------------------------------------------*/
+ *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import {RequestType} from 'dataprotocol-client';
+import { RequestType } from 'dataprotocol-client';
 import * as data from 'data';
 
 // DEV-NOTE: Still finalizing what we'll need as part of this interface
@@ -16,8 +16,6 @@ import * as data from 'data';
  * @param {boolean} appendToFile Whether we should append or overwrite the file in savePath
 */
 export class SaveResultsInfo {
-
-
 	constructor(public saveFormat: string, public savePath: string, public results: string,
 		public appendToFile: boolean) {
 	}
@@ -101,4 +99,3 @@ export interface HandleFirewallRuleResponse {
 	result: boolean;
 	ipAddress: string;
 }
-

extensions/mssql/client/src/resourceprovider/resourceprovider.ts

@@ -1,13 +1,14 @@
 /*---------------------------------------------------------------------------------------------
-*  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-*  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
-*--------------------------------------------------------------------------------------------*/
+ *--------------------------------------------------------------------------------------------*/
 'use strict';
 
 import * as Contracts from '../models/contracts';
 import { SqlToolsServiceClient } from 'extensions-modules';
 import { LanguageClient } from 'dataprotocol-client';
 import * as data from 'data';
+import * as path from 'path';
 
 
 /**
@@ -21,7 +22,7 @@ export class AzureResourceProvider implements data.ResourceProvider {
 
 	constructor(private _client?: SqlToolsServiceClient, langClient?: LanguageClient) {
 		if (!this._client) {
-            this._client = SqlToolsServiceClient.instance;
+			this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
 		}
 		this.languageClient = langClient;
 	}

extensions/mssql/client/src/serialize/iserialization.ts

@@ -1,10 +1,9 @@
 /*---------------------------------------------------------------------------------------------
-*  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-*  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
-*--------------------------------------------------------------------------------------------*/
+ *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { SaveResultsInfo } from '../models/contracts';
 import * as data from 'data';
 
 /**

extensions/mssql/client/src/serialize/serialization.ts

@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------------------------
-*  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-*  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
-*--------------------------------------------------------------------------------------------*/
+ *--------------------------------------------------------------------------------------------*/
 'use strict';
 
 import * as Contracts from '../models/contracts';
@@ -9,6 +9,7 @@ import { ISerialization } from './iserialization';
 import { SqlToolsServiceClient } from 'extensions-modules';
 import * as data from 'data';
 import { LanguageClient } from 'dataprotocol-client';
+import * as path from 'path';
 
 /**
  * Implements serializer for query results
@@ -17,7 +18,7 @@ export class Serialization implements ISerialization {
 
 	constructor(private _client?: SqlToolsServiceClient, private _languageClient?: LanguageClient) {
 		if (!this._client) {
-            this._client = SqlToolsServiceClient.instance;
+			this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
 		}
 	}
 
@@ -30,7 +31,7 @@ export class Serialization implements ISerialization {
 	public saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Promise<data.SaveResultRequestResult> {
 		let self = this;
 		let resultsInfo: Contracts.SaveResultsInfo = new Contracts.SaveResultsInfo(saveFormat, savePath, results, appendToFile);
-        return new Promise<data.SaveResultRequestResult>( (resolve, reject) => {
+		return new Promise<data.SaveResultRequestResult>((resolve, reject) => {
 			self._client
 				.sendRequest(Contracts.SaveAsRequest.type, resultsInfo, this._languageClient)
 				.then(result => {

extensions/mssql/client/src/typings/ref.d.ts

@@ -5,3 +5,4 @@
 
 /// <reference path='../../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../../src/sql/data.d.ts'/>
+/// <reference types='@types/node'/>

extensions/mssql/package.json

@@ -9,13 +9,14 @@
   "activationEvents": [
     "*"
   ],
-  "main": "./client/out/mssqlMain",
+  "main": "./client/out/main",
   "extensionDependencies": [
     "vscode.sql"
   ],
   "scripts": {
     "compile": "gulp compile-extension:mssql-client",
-    "postinstall": "node ./node_modules/vscode/bin/install"
+    "postinstall": "node ./node_modules/vscode/bin/install",
+		"update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-mssql syntaxes/SQL.plist ./syntaxes/sql.tmLanguage.json"
   },
   "contributes": {
     "languages": [
@@ -26,15 +27,7 @@
         ],
         "aliases": [
           "SQL"
-        ],
+        ]
-        "configuration": "./syntaxes/sql.configuration.json"
-      }
-    ],
-    "grammars": [
-      {
-        "language": "sql",
-        "scopeName": "source.sql",
-        "path": "./syntaxes/SQL.plist"
       }
     ],
     "outputChannels": [
@@ -46,38 +39,10 @@
         "path": "./snippets/mssql.json"
       }
     ],
-    "commands": [
-      {
-        "command": "extension.clearTokenCache",
-        "title": "%extension.clearTokenCache%",
-        "category": "Azure Accounts"
-      }
-    ],
-    "account-type": [
-      {
-        "id": "microsoft",
-        "icon": {
-          "light": "./out/account-provider/media/microsoft_account_light.svg",
-          "dark": "./out/account-provider/media/microsoft_account_dark.svg"
-        }
-      },
-      {
-        "id": "work_school",
-        "icon": {
-          "light": "./out/account-provider/media/work_school_account_light.svg",
-          "dark": "./out/account-provider/media/work_school_account_dark.svg"
-        }
-      }
-    ],
     "configuration": {
       "type": "object",
       "title": "MSSQL configuration",
       "properties": {
-        "accounts.azure.enablePublicCloud": {
-          "type": "boolean",
-          "default": true,
-          "description": "%config.enablePublicCloudDescription%"
-        },
         "mssql.query.displayBitAsNumber": {
           "type": "boolean",
           "default": true,
@@ -227,18 +192,9 @@
     }
   },
   "dependencies": {
-    "dataprotocol-client": "file:../../dataprotocol-node/client",
+    "dataprotocol-client": "file:../../dataprotocol-node/client"
-    "extensions-modules": "file:../../extensions-modules",
-    "adal-node": "0.1.25",
-    "decompress": "^4.0.0",
-    "fs-extra-promise": "^1.0.1",
-    "opener": "1.4.3",
-    "request": "2.63.0",
-    "vscode-extension-telemetry": "^0.0.8",
-    "vscode-nls": "2.0.2"
   },
   "devDependencies": {
-    "vscode": "1.0.1",
+    "vscode": "1.0.1"
-    "@types/node": "^8.0.24"
   }
 }

extensions/mssql/package.nls.json

@@ -1,7 +1,8 @@
 {
-	"extension.clearTokenCache": "Clear Azure Account Token Cache",
+	"json.schemas.desc": "Associate schemas to JSON files in the current project",
-	"config.enablePublicCloudDescription": "Should Azure public cloud integration be enabled",
+	"json.schemas.url.desc": "A URL to a schema or a relative path to a schema in the current directory",
-	"config.enableUsGovCloudDescription": "Should US Government Azure cloud (Fairfax) integration be enabled",
+	"json.schemas.fileMatch.desc": "An array of file patterns to match against when resolving JSON files to schemas.",
-	"config.enableChinaCloudDescription": "Should Azure China integration be enabled",
+	"json.schemas.fileMatch.item.desc": "A file pattern that can contain '*' to match against when resolving JSON files to schemas.",
-	"config.enableGermanyCloudDescription": "Should Azure Germany integration be enabled"
+	"json.schemas.schema.desc": "The schema definition for the given URL. The schema only needs to be provided to avoid accesses to the schema URL.",
+	"json.format.enable.desc": "Enable/disable default JSON formatter (requires restart)"
 }

extensions/mssql/snippets/mssql.json

@@ -208,10 +208,10 @@
 		"body": [
 			"-- Get a list of tables and views in the current database",
 			"SELECT table_catalog [database], table_schema [schema], table_name name, table_type type",
-			"FROM INFORMATION_SCHEMA.TABLES",
+			"FROM information_schema.tables",
 			"GO"
 		],
-		"description": "List tables and views in the current database"
+		"description": "List tables and vies in the current database"
 	},
 
 	"List databases": {
@@ -229,20 +229,47 @@
 		"body": [
 			"-- List columns in all tables whose name is like '${1:TableName}'",
 			"SELECT ",
-			"\tTableName = tbl.TABLE_SCHEMA + '.' + tbl.TABLE_NAME, ",
+			"\tTableName = tbl.table_schema + '.' + tbl.table_name, ",
-			"\tColumnName = col.COLUMN_NAME, ",
+			"\tColumnName = col.column_name, ",
-			"\tColumnDataType = col.DATA_TYPE",
+			"\tColumnDataType = col.data_type",
-			"FROM INFORMATION_SCHEMA.TABLES tbl",
+			"FROM information_schema.tables tbl",
-			"INNER JOIN INFORMATION_SCHEMA.COLUMNS col ",
+			"INNER JOIN information_schema.columns col ",
-			"\tON col.TABLE_NAME = tbl.TABLE_NAME",
+			"\tON col.table_name = tbl.table_name",
-			"\tAND col.TABLE_SCHEMA = tbl.TABLE_SCHEMA",
+			"\tAND col.table_schema = tbl.table_schema",
 			"",
-			"WHERE tbl.TABLE_TYPE = 'BASE TABLE' and tbl.TABLE_NAME like '%${1:TableName}%'",
+			"WHERE tbl.table_type = 'base table' and tbl.table_name like '%${1:TableName}%'",
 			"GO"
 		],
 		"description": "Lists all the columns and their types for tables matching a LIKE statement"
 	},
 
+	"Declare a cursor": {
+		"prefix": "sqlCursor",
+		"body": [
+			"-- Declare a cursor for a Table or a View '${1:TableOrViewName}' in schema '${2:SchemaName}'",
+			"DECLARE @Column1 NVARCHAR(50), @Column2 NVARCHAR(50)",
+			"",
+			"DECLARE db_cursor CURSOR FOR",
+			"SELECT Column1, Column2",
+			"FROM $2.$1",
+			"",
+			"OPEN db_cursor",
+			"FETCH NEXT FROM db_cursor INTO @Column1, @Column2",
+			"",
+			"WHILE @@FETCH_STATUS = 0",
+			"BEGIN",
+			"\t-- add instructions to be executed for every row",
+			"\t$3",
+			"\tFETCH NEXT FROM db_cursor INTO @Column1, @Column2",
+			"END",
+			"",
+			"CLOSE db_cursor",
+			"DEALLOCATE db_cursor",
+			"GO"
+		],
+		"description": "Declare a cursor"
+	},
+
 	"Show space used by tables": {
 		"prefix": "sqlGetSpaceUsed",
 		"body": [

extensions/mssql/syntaxes/sql.configuration.json

@@ -1,3 +0,0 @@
-{
-
-}

extensions/npm-shrinkwrap.json

@@ -1,11 +0,0 @@
-{
-  "name": "vscode-extensions",
-  "version": "0.0.1",
-  "dependencies": {
-    "typescript": {
-      "version": "2.6.1",
-      "from": "typescript@2.6.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz"
-    }
-  }
-}

extensions/package.json

@@ -3,7 +3,8 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "2.6.1"
+    "typescript": "2.6.1",
+    "extensions-modules": "file:../extensions-modules"
   },
   "scripts": {
     "postinstall": "node ./postinstall"

npm-shrinkwrap.json

@@ -1,12 +1,7 @@
 {
   "name": "sqlops",
-  "version": "0.24.0",
+  "version": "0.25.4",
   "dependencies": {
-    "zone.js": {
-      "version": "0.8.11",
-      "from": "zone.js@>=0.8.4 <0.9.0",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.11.tgz"
-    },
     "@angular/animations": {
       "version": "4.1.3",
       "from": "@angular/animations@>=4.1.3 <4.2.0",
@@ -62,20 +57,20 @@
       "from": "agent-base@>=1.0.1 <1.1.0",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz"
     },
-    "angular2-slickgrid": {
-      "version": "1.3.4",
-      "from": "git://github.com/Microsoft/angular2-slickgrid.git#1.3.5",
-      "resolved": "git://github.com/Microsoft/angular2-slickgrid.git#d122015f2f3e4023394a7e485079da62f20b8356"
-    },
     "angular2-grid": {
       "version": "2.0.6",
       "from": "angular2-grid@2.0.6",
       "resolved": "https://registry.npmjs.org/angular2-grid/-/angular2-grid-2.0.6.tgz"
     },
+    "angular2-slickgrid": {
+      "version": "1.3.6",
+      "from": "git://github.com/Microsoft/angular2-slickgrid.git#1.3.6",
+      "resolved": "git://github.com/Microsoft/angular2-slickgrid.git#0393bae34ba65464e6b6fc248b950ccea44382d9"
+    },
     "anymatch": {
-      "version": "1.3.0",
+      "version": "1.3.2",
       "from": "anymatch@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"
     },
     "applicationinsights": {
       "version": "0.17.1",
@@ -88,19 +83,19 @@
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"
     },
     "arr-flatten": {
-      "version": "1.0.3",
+      "version": "1.1.0",
       "from": "arr-flatten@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"
     },
     "array-unique": {
       "version": "0.2.1",
       "from": "array-unique@>=0.2.1 <0.3.0",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
     },
-    "arrify": {
+    "asap": {
-      "version": "1.0.1",
+      "version": "2.0.6",
-      "from": "arrify@>=1.0.0 <2.0.0",
+      "from": "asap@>=2.0.3 <2.1.0",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"
     },
     "async-each": {
       "version": "1.0.1",
@@ -108,25 +103,25 @@
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"
     },
     "balanced-match": {
-      "version": "0.4.2",
+      "version": "1.0.0",
-      "from": "balanced-match@>=0.4.1 <0.5.0",
+      "from": "balanced-match@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
     },
     "binary-extensions": {
-      "version": "1.8.0",
+      "version": "1.11.0",
       "from": "binary-extensions@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz"
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz"
     },
     "bindings": {
-      "version": "1.2.1",
+      "version": "1.3.0",
       "from": "bindings@>=1.2.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
       "optional": true
     },
     "brace-expansion": {
-      "version": "1.1.7",
+      "version": "1.1.8",
       "from": "brace-expansion@>=1.1.7 <2.0.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
     },
     "braces": {
       "version": "1.8.5",
@@ -138,35 +133,32 @@
       "from": "buffer-crc32@>=0.2.3 <0.3.0",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
     },
-    "buffer-shims": {
-      "version": "1.0.0",
-      "from": "buffer-shims@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
-    },
     "caniuse-db": {
-      "version": "1.0.30000676",
+      "version": "1.0.30000787",
       "from": "caniuse-db@>=1.0.30000161 <2.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000676.tgz"
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000787.tgz"
     },
     "chart.js": {
-      "version": "2.6.0",
+      "version": "2.7.1",
       "from": "chart.js@>=2.6.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.6.0.tgz"
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.1.tgz",
+      "dependencies": {
+        "moment": {
+          "version": "2.18.1",
+          "from": "moment@>=2.18.0 <2.19.0",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"
+        }
+      }
     },
     "chartjs-color": {
-      "version": "2.1.0",
+      "version": "2.2.0",
-      "from": "chartjs-color@>=2.1.0 <3.0.0",
+      "from": "chartjs-color@>=2.2.0 <2.3.0",
-      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.2.0.tgz"
     },
     "chartjs-color-string": {
-      "version": "0.4.0",
+      "version": "0.5.0",
-      "from": "chartjs-color-string@>=0.4.0 <0.5.0",
+      "from": "chartjs-color-string@>=0.5.0 <0.6.0",
-      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.4.0.tgz"
+      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz"
-    },
-    "chokidar": {
-      "version": "1.6.1",
-      "from": "bpasero/chokidar#vscode",
-      "resolved": "git://github.com/bpasero/chokidar.git#4c167ce0c29dae1727518998ecad63a049433e35"
     },
     "color-convert": {
       "version": "0.5.3",
@@ -174,14 +166,9 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz"
     },
     "color-name": {
-      "version": "1.1.2",
-      "from": "color-name@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"
-    },
-    "comment-json": {
       "version": "1.1.3",
-      "from": "comment-json@>=1.1.3 <2.0.0",
+      "from": "color-name@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-1.1.3.tgz"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
     },
     "concat-map": {
       "version": "0.0.1",
@@ -189,9 +176,9 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
     },
     "core-js": {
-      "version": "2.4.1",
+      "version": "2.5.3",
       "from": "core-js@>=2.4.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz"
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -199,9 +186,9 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
     },
     "debug": {
-      "version": "2.6.8",
+      "version": "2.6.9",
       "from": "debug@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
     },
     "emmet": {
       "version": "1.3.2",
@@ -218,11 +205,6 @@
       "from": "escape-string-regexp@>=1.0.2 <2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
     },
-    "esprima": {
-      "version": "2.7.3",
-      "from": "esprima@>=2.7.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"
-    },
     "expand-brackets": {
       "version": "0.1.5",
       "from": "expand-brackets@>=0.1.4 <0.2.0",
@@ -269,9 +251,9 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"
     },
     "for-in": {
-      "version": "0.1.5",
+      "version": "1.0.2",
-      "from": "for-in@>=0.1.5 <0.2.0",
+      "from": "for-in@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz"
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"
     },
     "for-own": {
       "version": "0.1.5",
@@ -283,15 +265,14 @@
       "from": "fs-extra@>=3.0.1 <4.0.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"
     },
-    "fsevents": {
+    "fs.realpath": {
-      "version": "0.3.8",
+      "version": "1.0.0",
-      "from": "bpasero/fsevents#vscode",
+      "from": "fs.realpath@>=1.0.0 <2.0.0",
-      "resolved": "git+https://github.com/bpasero/fsevents.git#fe2aaccaaffbd69a23374cf46a8c6bafe8e51b01",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-      "optional": true
     },
     "gc-signals": {
       "version": "0.0.1",
-      "from": "gc-signals@0.0.1",
+      "from": "gc-signals@>=0.0.1 <0.0.2",
       "resolved": "https://registry.npmjs.org/gc-signals/-/gc-signals-0.0.1.tgz"
     },
     "getmac": {
@@ -315,9 +296,9 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
     },
     "html-query-plan": {
-      "version": "1.0.0",
+      "version": "2.2.6",
-      "from": "git://github.com/anthonydresser/html-query-plan.git#v2.2.5",
+      "from": "git://github.com/anthonydresser/html-query-plan.git#2.2.6",
-      "resolved": "git://github.com/anthonydresser/html-query-plan.git#fbf8beac00b3870c0d3f4e95de979f7f1ec7af5d"
+      "resolved": "git://github.com/anthonydresser/html-query-plan.git#e09ffda978113c73366b663066372f884cf75e05"
     },
     "http-proxy-agent": {
       "version": "0.2.7",
@@ -334,9 +315,14 @@
       "from": "iconv-lite@0.4.15",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"
     },
+    "inflight": {
+      "version": "1.0.6",
+      "from": "inflight@>=1.0.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+    },
     "inherits": {
       "version": "2.0.3",
-      "from": "inherits@>=2.0.1 <3.0.0",
+      "from": "inherits@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
     },
     "is-arrayish": {
@@ -350,9 +336,9 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"
     },
     "is-buffer": {
-      "version": "1.1.5",
+      "version": "1.1.6",
       "from": "is-buffer@>=1.1.5 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
     },
     "is-dotfile": {
       "version": "1.0.3",
@@ -411,70 +397,63 @@
     },
     "jquery-ui": {
       "version": "1.12.1",
-      "from": "jquery-ui@>=1.12.1 <2.0.0",
+      "from": "jquery-ui@>=1.8.0",
       "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz"
     },
-    "jquery.event.drag": {
-      "version": "2.2.2",
-      "from": "jquery.event.drag@2.2.2",
-      "resolved": "https://registry.npmjs.org/jquery.event.drag/-/jquery.event.drag-2.2.2.tgz"
-    },
     "jschardet": {
-      "version": "1.5.1",
+      "version": "1.6.0",
       "from": "jschardet@>=1.5.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz"
+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz"
-    },
-    "json-parser": {
-      "version": "1.1.5",
-      "from": "json-parser@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/json-parser/-/json-parser-1.1.5.tgz"
     },
     "jsonfile": {
-      "version": "3.0.0",
+      "version": "3.0.1",
       "from": "jsonfile@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"
     },
     "keytar": {
-      "version": "4.0.5",
+      "version": "4.1.0",
-      "from": "keytar@latest",
+      "from": "keytar@>=4.0.5 <5.0.0",
-      "resolved": "https://registry.npmjs.org/keytar/-/keytar-4.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz"
-      "dependencies": {
-        "nan": {
-          "version": "2.5.1",
-          "from": "nan@2.5.1",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"
-        }
-      }
     },
     "kind-of": {
-      "version": "3.0.4",
+      "version": "3.2.2",
       "from": "kind-of@>=3.0.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "from": "klaw@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"
+    },
+    "lodash.isinteger": {
+      "version": "4.0.4",
+      "from": "lodash.isinteger@>=4.0.4 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"
+    },
+    "lodash.isundefined": {
+      "version": "3.0.1",
+      "from": "lodash.isundefined@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz"
     },
     "make-error": {
-      "version": "1.3.0",
+      "version": "1.3.2",
       "from": "make-error@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz"
     },
     "micromatch": {
       "version": "2.3.11",
       "from": "micromatch@>=2.1.5 <3.0.0",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"
     },
-    "minimatch": {
-      "version": "3.0.3",
-      "from": "minimatch@>=3.0.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"
-    },
     "minimist": {
       "version": "1.2.0",
       "from": "minimist@1.2.0",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
     },
     "moment": {
-      "version": "2.18.1",
+      "version": "2.20.1",
       "from": "moment@>=2.15.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"
     },
     "ms": {
       "version": "2.0.0",
@@ -482,9 +461,9 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
     },
     "nan": {
-      "version": "2.5.0",
+      "version": "2.5.1",
-      "from": "nan@2.5.0",
+      "from": "nan@2.5.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"
     },
     "native-keymap": {
       "version": "1.2.5",
@@ -502,27 +481,94 @@
       "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-1.6.0.tgz"
     },
     "node-pty": {
-      "version": "0.7.3",
+      "version": "0.7.0",
-      "from": "node-pty@0.7.3",
+      "from": "node-pty@0.7.0",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-0.7.3.tgz",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-0.7.0.tgz",
       "dependencies": {
         "nan": {
-          "version": "2.5.0",
+          "version": "2.8.0",
-          "from": "nan@2.5.0",
+          "from": "nan@>=2.6.2 <3.0.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"
         }
       }
     },
+    "nodegit-promise": {
+      "version": "4.0.0",
+      "from": "nodegit-promise@>=4.0.0 <4.1.0",
+      "resolved": "https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-4.0.0.tgz"
+    },
     "normalize-path": {
       "version": "2.1.1",
-      "from": "normalize-path@>=2.0.1 <3.0.0",
+      "from": "normalize-path@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"
     },
+    "nsfw": {
+      "version": "1.0.16",
+      "from": "nsfw@1.0.16",
+      "resolved": "https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz",
+      "dependencies": {
+        "fs-extra": {
+          "version": "0.26.7",
+          "from": "fs-extra@>=0.26.5 <0.27.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"
+        },
+        "jsonfile": {
+          "version": "2.4.0",
+          "from": "jsonfile@>=2.1.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"
+        }
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "from": "object.omit@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"
+    },
+    "once": {
+      "version": "1.4.0",
+      "from": "once@>=1.3.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+    },
+    "oniguruma": {
+      "version": "6.2.1",
+      "from": "oniguruma@>=6.0.1 <7.0.0",
+      "resolved": "https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz"
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "from": "parse-glob@>=3.0.4 <4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+    },
+    "pend": {
+      "version": "1.2.0",
+      "from": "pend@>=1.2.0 <1.3.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "from": "preserve@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
+    },
     "pretty-data": {
       "version": "0.40.0",
       "from": "pretty-data@>=0.40.0 <0.41.0",
       "resolved": "https://registry.npmjs.org/pretty-data/-/pretty-data-0.40.0.tgz"
     },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "from": "process-nextick-args@>=1.0.6 <1.1.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+    },
+    "promisify-node": {
+      "version": "0.3.0",
+      "from": "promisify-node@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/promisify-node/-/promisify-node-0.3.0.tgz"
+    },
     "pty.js": {
       "version": "0.3.0",
       "from": "https://github.com/Tyriar/pty.js/tarball/c75c2dcb6dcad83b0cb3ef2ae42d0448fb912642",
@@ -540,195 +586,99 @@
         }
       }
     },
-    "nsfw": {
+    "randomatic": {
-      "version": "1.0.16",
+      "version": "1.1.7",
-      "from": "nsfw@1.0.16",
+      "from": "randomatic@>=1.1.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
       "dependencies": {
-        "asap": {
+        "is-number": {
-          "version": "2.0.5",
+          "version": "3.0.0",
-          "from": "asap@>=2.0.3 <2.1.0",
+          "from": "is-number@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "from": "kind-of@^3.0.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
+            }
+          }
         },
-        "balanced-match": {
+        "kind-of": {
-          "version": "1.0.0",
-          "from": "balanced-match@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
-        },
-        "brace-expansion": {
-          "version": "1.1.8",
-          "from": "brace-expansion@>=1.1.7 <2.0.0",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "from": "concat-map@0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-        },
-        "fs-extra": {
-          "version": "0.26.7",
-          "from": "fs-extra@>=0.26.5 <0.27.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "from": "fs.realpath@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-        },
-        "glob": {
-          "version": "7.1.2",
-          "from": "glob@>=7.0.5 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "from": "graceful-fs@>=4.1.2 <5.0.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "from": "inflight@>=1.0.4 <2.0.0",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "from": "inherits@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "from": "jsonfile@>=2.1.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"
-        },
-        "klaw": {
-          "version": "1.3.1",
-          "from": "klaw@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"
-        },
-        "lodash": {
-          "version": "4.17.4",
-          "from": "lodash@>=4.6.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-        },
-        "lodash.isinteger": {
-          "version": "4.0.4",
-          "from": "lodash.isinteger@>=4.0.4 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"
-        },
-        "lodash.isundefined": {
-          "version": "3.0.1",
-          "from": "lodash.isundefined@>=3.0.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz"
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "from": "minimatch@>=3.0.4 <4.0.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-        },
-        "nan": {
-          "version": "2.6.2",
-          "from": "nan@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"
-        },
-        "nodegit-promise": {
           "version": "4.0.0",
-          "from": "nodegit-promise@>=4.0.0 <4.1.0",
+          "from": "kind-of@>=4.0.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-4.0.0.tgz"
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"
-        },
-        "once": {
-          "version": "1.4.0",
-          "from": "once@>=1.3.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-        },
-        "promisify-node": {
-          "version": "0.3.0",
-          "from": "promisify-node@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/promisify-node/-/promisify-node-0.3.0.tgz"
-        },
-        "rimraf": {
-          "version": "2.6.1",
-          "from": "rimraf@>=2.2.8 <3.0.0",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "from": "wrappy@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
         }
       }
     },
-    "object.omit": {
+    "readable-stream": {
-      "version": "2.0.0",
+      "version": "2.3.3",
-      "from": "object.omit@>=2.0.0 <3.0.0",
+      "from": "readable-stream@>=2.0.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
-    },
-    "oniguruma": {
-      "version": "6.1.1",
-      "from": "oniguruma@>=6.0.1 <7.0.0",
-      "resolved": "https://registry.npmjs.org/oniguruma/-/oniguruma-6.1.1.tgz"
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "from": "parse-glob@>=3.0.4 <4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"
-    },
-    "path-is-absolute": {
-      "version": "1.0.0",
-      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-    },
-    "pend": {
-      "version": "1.2.0",
-      "from": "pend@>=1.2.0 <1.3.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "from": "preserve@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
-    },
-    "process-nextick-args": {
-      "version": "1.0.7",
-      "from": "process-nextick-args@>=1.0.6 <1.1.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
     },
     "readdirp": {
       "version": "2.1.0",
       "from": "readdirp@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
       "dependencies": {
-        "balanced-match": {
-          "version": "1.0.0",
-          "from": "balanced-match@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
-        },
-        "brace-expansion": {
-          "version": "1.1.8",
-          "from": "brace-expansion@>=1.1.7 <2.0.0",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
-        },
         "minimatch": {
           "version": "3.0.4",
-          "from": "minimatch@>=3.0.2 <4.0.0",
+          "from": "minimatch@^3.0.2",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
         }
       }
     },
+    "reflect-metadata": {
+      "version": "0.1.10",
+      "from": "reflect-metadata@>=0.1.8 <0.2.0",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz"
+    },
     "regex-cache": {
-      "version": "0.4.3",
+      "version": "0.4.4",
       "from": "regex-cache@>=0.4.2 <0.5.0",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz"
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "from": "remove-trailing-separator@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
     },
     "repeat-element": {
       "version": "1.1.2",
       "from": "repeat-element@>=1.1.2 <2.0.0",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
     },
+    "repeat-string": {
+      "version": "1.6.1",
+      "from": "repeat-string@>=1.5.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "from": "rimraf@>=2.2.8 <3.0.0",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "from": "glob@>=7.0.5 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "from": "minimatch@>=3.0.4 <4.0.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
+        }
+      }
+    },
+    "rxjs": {
+      "version": "5.4.0",
+      "from": "rxjs@5.4.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.0.tgz"
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "from": "safe-buffer@>=5.1.1 <5.2.0",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+    },
     "semver": {
       "version": "4.3.6",
       "from": "semver@4.3.6",
@@ -739,11 +689,46 @@
       "from": "set-immediate-shim@>=1.0.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"
     },
+    "slickgrid": {
+      "version": "2.3.4",
+      "from": "anthonydresser/SlickGrid#2.3.7",
+      "resolved": "git://github.com/anthonydresser/SlickGrid.git#fa7911c34b5449f9ce1e7148480fbc24fd20743a"
+    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "from": "string_decoder@>=1.0.3 <1.1.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"
+    },
+    "svg.js": {
+      "version": "2.6.3",
+      "from": "svg.js@>=2.2.5 <3.0.0",
+      "resolved": "https://registry.npmjs.org/svg.js/-/svg.js-2.6.3.tgz"
+    },
+    "symbol-observable": {
+      "version": "1.1.0",
+      "from": "symbol-observable@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz"
+    },
+    "systemjs": {
+      "version": "0.19.40",
+      "from": "systemjs@0.19.40",
+      "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.40.tgz"
+    },
     "typechecker": {
       "version": "2.0.8",
       "from": "typechecker@>=2.0.1 <2.1.0",
       "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz"
     },
+    "underscore": {
+      "version": "1.8.3",
+      "from": "underscore@>=1.8.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"
+    },
+    "universalify": {
+      "version": "0.1.1",
+      "from": "universalify@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz"
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "from": "util-deprecate@>=1.0.1 <1.1.0",
@@ -754,6 +739,11 @@
       "from": "jrieken/v8-profiler#vscode",
       "resolved": "git://github.com/jrieken/v8-profiler.git#5e4a336693e1d5b079c7aecd286a1abcfbc10421"
     },
+    "vscode-chokidar": {
+      "version": "1.6.2",
+      "from": "vscode-chokidar@1.6.2",
+      "resolved": "https://registry.npmjs.org/vscode-chokidar/-/vscode-chokidar-1.6.2.tgz"
+    },
     "vscode-debugprotocol": {
       "version": "1.24.0",
       "from": "vscode-debugprotocol@1.24.0",
@@ -766,94 +756,9 @@
     },
     "vscode-textmate": {
       "version": "3.2.0",
-      "from": "vscode-textmate@3.2.0",
+      "from": "vscode-textmate@>=3.2.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-3.2.0.tgz"
     },
-    "winreg": {
-      "version": "1.2.0",
-      "from": "winreg@1.2.0",
-      "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.0.tgz"
-    },
-    "windows-process-tree": {
-      "version": "0.1.6",
-      "from": "windows-process-tree@0.1.6",
-      "resolved": "https://registry.npmjs.org/windows-process-tree/-/windows-process-tree-0.1.6.tgz"
-    },
-    "xterm": {
-      "version": "2.9.1",
-      "from": "Tyriar/xterm.js#vscode-release/1.18",
-      "resolved": "git+https://github.com/Tyriar/xterm.js.git#074dbb562062423e322300a513869eed1836a9ba"
-    },
-    "yauzl": {
-      "version": "2.8.0",
-      "from": "yauzl@2.8.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz"
-    },
-    "randomatic": {
-      "version": "1.1.6",
-      "from": "randomatic@>=1.1.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz"
-    },
-    "readable-stream": {
-      "version": "2.2.10",
-      "from": "readable-stream@>=2.0.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz"
-    },
-    "reflect-metadata": {
-      "version": "0.1.10",
-      "from": "reflect-metadata@>=0.1.8 <0.2.0",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz"
-    },
-    "remove-trailing-separator": {
-      "version": "1.0.1",
-      "from": "remove-trailing-separator@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz"
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "from": "repeat-string@>=1.5.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz"
-    },
-    "rxjs": {
-      "version": "5.4.0",
-      "from": "rxjs@5.4.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.0.tgz"
-    },
-    "safe-buffer": {
-      "version": "5.1.0",
-      "from": "safe-buffer@>=5.0.1 <6.0.0",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz"
-    },
-    "slickgrid": {
-      "version": "2.3.6",
-      "from": "anthonydresser/SlickGrid#2.3.7",
-      "resolved": "git://github.com/anthonydresser/SlickGrid.git#fa7911c34b5449f9ce1e7148480fbc24fd20743a"
-    },
-    "string_decoder": {
-      "version": "1.0.1",
-      "from": "string_decoder@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz"
-    },
-    "symbol-observable": {
-      "version": "1.0.4",
-      "from": "symbol-observable@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"
-    },
-    "systemjs": {
-      "version": "0.19.40",
-      "from": "systemjs@0.19.40",
-      "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.40.tgz"
-    },
-    "underscore": {
-      "version": "1.8.3",
-      "from": "underscore@>=1.8.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"
-    },
-    "universalify": {
-      "version": "0.1.0",
-      "from": "universalify@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.0.tgz"
-    },
     "when": {
       "version": "3.7.8",
       "from": "when@>=3.7.5 <4.0.0",
@@ -870,6 +775,45 @@
       "from": "windows-mutex@>=0.2.0 <0.3.0",
       "resolved": "https://registry.npmjs.org/windows-mutex/-/windows-mutex-0.2.0.tgz",
       "optional": true
+    },
+    "windows-process-tree": {
+      "version": "0.1.6",
+      "from": "windows-process-tree@0.1.6",
+      "resolved": "https://registry.npmjs.org/windows-process-tree/-/windows-process-tree-0.1.6.tgz",
+      "optional": true,
+      "dependencies": {
+        "nan": {
+          "version": "2.8.0",
+          "from": "nan@>=2.6.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
+          "optional": true
+        }
+      }
+    },
+    "winreg": {
+      "version": "1.2.0",
+      "from": "winreg@1.2.0",
+      "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.0.tgz"
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "from": "wrappy@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+    },
+    "xterm": {
+      "version": "2.9.1",
+      "from": "Tyriar/xterm.js#vscode-release/1.18",
+      "resolved": "git://github.com/Tyriar/xterm.js.git#074dbb562062423e322300a513869eed1836a9ba"
+    },
+    "yauzl": {
+      "version": "2.8.0",
+      "from": "yauzl@2.8.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz"
+    },
+    "zone.js": {
+      "version": "0.8.19",
+      "from": "zone.js@>=0.8.4 <0.9.0",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.19.tgz"
     }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlops",
-  "version": "0.24.1",
+  "version": "0.25.4",
   "electronVersion": "1.7.9",
   "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
   "author": {
@@ -33,11 +33,9 @@
     "@angular/router": "~4.1.3",
     "@angular/upgrade": "~4.1.3",
     "angular2-grid": "2.0.6",
-    "angular2-slickgrid": "git://github.com/Microsoft/angular2-slickgrid.git#1.3.5",
+    "angular2-slickgrid": "git://github.com/Microsoft/angular2-slickgrid.git#1.3.6",
     "applicationinsights": "0.17.1",
     "chart.js": "^2.6.0",
-    "chokidar": "bpasero/chokidar#vscode",
-    "comment-json": "^1.1.3",
     "core-js": "^2.4.1",
     "emmet": "ramya-rao-a/emmet#vscode",
     "error-ex": "^1.3.0",
@@ -47,13 +45,11 @@
     "gc-signals": "^0.0.1",
     "getmac": "1.0.7",
     "graceful-fs": "4.1.11",
-    "html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#v2.2.5",
+    "html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#2.2.6",
     "http-proxy-agent": "0.2.7",
     "https-proxy-agent": "0.3.6",
     "iconv-lite": "0.4.15",
     "jquery": "^2.2.0",
-    "jquery-ui": "^1.12.1",
-    "jquery.event.drag": "2.2.2",
     "make-error": "^1.1.1",
     "jschardet": "^1.5.1",
     "keytar": "^4.0.5",
@@ -74,6 +70,7 @@
     "systemjs": "0.19.40",
     "underscore": "^1.8.3",
     "v8-profiler": "jrieken/v8-profiler#vscode",
+    "vscode-chokidar": "1.6.2",
     "vscode-debugprotocol": "1.24.0",
     "vscode-ripgrep": "0.6.0-patch.0.2",
     "vscode-textmate": "^3.2.0",
@@ -150,7 +147,6 @@
     "typescript-formatter": "4.0.1",
     "uglify-js": "mishoo/UglifyJS2#harmony-v2.8.22",
     "uglify-es": "^3.0.18",
-    "underscore": "^1.8.2",
     "vinyl": "^0.4.5",
     "vinyl-fs": "^2.4.3",
     "vsce": "^1.25.1",

product.json

@@ -28,5 +28,7 @@
 	"releaseNotesUrl": "https://go.microsoft.com/fwlink/?linkid=862039",
 	"documentationUrl": "https://go.microsoft.com/fwlink/?linkid=862277",
 	"commit": "9ca6200018fc206d67a47229f991901a8a453781",
-	"date": "2017-12-15T12:00:00.000Z"
+	"date": "2017-12-15T12:00:00.000Z",
+	"updateUrl": "https://sqlops-update.azurewebsites.net",
+	"quality": "stable"
 }

src/sql/parts/accountManagement/accountListStatusbar/accountListStatusbarItem.ts

@@ -7,25 +7,35 @@
 
 import 'vs/css!./media/accountListStatusbarItem';
 import { Action, IAction } from 'vs/base/common/actions';
-import { combinedDisposable, IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { $, append } from 'vs/base/browser/dom';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { localize } from 'vs/nls';
 import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { Themable, STATUS_BAR_FOREGROUND } from 'vs/workbench/common/theme';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 import { IAccountManagementService } from 'sql/services/accountManagement/interfaces';
 
-export class AccountListStatusbarItem implements IStatusbarItem {
+export class AccountListStatusbarItem extends Themable implements IStatusbarItem {
-	private _toDispose: IDisposable[];
 	private _manageLinkedAccountAction: IAction;
+	private _icon: HTMLElement;
 
 	constructor(
 		@IInstantiationService private _instantiationService: IInstantiationService,
-		@IAccountManagementService private _accountManagementService: IAccountManagementService
+		@IAccountManagementService private _accountManagementService: IAccountManagementService,
+		@IThemeService themeService: IThemeService
 	) {
-		this._toDispose = [];
+		super(themeService);
+	}
+
+	protected updateStyles(): void {
+		super.updateStyles();
+		if (this._icon) {
+			this._icon.style.backgroundColor = this.getColor(STATUS_BAR_FOREGROUND);
+		}
 	}
 
 	public render(container: HTMLElement): IDisposable {
@@ -34,9 +44,11 @@ export class AccountListStatusbarItem implements IStatusbarItem {
 		const accountElement = append(rootElement, $('a.linked-account-status-selection'));
 		accountElement.title = ManageLinkedAccountAction.LABEL;
 		accountElement.onclick = () => this._onClick();
-		append(accountElement, $('.linked-account-icon'));
+		this._icon = append(accountElement, $('.linked-account-icon'));
 
-		return combinedDisposable(this._toDispose);
+		this.updateStyles();
+
+		return this;
 	}
 
 	private _onClick() {

src/sql/parts/accountManagement/accountListStatusbar/media/accountListStatusbarItem.css

@@ -6,7 +6,6 @@
 .statusbar-item .linked-account-staus a.linked-account-status-selection .linked-account-icon {
 	-webkit-mask: url('accounts_statusbar_inverse.svg') no-repeat 50% 50%;
 	-webkit-mask-size: 12px;
-	background-color: rgb(255, 255, 255);
 	width: 12px;
 	height: 22px;
 }

src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts

@@ -93,7 +93,7 @@ export class FirewallRuleDialog extends Modal {
 
 	protected renderBody(container: HTMLElement) {
 		let descriptionSection;
-		$().div({ class: 'firewall-rule-description-section new-section' }, (descriptionContainer) => {
+		$().div({ 'class': 'firewall-rule-description-section new-section' }, (descriptionContainer) => {
 			descriptionSection = descriptionContainer.getHTMLElement();
 			DOM.append(descriptionContainer.getHTMLElement(), DOM.$('div.firewall-rule-icon'));
 
@@ -101,9 +101,11 @@ export class FirewallRuleDialog extends Modal {
 			let dialogDescription = localize('firewallRuleDialogDescription',
 				'Your client IP address does not have access to the server. Sign in to an Azure account and create a new firewall rule to enable access.');
 			this.createLabelElement(new Builder(textDescriptionContainer), dialogDescription, false);
-			this._helpLink = DOM.append(textDescriptionContainer, DOM.$('a.help-link'));
+
-			this._helpLink.setAttribute('href', 'https://docs.microsoft.com/en-us/azure/sql-database/sql-database-firewall-configure');
+			// TODO: Make this 1) extensible and 2) open the info via an action (01/08/2018, https://github.com/Microsoft/sqlopsstudio/issues/450)
-			this._helpLink.innerHTML += localize('firewallRuleHelpDescription', 'Learn more about firewall settings');
+			// this._helpLink = DOM.append(textDescriptionContainer, DOM.$('a.help-link'));
+			// this._helpLink.setAttribute('href', 'https://docs.microsoft.com/en-us/azure/sql-database/sql-database-firewall-configure');
+			// this._helpLink.innerHTML += localize('firewallRuleHelpDescription', 'Learn more about firewall settings');
 		});
 
 		// Create account picker with event handling
@@ -116,43 +118,43 @@ export class FirewallRuleDialog extends Modal {
 		this._accountPickerService.onAccountSelectionChangeEvent((account) => this.onAccountSelectionChange(account));
 
 		let azureAccountSection;
-		$().div({ class: 'azure-account-section new-section' }, (azureAccountContainer) => {
+		$().div({ 'class': 'azure-account-section new-section' }, (azureAccountContainer) => {
 			azureAccountSection = azureAccountContainer.getHTMLElement();
 			let azureAccountLabel = localize('azureAccount', 'Azure account');
 			this.createLabelElement(azureAccountContainer, azureAccountLabel, true);
-			azureAccountContainer.div({ class: 'dialog-input' }, (inputCellContainer) => {
+			azureAccountContainer.div({ 'class': 'dialog-input' }, (inputCellContainer) => {
 				this._accountPickerService.renderAccountPicker(inputCellContainer.getHTMLElement());
 			});
 		});
 
 		let subnetIPRangeSection;
-		$().div({ class: 'subnet-ip-range-input' }, (subnetIPRangeContainer) => {
+		$().div({ 'class': 'subnet-ip-range-input' }, (subnetIPRangeContainer) => {
 			subnetIPRangeSection = subnetIPRangeContainer.getHTMLElement();
-			subnetIPRangeContainer.div({ class: 'dialog-input-section' }, (inputContainer) => {
+			subnetIPRangeContainer.div({ 'class': 'dialog-input-section' }, (inputContainer) => {
-				inputContainer.div({ class: 'dialog-label' }, (labelContainer) => {
+				inputContainer.div({ 'class': 'dialog-label' }, (labelContainer) => {
 					labelContainer.innerHtml(localize('from', 'From'));
 				});
 
-				inputContainer.div({ class: 'dialog-input' }, (inputCellContainer) => {
+				inputContainer.div({ 'class': 'dialog-input' }, (inputCellContainer) => {
 					this._fromRangeinputBox = new InputBox(inputCellContainer.getHTMLElement(), this._contextViewService);
 				});
 
-				inputContainer.div({ class: 'dialog-label' }, (labelContainer) => {
+				inputContainer.div({ 'class': 'dialog-label' }, (labelContainer) => {
 					labelContainer.innerHtml(localize('to', 'To'));
 				});
 
-				inputContainer.div({ class: 'dialog-input' }, (inputCellContainer) => {
+				inputContainer.div({ 'class': 'dialog-input' }, (inputCellContainer) => {
 					this._toRangeinputBox = new InputBox(inputCellContainer.getHTMLElement(), this._contextViewService);
 				});
 			});
 		});
 
 		let firewallRuleSection;
-		$().div({ class: 'firewall-rule-section new-section' }, (firewallRuleContainer) => {
+		$().div({ 'class': 'firewall-rule-section new-section' }, (firewallRuleContainer) => {
 			firewallRuleSection = firewallRuleContainer.getHTMLElement();
 			let firewallRuleLabel = localize('filewallRule', 'Firewall rule');
 			this.createLabelElement(firewallRuleContainer, firewallRuleLabel, true);
-			firewallRuleContainer.div({ class: 'radio-section' }, (radioContainer) => {
+			firewallRuleContainer.div({ 'class': 'radio-section' }, (radioContainer) => {
 				const form = DOM.append(radioContainer.getHTMLElement(), DOM.$('form.firewall-rule'));
 				const IPAddressDiv = DOM.append(form, DOM.$('div.firewall-ip-address dialog-input'));
 				const subnetIPRangeDiv = DOM.append(form, DOM.$('div.firewall-subnet-ip-range dialog-input'));
@@ -177,7 +179,7 @@ export class FirewallRuleDialog extends Modal {
 			});
 		});
 
-		new Builder(container).div({ class: 'firewall-rule-dialog' }, (builder) => {
+		new Builder(container).div({ 'class': 'firewall-rule-dialog' }, (builder) => {
 			builder.append(descriptionSection);
 			builder.append(azureAccountSection);
 			builder.append(firewallRuleSection);
@@ -214,7 +216,7 @@ export class FirewallRuleDialog extends Modal {
 		if (isHeader) {
 			className += ' header';
 		}
-		container.div({ class: className }, (labelContainer) => {
+		container.div({ 'class': className }, (labelContainer) => {
 			labelContainer.innerHtml(content);
 		});
 	}

src/sql/parts/connection/common/connectionManagement.ts

@@ -220,6 +220,8 @@ export interface IConnectionManagementService {
 
 	canChangeConnectionConfig(profile: ConnectionProfile, newGroupID: string): boolean;
 
+	getTabColorForUri(uri: string): string;
+
 	/**
 	 * Sends a notification that the language flavor for a given URI has changed.
 	 * For SQL, this would be the specific SQL implementation being used.

src/sql/parts/connection/common/connectionManagementService.ts

@@ -29,6 +29,7 @@ import * as TelemetryUtils from 'sql/common/telemetryUtilities';
 import { warn } from 'sql/base/common/log';
 import { IResourceProviderService } from 'sql/parts/accountManagement/common/interfaces';
 import { IAngularEventingService, AngularEventType } from 'sql/services/angularEventing/angularEventingService';
+import * as QueryConstants from 'sql/parts/query/common/constants';
 
 import * as data from 'data';
 
@@ -148,6 +149,11 @@ export class ConnectionManagementService implements IConnectionManagementService
 
 		this.disposables.push(this._onAddConnectionProfile);
 		this.disposables.push(this._onDeleteConnectionProfile);
+
+		// Refresh editor titles when connections start/end/change to ensure tabs are colored correctly
+		this.onConnectionChanged(() => this.refreshEditorTitles());
+		this.onConnect(() => this.refreshEditorTitles());
+		this.onDisconnect(() => this.refreshEditorTitles());
 	}
 
 	// Event Emitters
@@ -953,7 +959,6 @@ export class ConnectionManagementService implements IConnectionManagementService
 		return this._connectionStore.changeGroupIdForConnection(source, targetGroupId).then(result => {
 			if (id && targetGroupId) {
 				source.groupId = targetGroupId;
-				this._connectionStatusManager.updateConnectionProfile(source, id);
 			}
 		});
 	}
@@ -1220,6 +1225,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 	public editGroup(group: ConnectionProfileGroup): Promise<any> {
 		return new Promise<string>((resolve, reject) => {
 			this._connectionStore.editGroup(group).then(groupId => {
+				this.refreshEditorTitles();
 				this._onAddConnectionProfile.fire();
 				resolve(null);
 			}).catch(err => {
@@ -1324,4 +1330,25 @@ export class ConnectionManagementService implements IConnectionManagementService
 		}
 		return Promise.reject('The given URI is not currently connected');
 	}
+
+	public getTabColorForUri(uri: string): string {
+		if (WorkbenchUtils.getSqlConfigValue<string>(this._workspaceConfigurationService, 'tabColorMode') === QueryConstants.tabColorModeOff) {
+			return undefined;
+		}
+		let connectionProfile = this.getConnectionProfile(uri);
+		if (!connectionProfile) {
+			return undefined;
+		}
+		let matchingGroup = this._connectionStore.getGroupFromId(connectionProfile.groupId);
+		if (!matchingGroup) {
+			return undefined;
+		}
+		return matchingGroup.color;
+	}
+
+	private refreshEditorTitles(): void {
+		if (this._editorGroupService instanceof EditorPart) {
+			this._editorGroupService.refreshEditorTitles();
+		}
+	}
 }

src/sql/parts/connection/common/connectionStatus.ts

@@ -147,11 +147,11 @@ export class ConnectionStatusbarItem implements IStatusbarItem {
 		}
 
 		let tooltip: string =
-			'Server name: ' + connectionProfile.serverName + '\r\n' +
+			'Server: ' + connectionProfile.serverName + '\r\n' +
-			'Database name: ' + (connectionProfile.databaseName ? connectionProfile.databaseName : '<default>') + '\r\n';
+			'Database: ' + (connectionProfile.databaseName ? connectionProfile.databaseName : '<default>') + '\r\n';
 
 		if (connectionProfile.userName && connectionProfile.userName !== '') {
-			tooltip = tooltip + 'Login name: ' + connectionProfile.userName + '\r\n';
+			tooltip = tooltip + 'Login: ' + connectionProfile.userName + '\r\n';
 		}
 
 		this._connectionElement.textContent = text;

src/sql/parts/connection/common/connectionStore.ts

@@ -19,7 +19,6 @@ import { ConfigurationEditingService } from 'vs/workbench/services/configuration
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
 import * as data from 'data';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 const MAX_CONNECTIONS_DEFAULT = 25;
 
@@ -490,6 +489,11 @@ export class ConnectionStore {
 		return result;
 	}
 
+	public getGroupFromId(groupId: string): IConnectionProfileGroup {
+		let groups = this._connectionConfig.getAllGroups();
+		return groups.find(group => group.id === groupId);
+	}
+
 	private getMaxRecentConnectionsCount(): number {
 		let config = this._workspaceConfigurationService.getConfiguration(Constants.sqlConfigSectionName);
 

src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts

@@ -4,10 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 import 'vs/css!./media/connectionDialog';
 
-import nls = require('vs/nls');
 import { Button } from 'sql/base/browser/ui/button/button';
 import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/styler';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
 import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
 import { Modal } from 'sql/base/browser/ui/modal/modal';
@@ -16,24 +14,28 @@ import * as DialogHelper from 'sql/base/browser/ui/modal/dialogHelper';
 import { TreeCreationUtils } from 'sql/parts/registeredServer/viewlet/treeCreationUtils';
 import { TreeUpdateUtils } from 'sql/parts/registeredServer/viewlet/treeUpdateUtils';
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
+import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel';
+import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/parts/connection/connectionDialog/recentConnectionTreeController';
+import { SavedConnectionTreeController } from 'sql/parts/connection/connectionDialog/savedConnectionTreeController';
+import * as TelemetryKeys from 'sql/common/telemetryKeys';
+
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import * as styler from 'vs/platform/theme/common/styler';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import Event, { Emitter } from 'vs/base/common/event';
 import { Builder, $ } from 'vs/base/browser/builder';
 import { ICancelableEvent } from 'vs/base/parts/tree/browser/treeDefaults';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import * as TelemetryKeys from 'sql/common/telemetryKeys';
 import { localize } from 'vs/nls';
-import * as DOM from 'vs/base/browser/dom';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
-import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/parts/connection/connectionDialog/recentConnectionTreeController';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IMessageService, IConfirmation } from 'vs/platform/message/common/message';
+import * as styler from 'vs/platform/theme/common/styler';
+import { TPromise } from 'vs/base/common/winjs.base';
+import * as DOM from 'vs/base/browser/dom';
 
 export interface OnShowUIResponse {
 	selectedProviderType: string;
@@ -44,14 +46,20 @@ export class ConnectionDialogWidget extends Modal {
 	private _bodyBuilder: Builder;
 	private _recentConnectionBuilder: Builder;
 	private _noRecentConnectionBuilder: Builder;
+	private _savedConnectionBuilder: Builder;
+	private _noSavedConnectionBuilder: Builder;
 	private _dividerBuilder: Builder;
 	private _connectButton: Button;
 	private _closeButton: Button;
 	private _providerTypeSelectBox: SelectBox;
 	private _newConnectionParams: INewConnectionParams;
 	private _recentConnectionTree: ITree;
+	private _savedConnectionTree: ITree;
 	private $connectionUIContainer: Builder;
 
+	private _panel: TabbedPanel;
+	private _recentConnectionTabId: PanelTabIdentifier;
+
 	private _onInitDialog = new Emitter<void>();
 	public onInitDialog: Event<void> = this._onInitDialog.event;
 
@@ -86,16 +94,69 @@ export class ConnectionDialogWidget extends Modal {
 	}
 
 	protected renderBody(container: HTMLElement): void {
-		this._bodyBuilder = new Builder(container);
+		let connectionContainer = $('.connection-dialog');
+		container.appendChild(connectionContainer.getHTMLElement());
+
+		this._bodyBuilder = new Builder(connectionContainer.getHTMLElement());
 		this._providerTypeSelectBox = new SelectBox(this.providerTypeOptions, this.selectedProviderType);
 
-		this._bodyBuilder.div({ class: 'connection-recent', id: 'recentConnection' }, (builder) => {
+		// Recent connection tab
+		let recentConnectionTab = $('.connection-recent-tab');
+		recentConnectionTab.div({ class: 'connection-recent', id: 'recentConnection' }, (builder) => {
 			this._recentConnectionBuilder = new Builder(builder.getHTMLElement());
 			this._noRecentConnectionBuilder = new Builder(builder.getHTMLElement());
 			this.createRecentConnections();
 			this._recentConnectionBuilder.hide();
 		});
 
+		// Saved connection tab
+		let savedConnectionTab = $('.connection-saved-tab');
+		savedConnectionTab.div({ class: 'connection-saved' }, (builder) => {
+			this._savedConnectionBuilder = new Builder(builder.getHTMLElement());
+			this._noSavedConnectionBuilder = new Builder(builder.getHTMLElement());
+			this.createSavedConnections();
+			this._savedConnectionBuilder.hide();
+		});
+
+		this._panel = new TabbedPanel(connectionContainer.getHTMLElement());
+		this._recentConnectionTabId = this._panel.pushTab({
+			identifier: 'recent_connection',
+			title: localize('recentConnectionTitle', 'Recent connections'),
+			view: {
+				render: c => {
+					recentConnectionTab.appendTo(c);
+				},
+				layout: () => { }
+			}
+		});
+
+		let savedConnectionTabId = this._panel.pushTab({
+			identifier: 'saved_connection',
+			title: localize('savedConnectionTitle', 'Saved connections'),
+			view: {
+				layout: () => { },
+				render: c => {
+					savedConnectionTab.appendTo(c);
+				}
+			}
+		});
+
+		this._panel.onTabChange(c => {
+			if (c === savedConnectionTabId && this._savedConnectionTree.getContentHeight() === 0) {
+				// Update saved connection tree
+				TreeUpdateUtils.structuralTreeUpdate(this._savedConnectionTree, 'saved', this._connectionManagementService);
+
+				if (this._savedConnectionTree.getContentHeight() > 0) {
+					this._noSavedConnectionBuilder.hide();
+					this._savedConnectionBuilder.show();
+				} else {
+					this._noSavedConnectionBuilder.show();
+					this._savedConnectionBuilder.hide();
+				}
+				this._savedConnectionTree.layout(DOM.getTotalHeight(this._savedConnectionTree.getHTMLElement()));
+			}
+		});
+
 		this._bodyBuilder.div({ class: 'Connection-divider' }, (dividerContainer) => {
 			this._dividerBuilder = dividerContainer;
 		});
@@ -194,7 +255,7 @@ export class ConnectionDialogWidget extends Modal {
 	private clearRecentConnectionList(): TPromise<boolean> {
 
 		let confirm: IConfirmation = {
-			message: nls.localize('clearRecentConnectionMessage', 'Are you sure you want to delete all the connections from the list?'),
+			message: localize('clearRecentConnectionMessage', 'Are you sure you want to delete all the connections from the list?'),
 			primaryButton: localize('yes', 'Yes'),
 			secondaryButton: localize('no', 'No'),
 			type: 'question'
@@ -214,11 +275,11 @@ export class ConnectionDialogWidget extends Modal {
 	private createRecentConnectionList(): void {
 		this._recentConnectionBuilder.div({ class: 'connection-recent-content' }, (recentConnectionContainer) => {
 			let recentHistoryLabel = localize('recentHistory', 'Recent history');
-			recentConnectionContainer.div({ class: 'recent-titles-container'}, (container) => {
+			recentConnectionContainer.div({ class: 'recent-titles-container' }, (container) => {
 				container.div({ class: 'connection-history-label' }, (recentTitle) => {
 					recentTitle.innerHtml(recentHistoryLabel);
 				});
-				container.div({ class: 'search-action clear-search-results'}, (clearSearchIcon) => {
+				container.div({ class: 'search-action clear-search-results' }, (clearSearchIcon) => {
 					clearSearchIcon.on('click', () => this.clearRecentConnectionList());
 				});
 			});
@@ -227,7 +288,7 @@ export class ConnectionDialogWidget extends Modal {
 					let leftClick = (element: any, eventish: ICancelableEvent, origin: string) => {
 						// element will be a server group if the tree is clicked rather than a item
 						if (element instanceof ConnectionProfile) {
-							this.onRecentConnectionClick({ payload: { origin: origin, originalEvent: eventish } }, element);
+							this.onConnectionClick({ payload: { origin: origin, originalEvent: eventish } }, element);
 						}
 					};
 					let actionProvider = this._instantiationService.createInstance(RecentConnectionActionsProvider, this._instantiationService, this._connectionManagementService,
@@ -238,7 +299,7 @@ export class ConnectionDialogWidget extends Modal {
 					});
 					controller.onRecentConnectionRemoved(() => {
 						this.open(this._connectionManagementService.getRecentConnections().length > 0);
-					})
+					});
 					this._recentConnectionTree = TreeCreationUtils.createConnectionTree(treeContainer.getHTMLElement(), this._instantiationService, controller);
 
 					// Theme styler
@@ -252,18 +313,46 @@ export class ConnectionDialogWidget extends Modal {
 	private createRecentConnections() {
 		this.createRecentConnectionList();
 		this._noRecentConnectionBuilder.div({ class: 'connection-recent-content' }, (noRecentConnectionContainer) => {
-			let recentHistoryLabel = localize('recentHistory', 'Recent history');
+			let noRecentHistoryLabel = localize('noRecentConnections', 'No recent connection');
-			noRecentConnectionContainer.div({ class: 'connection-history-label' }, (recentTitle) => {
-				recentTitle.innerHtml(recentHistoryLabel);
-			});
-			let noRecentHistoryLabel = localize('noRecentConnections', 'No Recent Connections');
 			noRecentConnectionContainer.div({ class: 'no-recent-connections' }, (noRecentTitle) => {
 				noRecentTitle.innerHtml(noRecentHistoryLabel);
 			});
 		});
 	}
 
-	private onRecentConnectionClick(event: any, element: IConnectionProfile) {
+	private createSavedConnectionList(): void {
+		this._savedConnectionBuilder.div({ class: 'connection-saved-content' }, (savedConnectioncontainer) => {
+			savedConnectioncontainer.div({ class: 'server-explorer-viewlet' }, (divContainer: Builder) => {
+				divContainer.div({ class: 'explorer-servers' }, (treeContainer: Builder) => {
+					let leftClick = (element: any, eventish: ICancelableEvent, origin: string) => {
+						// element will be a server group if the tree is clicked rather than a item
+						if (element instanceof ConnectionProfile) {
+							this.onConnectionClick({ payload: { origin: origin, originalEvent: eventish } }, element);
+						}
+					};
+
+					let controller = new SavedConnectionTreeController(leftClick);
+					this._savedConnectionTree = TreeCreationUtils.createConnectionTree(treeContainer.getHTMLElement(), this._instantiationService, controller);
+
+					// Theme styler
+					this._register(styler.attachListStyler(this._savedConnectionTree, this._themeService));
+					divContainer.append(this._savedConnectionTree.getHTMLElement());
+				});
+			});
+		});
+	}
+
+	private createSavedConnections() {
+		this.createSavedConnectionList();
+		this._noSavedConnectionBuilder.div({ class: 'connection-saved-content' }, (noSavedConnectionContainer) => {
+			let noSavedConnectionLabel = localize('noSavedConnections', 'No saved connection');
+			noSavedConnectionContainer.div({ class: 'no-saved-connections' }, (titleContainer) => {
+				titleContainer.innerHtml(noSavedConnectionLabel);
+			});
+		});
+	}
+
+	private onConnectionClick(event: any, element: IConnectionProfile) {
 		let isMouseOrigin = event.payload && (event.payload.origin === 'mouse');
 		let isDoubleClick = isMouseOrigin && event.payload.originalEvent && event.payload.originalEvent.detail === 2;
 		if (isDoubleClick) {
@@ -280,6 +369,7 @@ export class ConnectionDialogWidget extends Modal {
 	 * @param recentConnections Are there recent connections that should be shown
 	 */
 	public open(recentConnections: boolean) {
+		this._panel.showTab(this._recentConnectionTabId);
 		this.show();
 		if (recentConnections) {
 			this._noRecentConnectionBuilder.hide();
@@ -289,6 +379,10 @@ export class ConnectionDialogWidget extends Modal {
 			this._noRecentConnectionBuilder.show();
 		}
 		TreeUpdateUtils.structuralTreeUpdate(this._recentConnectionTree, 'recent', this._connectionManagementService);
+
+		// reset saved connection tree
+		this._savedConnectionTree.setInput([]);
+
 		// call layout with view height
 		this.layout();
 		this.initDialog();

src/sql/parts/connection/connectionDialog/media/connectionDialog.css

@@ -14,16 +14,23 @@
 	padding-bottom: 5px;
 }
 
-.connection-recent {
+.connection-dialog {
+	height: calc(100% - 20px);
+}
+
+.connection-dialog .tabbedPanel {
+	border-top-color: transparent;
+	height: calc(100% - 350px);
+}
+
+.connection-recent, .connection-saved {
 	margin: 15px;
-	height: calc(100% - 400px);
+	height: calc(100% - 60px);
 	overflow-y: auto;
 }
 
-.no-recent-connections {
+.no-recent-connections, .no-saved-connections {
 	font-size: 12px;
-	text-align: left;
-	display: block;
 	padding-top: 5px;
 }
 
@@ -52,6 +59,10 @@
 	table-layout: fixed;
 }
 
+.connection-saved-content {
+	height: 100%;
+}
+
 .connection-type {
 	margin: 15px;
 	overflow-y: hidden;

src/sql/parts/connection/connectionDialog/recentConnectionTreeController.ts

@@ -89,7 +89,7 @@ export class RecentConnectionTreeController extends DefaultController {
 
 	protected onRightClick(tree: ITree, element: any, eventish: ICancelableEvent, origin: string = 'mouse'): boolean {
 		this.clickcb(element, eventish, origin);
-		this.onContextMenu(tree, element, event);
+		this.showContextMenu(tree, element, event);
 		return true;
 	}
 
@@ -113,7 +113,7 @@ export class RecentConnectionTreeController extends DefaultController {
 		return super.onKeyDown(tree, event);
 	}
 
-	public onContextMenu(tree: ITree, element: any, event: any): boolean {
+	public showContextMenu(tree: ITree, element: any, event: any): boolean {
 		var actionContext: any;
 
 		if (element instanceof ConnectionProfile) {
@@ -136,7 +136,6 @@ export class RecentConnectionTreeController extends DefaultController {
 			},
 			getActionsContext: () => (actionContext)
 		});
-
 		return true;
 	}
 }

src/sql/parts/connection/connectionDialog/savedConnectionTreeController.ts

@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { DefaultController, ICancelableEvent } from 'vs/base/parts/tree/browser/treeDefaults';
+import { ITree } from 'vs/base/parts/tree/browser/tree';
+import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+
+export class SavedConnectionTreeController extends DefaultController {
+	constructor(private clickcb: (element: any, eventish: ICancelableEvent, origin: string) => void) {
+		super();
+	}
+
+	protected onLeftClick(tree: ITree, element: any, eventish: ICancelableEvent, origin: string = 'mouse'): boolean {
+		this.clickcb(element, eventish, origin);
+		return super.onLeftClick(tree, element, eventish, origin);
+	}
+
+	protected onEnter(tree: ITree, event: IKeyboardEvent): boolean {
+		super.onEnter(tree, event);
+
+		// grab the current selection for use later
+		let selection = tree.getSelection();
+
+		this.clickcb(selection[0], event, 'keyboard');
+		tree.toggleExpansion(selection[0]);
+		return true;
+	}
+}

src/sql/parts/dashboard/dashboardInput.ts

@@ -5,7 +5,6 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
-import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -70,7 +69,7 @@ export class DashboardInput extends EditorInput {
 	}
 
 	public getTypeId(): string {
-		return UntitledEditorInput.ID;
+		return DashboardInput.ID;
 	}
 
 	public getResource(): URI {
@@ -167,4 +166,8 @@ export class DashboardInput extends EditorInput {
 			&& profile1.authenticationType === profile2.authenticationType
 			&& profile1.groupFullName === profile2.groupFullName;
 	}
+
+	public get tabColor(): string {
+		return this._connectionService.getTabColorForUri(this.uri);
+	}
 }

src/sql/parts/disasterRecovery/restore/media/restoreDialog.css

@@ -7,6 +7,10 @@
 	padding: 15px
 }
 
+.restore-panel .tabbedPanel {
+	border-top-color: transparent;
+}
+
 .modal .restore-dialog .dialog-label.header {
 	font-size: 15px;
 }