Snippets: fix sqlCreateTable, remove database refs & use dbo schema (#3094)

- Fixed issues with sqlCreateTable snippet, which meant it couldn't effectively be used to tab through all fields and then hit execute without errors. Specifically fixed bugs where types like NVARCHAR were incorrectly escaped and the Id part of a column was outside the name section, both causing intellisense & execution breaks
- Changed SchemaName to dbo. This helps hit the "80% case" where objects are in the most common schema
- Removed DatabaseName from most snippets. The core issue is this requires you to manually type the exact database name into the snippet which is really hard. We should consider having separate "with Database" snippets or support SQLCMD variables which would let us default to the current database without needing users to manually type them in as alternatives, but having basic snippets just work on current DB is important.

CHANGELOG.md

@@ -1,28 +1,5 @@
 # Change Log
 
-## Version 1.2.4
-* Release date: November 6, 2018
-* Release status: General Availability
-
-## What's new in this version
-* Update to the SQL Server 2019 Preview extension
-* Introducing Paste the Plan extension
-* Introducing High Color queries extension, including SSMS editor theme
-* Fixes in SQL Server Agent, Profiler, and Import extensions
-* Fix .Net Core Socket KeepAlive issue causing dropped inactive connections on macOS
-* Upgrade SQL Tools Service to .Net Core 2.2 Preview 3 (for eventual AAD support)
-* Fix customer reported GitHub issues
-
-## 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:
-
-* rdaniels6813  for `Add query plan theme support #3031`
-* Ruturaj123 for `Fixed some typos and grammatical errors #3027`
-* PromoFaux for `Use emoji shortcodes in CONTRIBUTING.md instead of <20> #3009`
-* ckaczor for `Fix: DATETIMEOFFSET data types should be ISO formatted #714`
-* hi-im-T0dd for `Fixed sync issue with my forked master so this commit is correct #2948`
-* hi-im-T0dd for `Fixed when right clicking and selecting Manage-correct name displays #2794`
-
 ## Version 1.1.3
 * Release date: October 18, 2018
 * Release status: General Availability

README.md

@@ -8,12 +8,12 @@ Azure Data Studio is a data management tool that enables you to work with SQL Se
 
 Platform | Link
 -- | --
-Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2038320
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2038323
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2038327
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2038332
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=2038401
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=2038405
+Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2030731
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2030736
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2030738
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2030741
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=2030746
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=2030750
 
 Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.
 
@@ -61,12 +61,6 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro
 ## 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:
 
-* rdaniels6813  for `Add query plan theme support #3031`
-* Ruturaj123 for `Fixed some typos and grammatical errors #3027`
-* PromoFaux for `Use emoji shortcodes in CONTRIBUTING.md instead of <20> #3009`
-* ckaczor for `Fix: DATETIMEOFFSET data types should be ISO formatted #714`
-* hi-im-T0dd for `Fixed sync issue with my forked master so this commit is correct #2948`
-* hi-im-T0dd for `Fixed when right clicking and selecting Manage-correct name displays #2794`
 * philoushka  for `center the icon #2760`
 * anthonypants for `Typo #2775`
 * kstolte for `Fix Invalid Configuration in Launch.json #2789`
@@ -109,6 +103,7 @@ We would like to thank all our users who raised issues, and in particular the fo
   * Russian: Andrey Veselov, Anton Fontanov, Anton Savin, Elena Ostrovskaia, Igor Babichev, Maxim Zelensky, Rodion Fedechkin, Tasha T, Vladimir Zyryanov
   * Portuguese Brazil: Daniel de Sousa, Diogo Duarte, Douglas Correa, Douglas Eccker, José Emanuel Mendes, Marcelo Fernandes, Marcondes Alexandre, Roberto Fonseca, Rodrigo Crespi
 
+
 And of course, we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/ThirdPartyNotices.txt)
 
 ## License

azure-pipelines-linux-mac.yml

@@ -1,38 +0,0 @@
-steps:
-- task: NodeTool@0
-  inputs:
-    versionSpec: '8.x'
-  displayName: 'Install Node.js'
-
-- script: |
-    git submodule update --init --recursive
-    nvm install 8.9.1
-    nvm use 8.9.1
-    npm i -g yarn
-  displayName: 'preinstall'
-
-- script: |
-    export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0
-    sh -e /etc/init.d/xvfb start
-    sleep 3
-  displayName: 'Linux preinstall'
-  condition: eq(variables['Agent.OS'], 'Linux')
-
-- script: |
-    yarn
-  displayName:  'Install'
-
-- script: |
-    node_modules/.bin/gulp electron --silent
-    node_modules/.bin/gulp compile --silent --max_old_space_size=4096
-    node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
-  displayName: 'Scripts'
-
-- script: |
-    ./scripts/test.sh --reporter mocha-junit-reporter
-  displayName: 'Tests'
-
-- task: PublishTestResults@2
-  inputs:
-    testResultsFiles: '**/test-results.xml'    
-  condition: succeededOrFailed()

azure-pipelines-windows.yml

@@ -1,27 +0,0 @@
-steps:
-- task: NodeTool@0
-  inputs:
-    versionSpec: '8.9'
-  displayName: 'Install Node.js'
-
-- script: |
-    yarn
-  displayName: 'Yarn Install'
-
-- script: |
-    .\node_modules\.bin\gulp electron
-  displayName: 'Electron'
-
-- script: |
-    npm run compile
-  displayName: 'Compile'
-
-- script: |
-    .\scripts\test.bat
-    .\scripts\test-integration.bat
-  displayName: 'Test'
-
-- task: PublishTestResults@2
-  inputs:
-    testResultsFiles: '**/test-results.xml'    
-  condition: succeededOrFailed()

azure-pipelines.yml

@@ -1,29 +0,0 @@
-trigger:
-- master
-- releases/*
-
-jobs:
-
-# All tasks on Windows
-- job: build_all_windows
-  displayName: Build all tasks (Windows)
-  pool:
-    vmImage: vs2017-win2016
-  steps:
-  - template: azure-pipelines-windows.yml
-
-# All tasks on Linux
-- job: build_all_linux
-  displayName: Build all tasks (Linux)
-  pool:
-    vmImage: 'Ubuntu 16.04'
-  steps:
-  - template: azure-pipelines-linux-mac.yml
-
-# All tasks on macOS
-- job: build_all_darwin
-  displayName: Build all tasks (macOS)
-  pool:
-    vmImage: macos-10.13
-  steps:
-  - template: azure-pipelines-linux-mac.yml

docs/UX-Design-Guidelines.md

@@ -1 +0,0 @@
-

extensions/agent/src/dialogs/operatorDialog.ts

@@ -35,7 +35,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
 	private static readonly PagerSundayCheckBoxLabel: string = localize('createOperator.PagerSundayCheckBox', 'Sunday');
 	private static readonly WorkdayBeginLabel: string = localize('createOperator.workdayBegin', 'Workday begin');
 	private static readonly WorkdayEndLabel: string = localize('createOperator.workdayEnd', 'Workday end');
-	private static readonly PagerDutyScheduleLabel: string = localize('createOperator.PagerDutySchedule', 'Pager on duty schedule');
+	private static readonly PagerDutyScheduleLabel: string = localize('createOperator.PagerDutySchedule', 'Pager on duty schdule');
 
 	// Notifications tab strings
 	private static readonly AlertsTableLabel: string = localize('createOperator.AlertListHeading', 'Alert list');

extensions/mssql/package.json

@@ -345,7 +345,7 @@
           "specialValueType": null,
           "isIdentity": false,
           "name": "asynchronousProcessing",
-          "displayName": "Asynchronous processing",
+          "displayName": "Asynchronous processing enabled",
           "description": "When true, enables usage of the Asynchronous functionality in the .Net Framework Data Provider",
           "groupName": "Initialization",
           "valueType": "boolean",
@@ -387,7 +387,7 @@
           "specialValueType": null,
           "isIdentity": false,
           "name": "columnEncryptionSetting",
-          "displayName": "Column encryption",
+          "displayName": "Column encryption setting",
           "description": "Default column encryption setting for all the commands on the connection",
           "groupName": "Security",
           "valueType": "category",

extensions/mssql/src/config.json

@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "1.5.0-alpha.53",
+	"version": "1.5.0-alpha.52",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp2.2.zip",
 		"Windows_64": "win-x64-netcoreapp2.2.zip",

extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts

@@ -12,7 +12,9 @@ import { CreateSessionData } from '../data/createSessionData';
 const localize = nls.loadMessageBundle();
 
 export class CreateSessionDialog {
+
 	// Top level
+	private readonly DialogTitle: string = localize('createSessionDialog.newSession', 'New Session');
 	private readonly CancelButtonText: string = localize('createSessionDialog.cancel', 'Cancel');
 	private readonly CreateButtonText: string = localize('createSessionDialog.create', 'Create');
 	private readonly DialogTitleText: string = localize('createSessionDialog.title', 'Create New Profiler Session');
@@ -23,28 +25,23 @@ export class CreateSessionDialog {
 	private sessionNameBox: sqlops.InputBoxComponent;
 
 	private model: CreateSessionData;
-	private readonly _providerType: string;
 
 	private _onSuccess: vscode.EventEmitter<CreateSessionData> = new vscode.EventEmitter<CreateSessionData>();
 	public readonly onSuccess: vscode.Event<CreateSessionData> = this._onSuccess.event;
 
 
-	constructor(ownerUri: string, providerType: string, templates: Array<sqlops.ProfilerSessionTemplate>) {
+	constructor(ownerUri: string, templates: Array<sqlops.ProfilerSessionTemplate>) {
 		if (typeof (templates) === 'undefined' || templates === null) {
 			throw new Error(localize('createSessionDialog.templatesInvalid', "Invalid templates list, cannot open dialog"));
 		}
 		if (typeof (ownerUri) === 'undefined' || ownerUri === null) {
 			throw new Error(localize('createSessionDialog.dialogOwnerInvalid', "Invalid dialog owner, cannot open dialog"));
 		}
-		if (typeof (providerType) === 'undefined' || providerType === null) {
-			throw new Error(localize('createSessionDialog.invalidProviderType', "Invalid provider type, cannot open dialog"));
-		}
-		this._providerType = providerType;
 		this.model = new CreateSessionData(ownerUri, templates);
 	}
 
 	public async showDialog(): Promise<void> {
-		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitleText);
+		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle);
 		this.initializeContent();
 		this.dialog.okButton.onClick(() => this.execute());
 		this.dialog.cancelButton.onClick(() => { });
@@ -79,7 +76,7 @@ export class CreateSessionDialog {
 
 						title: localize('createSessionDialog.enterSessionName', "Enter session name:")
 					}],
-					title: ''
+					title: this.DialogTitleText
 				}]).withLayout({ width: '100%' }).component();
 
 			await view.initializeModel(formModel);
@@ -100,7 +97,8 @@ export class CreateSessionDialog {
 	}
 
 	private async execute(): Promise<void> {
-		let profilerService = sqlops.dataprotocol.getProvider<sqlops.ProfilerProvider>(this._providerType, sqlops.DataProviderType.ProfilerProvider);
+		let currentConnection = await sqlops.connection.getCurrentConnection();
+		let profilerService = sqlops.dataprotocol.getProvider<sqlops.ProfilerProvider>(currentConnection.providerName, sqlops.DataProviderType.ProfilerProvider);
 
 		let name = this.sessionNameBox.value;
 		let selected = this.templatesBox.value.toString();

extensions/profiler/client/src/mainController.ts

@@ -29,8 +29,8 @@ export class MainController {
 	}
 
 	public activate(): void {
-		vscode.commands.registerCommand('profiler.openCreateSessionDialog', (ownerUri: string, providerType: string, templates: Array<sqlops.ProfilerSessionTemplate>) => {
-			let dialog = new CreateSessionDialog(ownerUri, providerType, templates);
+		vscode.commands.registerCommand('profiler.openCreateSessionDialog', (ownerUri: string, templates: Array<sqlops.ProfilerSessionTemplate>) => {
+			let dialog = new CreateSessionDialog(ownerUri, templates);
 			dialog.showDialog();
 		});
 	}

extensions/profiler/package.json

@@ -26,10 +26,11 @@
     "Microsoft.mssql"
   ],
   "contributes": {
+
     "commands": [
       {
         "command": "profiler.newProfiler",
-        "title": "Launch Profiler",
+        "title": "New Profiler",
         "category": "Profiler"
       },
       {
@@ -48,15 +49,6 @@
         "category": "Profiler"
       }
     ],
-    "menus": {
-      "objectExplorer/item/context": [
-        {
-          "command": "profiler.newProfiler",
-          "when": "connectionProvider == MSSQL && nodeType && nodeType == Server",
-          "group": "profiler"
-        }
-      ]
-    },
     "outputChannels": [
       "sqlprofiler"
     ]
@@ -67,4 +59,4 @@
   "devDependencies": {
     "vscode": "1.0.1"
   }
-}
+}

extensions/theme-carbon/themes/dark_carbon.json

@@ -67,8 +67,7 @@
 		"panel.background": "#212121",
 		"panel.border": "#515151",
 		"panelTitle.activeForeground": "#ffffff",
-		"panelTitle.inactiveForeground": "#888888",
-		"panelTitle.activeBorder": "#026dc8"
+		"panelTitle.inactiveForeground": "#888888"
 	},
 	"tokenColors": [
 		{

extensions/theme-carbon/themes/light_carbon.json

@@ -77,8 +77,7 @@
 		"panel.background": "#ffffff",
 		"panel.border": "#c8c8c8",
 		"panelTitle.activeForeground": "#212121",
-		"panelTitle.inactiveForeground": "#757575",
-		"panelTitle.activeBorder": "#026dc8"
+		"panelTitle.inactiveForeground": "#757575"
 	},
 	"tokenColors": [
 		{

package.json

@@ -1,6 +1,6 @@
 {
   "name": "azuredatastudio",
-  "version": "1.3.1",
+  "version": "1.2.4",
   "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
   "author": {
     "name": "Microsoft Corporation"

resources/xlf/sqlops-core/sql.xlf

@@ -611,7 +611,7 @@
   </body></file>
   <file original="src/sql/parts/connection/common/connectionActions" source-language="en" datatype="plaintext"><body>
     <trans-unit id="ClearRecentlyUsedLabel">
-      <source xml:lang="en">Clear List</source>
+      <source xml:lang="en">Clear Recent Connections List</source>
     </trans-unit>
     <trans-unit id="ClearedRecentConnections">
       <source xml:lang="en">Recent connections list cleared</source>
@@ -1039,10 +1039,10 @@
       <source xml:lang="en">Connection</source>
     </trans-unit>
     <trans-unit id="recentConnectionTitle">
-      <source xml:lang="en">Recent Connections</source>
+      <source xml:lang="en">Recent connections</source>
     </trans-unit>
     <trans-unit id="savedConnectionTitle">
-      <source xml:lang="en">Saved Connections</source>
+      <source xml:lang="en">Saved connections</source>
     </trans-unit>
     <trans-unit id="connectType">
       <source xml:lang="en">Connection type</source>
@@ -1520,6 +1520,9 @@
     </trans-unit>
   </body></file>
   <file original="src/sql/parts/profiler/contrib/profilerActions" source-language="en" datatype="plaintext"><body>
+    <trans-unit id="profiler.connect">
+      <source xml:lang="en">Connect</source>
+    </trans-unit>
     <trans-unit id="profilerAction.disconnect">
       <source xml:lang="en">Disconnect</source>
     </trans-unit>
@@ -1530,13 +1533,16 @@
       <source xml:lang="en">Start</source>
     </trans-unit>
     <trans-unit id="create">
-      <source xml:lang="en">New Session</source>
+      <source xml:lang="en">Create</source>
+    </trans-unit>
+    <trans-unit id="profiler.capture">
+      <source xml:lang="en">Pause Capture</source>
     </trans-unit>
     <trans-unit id="profilerAction.resumeCapture">
-      <source xml:lang="en">Resume</source>
+      <source xml:lang="en">Resume Capture</source>
     </trans-unit>
     <trans-unit id="profilerAction.pauseCapture">
-      <source xml:lang="en">Pause</source>
+      <source xml:lang="en">Pause Capture</source>
     </trans-unit>
     <trans-unit id="profilerStop.stop">
       <source xml:lang="en">Stop</source>
@@ -1544,6 +1550,9 @@
     <trans-unit id="profiler.clear">
       <source xml:lang="en">Clear Data</source>
     </trans-unit>
+    <trans-unit id="profiler.autoscrollOn">
+      <source xml:lang="en">Auto Scroll: On</source>
+    </trans-unit>
     <trans-unit id="profilerAction.autoscrollOn">
       <source xml:lang="en">Auto Scroll: On</source>
     </trans-unit>
@@ -1563,7 +1572,7 @@
       <source xml:lang="en">Find Previous String</source>
     </trans-unit>
     <trans-unit id="profilerAction.newProfiler">
-      <source xml:lang="en">Launch Profiler</source>
+      <source xml:lang="en">New Profiler</source>
     </trans-unit>
   </body></file>
   <file original="src/sql/base/browser/ui/selectBox/selectBox" source-language="en" datatype="plaintext"><body>
@@ -1635,7 +1644,7 @@
   </body></file>
   <file original="src/sql/parts/connection/connectionDialog/advancedPropertiesController" source-language="en" datatype="plaintext"><body>
     <trans-unit id="connectionAdvancedProperties">
-      <source xml:lang="en">Advanced Properties</source>
+      <source xml:lang="en">Advanced properties</source>
     </trans-unit>
     <trans-unit id="advancedProperties.discard">
       <source xml:lang="en">Discard</source>

resources/xlf/vscode-extensions/profiler.xlf

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
   <file original="extensions/profiler/client\out/dialogs/profilerCreateSessionDialog" source-language="en" datatype="plaintext"><body>
+    <trans-unit id="createSessionDialog.newSession">
+      <source xml:lang="en">New Session</source>
+    </trans-unit>
     <trans-unit id="createSessionDialog.cancel">
       <source xml:lang="en">Cancel</source>
     </trans-unit>

scripts/test.bat

@@ -12,18 +12,12 @@ set CODE=".build\electron\%NAMESHORT%"
 
 rem TFS Builds
 if not "%BUILD_BUILDID%" == "" (
-	if not "%ADD_REPORTER%" == "" (
-		%CODE% .\node_modules\mocha\bin\_mocha --reporter mocha-junit-reporter %*
-	)
-
-	if "%ADD_REPORTER%" == "" (
-		%CODE% .\node_modules\mocha\bin\_mocha %*
-	)
+	%CODE% .\node_modules\mocha\bin\_mocha %*
 )
 
 rem Otherwise
 if "%BUILD_BUILDID%" == "" (
-	%CODE% .\node_modules\mocha\bin\_mocha --reporter mocha-junit-reporter %*
+	%CODE% .\node_modules\mocha\bin\_mocha --reporter dot %*
 )
 popd
 

scripts/test.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 
-if [[ "$OSTYPE" == "darwin"* ]] || [[ "$AGENT_OS" == "Darwin"* ]]; then
+if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname $(dirname $(realpath "$0")))
 
@@ -14,7 +14,7 @@ fi
 
 cd $ROOT
 
-if [[ "$OSTYPE" == "darwin"* ]] || [[ "$AGENT_OS" == "Darwin"* ]]; then
+if [[ "$OSTYPE" == "darwin"* ]]; then
 	NAME=`node -p "require('./product.json').nameLong"`
 	CODE="./.build/electron/$NAME.app/Contents/MacOS/Electron"
 else
@@ -30,7 +30,7 @@ node build/lib/electron.js || ./node_modules/.bin/gulp electron
 
 # Unit Tests
 export ELECTRON_RUN_AS_NODE=1
-if [[ "$OSTYPE" == "darwin"* ]] || [[ "$AGENT_OS" == "Darwin"* ]]; then
+if [[ "$OSTYPE" == "darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		"$CODE" \
 		node_modules/mocha/bin/_mocha "$@"

src/sql/base/browser/ui/modal/media/modal.css

@@ -56,7 +56,6 @@
 
 .modal .modal-title {
 	font-size: 15px;
-	font-weight: 600;
 }
 
 .modal .modal-title-icon {
@@ -148,7 +147,7 @@
 }
 
 .modal .footer-button {
-	margin-left: 5px;
+	margin-right: 5px;
 }
 
 .modal .right-footer .footer-button:last-of-type {
@@ -236,8 +235,8 @@
 
 .modal.flyout-dialog .dialog-message-detail {
 	margin-top: 5px;
-	white-space: pre-wrap;
-	user-select: text;
+	white-space: normal;
+	-webkit-user-select: text;
 	font-size: 11px;
 }
 

src/sql/base/browser/ui/modal/media/optionsDialog.css

@@ -20,34 +20,11 @@
 }
 
 .optionsDialog-options-groups {
-	margin-top: 10px;
-	flex: 1 1;
+	padding: 15px;
+	height: calc(100% - 150px);
 	overflow-y: auto;
 }
 
-.optionsDialog-options-groups {
-	margin: 10px 0px;
-	flex: 1 1;
-	overflow-y: auto;
-}
-
-.vs .optionsDialog-options-groups {
-	box-shadow: 0 1px 4px 1px rgba(220, 220, 220, 0.71);
-}
-
-.vs-dark .optionsDialog-options-groups {
-	box-shadow: 0 4px 5px 0px rgba(0, 0, 0, 0.71);
-}
-
-.optionsDialog-options-groups .split-view-view .header {
-	padding-left: 28px !important;
-	background-position-x: 8px !important;
-}
-
-.optionsDialog-options-groups .split-view-view .body {
-	padding-left: 5px !important;
-}
-
 .backButtonIcon {
 	content: url('back.svg');
 	width: 20px;
@@ -56,42 +33,21 @@
 	cursor: pointer;
 }
 
-.hc-black .backButtonIcon,
-.vs-dark .backButtonIcon {
+.vs-dark.monaco-shell .backButtonIcon {
 	content: url('back_inverse.svg');
 }
 
 .optionsDialog-description {
-    height: 90px;
-    margin: 15px;
-    overflow-y: auto;
-}
-
-.optionsDialog-description .modal-title {
-	background-repeat: no-repeat;
-	background-position: 2px center;
-	padding-left: 25px;
-	background-size: 16px;
-}
-
-.vs .optionsDialog-description .modal-title {
-	background-image: url('info_notification.svg')
-}
-
-.vs-dark .optionsDialog-description .modal-title,
-.hc-black .optionsDialog-description .modal-title {
-	background-image: url('info_notification_inverse.svg')
+	padding: 15px;
+	overflow-y: auto;
 }
 
 .optionsDialog-options {
-	height: 100%;
-	display: flex;
-	flex-direction: column;
+	height: calc(100% - 30px);
 }
 
 .optionsDialog-description-content {
-	padding-top: 10px;
-	padding-left: 25px;
+	padding: 10px;
 }
 
 .optionsDialog-table{

src/sql/base/browser/ui/modal/modal.ts

@@ -72,8 +72,8 @@ const defaultOptions: IModalOptions = {
 };
 
 export abstract class Modal extends Disposable implements IThemable {
-	protected _useDefaultMessageBoxLocation: boolean = true;
-	protected _messageElement: HTMLElement;
+
+	private _messageElement: HTMLElement;
 	private _messageIcon: HTMLElement;
 	private _messageSeverity: Builder;
 	private _messageSummary: Builder;
@@ -253,9 +253,7 @@ export abstract class Modal extends Disposable implements IThemable {
 			this._messageElement = this._modalMessageSection.getHTMLElement();
 			this.updateElementVisibility(this._messageElement, false);
 
-			if (this._useDefaultMessageBoxLocation) {
-				parts.push(this._messageElement);
-			}
+			parts.push(this._messageElement);
 		}
 
 		// This modal body section refers to the body of of the dialog

src/sql/base/browser/ui/modal/optionsDialog.ts

@@ -125,7 +125,7 @@ export class OptionsDialog extends Modal {
 		});
 
 		let builder = new Builder(this._body);
-		builder.div({}, (dividerContainer) => {
+		builder.div({ class: 'Connection-divider' }, (dividerContainer) => {
 			this._dividerBuilder = dividerContainer;
 		});
 

src/sql/base/browser/ui/panel/media/panel.css

@@ -46,9 +46,9 @@ panel {
 }
 
 .tabbedPanel .tabList .tab .tabLabel {
-	font-size: 14px;
+	text-transform: uppercase;
+	font-size: 13px;
 	padding-bottom: 4px;
-	font-weight: 600;
 }
 
 .tabbedPanel.vertical .tabList .tab .tabLabel {

src/sql/base/browser/ui/panel/panel.ts

@@ -36,6 +36,7 @@ export interface IPanelTab {
 interface IInternalPanelTab extends IPanelTab {
 	header: HTMLElement;
 	label: HTMLElement;
+	dispose(): void;
 }
 
 const defaultOptions: IPanelOptions = {
@@ -142,6 +143,8 @@ export class TabbedPanel extends Disposable implements IThemable {
 		this.tabList.appendChild(tabHeaderElement);
 		tab.header = tabHeaderElement;
 		tab.label = tabLabel;
+		tab.dispose = () => { };
+		this._register(tab);
 	}
 
 	public showTab(id: PanelTabIdentifier): void {

src/sql/base/browser/ui/panel/panelStyles.ts

@@ -19,7 +19,6 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 			.tabbedPanel > .title .tabList .tab .tabLabel.active {
 				color: ${titleActive};
 				border-bottom-color: ${titleActiveBorder};
-				border-bottom-width: 2px;
 			}
 
 			.tabbedPanel > .title .tabList .tab-header.active {

src/sql/base/browser/ui/table/asyncDataView.ts

@@ -3,14 +3,11 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposableDataProvider } from 'sql/base/browser/ui/table/interfaces';
-
 export interface IObservableCollection<T> {
 	getLength(): number;
 	at(index: number): T;
 	getRange(start: number, end: number): T[];
 	setCollectionChangedCallback(callback: (change: CollectionChange, startIndex: number, count: number) => void): void;
-	dispose(): void;
 }
 
 export interface IGridDataRow {
@@ -27,27 +24,24 @@ class LoadCancellationToken {
 }
 
 class DataWindow<TData> {
+	private _dataSourceLength: number;
 	private _data: TData[];
 	private _length: number = 0;
 	private _offsetFromDataSource: number = -1;
 
+	private loadFunction: (offset: number, count: number) => Thenable<TData[]>;
 	private lastLoadCancellationToken: LoadCancellationToken;
+	private loadCompleteCallback: (start: number, end: number) => void;
+	private placeholderItemGenerator: (index: number) => TData;
 
-	constructor(
-		private loadFunction: (offset: number, count: number) => Thenable<TData[]>,
-		private placeholderItemGenerator: (index: number) => TData,
-		private loadCompleteCallback: (start: number, end: number) => void
-	) {
-	}
-
-	dispose() {
-		this._data = undefined;
-		this.loadFunction = undefined;
-		this.placeholderItemGenerator = undefined;
-		this.loadCompleteCallback = undefined;
-		if (this.lastLoadCancellationToken) {
-			this.lastLoadCancellationToken.isCancelled = true;
-		}
+	constructor(dataSourceLength: number,
+		loadFunction: (offset: number, count: number) => Thenable<TData[]>,
+		placeholderItemGenerator: (index: number) => TData,
+		loadCompleteCallback: (start: number, end: number) => void) {
+		this._dataSourceLength = dataSourceLength;
+		this.loadFunction = loadFunction;
+		this.placeholderItemGenerator = placeholderItemGenerator;
+		this.loadCompleteCallback = loadCompleteCallback;
 	}
 
 	getStartIndex(): number {
@@ -82,9 +76,10 @@ class DataWindow<TData> {
 			return;
 		}
 
-		this.lastLoadCancellationToken = new LoadCancellationToken();
+		let cancellationToken = new LoadCancellationToken();
+		this.lastLoadCancellationToken = cancellationToken;
 		this.loadFunction(offset, length).then(data => {
-			if (!this.lastLoadCancellationToken.isCancelled) {
+			if (!cancellationToken.isCancelled) {
 				this._data = data;
 				this.loadCompleteCallback(this._offsetFromDataSource, this._offsetFromDataSource + this._length);
 			}
@@ -102,12 +97,10 @@ export class VirtualizedCollection<TData> implements IObservableCollection<TData
 
 	private collectionChangedCallback: (change: CollectionChange, startIndex: number, count: number) => void;
 
-	constructor(
-		windowSize: number,
+	constructor(windowSize: number,
 		length: number,
 		loadFn: (offset: number, count: number) => Thenable<TData[]>,
-		private _placeHolderGenerator: (index: number) => TData
-	) {
+		private _placeHolderGenerator: (index: number) => TData) {
 		this._windowSize = windowSize;
 		this._length = length;
 
@@ -117,15 +110,9 @@ export class VirtualizedCollection<TData> implements IObservableCollection<TData
 			}
 		};
 
-		this._bufferWindowBefore = new DataWindow(loadFn, _placeHolderGenerator, loadCompleteCallback);
-		this._window = new DataWindow(loadFn, _placeHolderGenerator, loadCompleteCallback);
-		this._bufferWindowAfter = new DataWindow(loadFn, _placeHolderGenerator, loadCompleteCallback);
-	}
-
-	dispose() {
-		this._bufferWindowAfter.dispose();
-		this._bufferWindowBefore.dispose();
-		this._window.dispose();
+		this._bufferWindowBefore = new DataWindow(length, loadFn, _placeHolderGenerator, loadCompleteCallback);
+		this._window = new DataWindow(length, loadFn, _placeHolderGenerator, loadCompleteCallback);
+		this._bufferWindowAfter = new DataWindow(length, loadFn, _placeHolderGenerator, loadCompleteCallback);
 	}
 
 	setCollectionChangedCallback(callback: (change: CollectionChange, startIndex: number, count: number) => void): void {
@@ -210,7 +197,7 @@ export class VirtualizedCollection<TData> implements IObservableCollection<TData
 	}
 }
 
-export class AsyncDataProvider<TData extends IGridDataRow> implements IDisposableDataProvider<TData> {
+export class AsyncDataProvider<TData extends IGridDataRow> implements Slick.DataProvider<TData> {
 
 	constructor(private dataRows: IObservableCollection<TData>) { }
 
@@ -225,8 +212,4 @@ export class AsyncDataProvider<TData extends IGridDataRow> implements IDisposabl
 	public getRange(start: number, end: number): TData[] {
 		return !this.dataRows ? undefined : this.dataRows.getRange(start, end);
 	}
-
-	dispose() {
-		this.dataRows.dispose();
-	}
 }

src/sql/base/browser/ui/table/interfaces.ts

@@ -1,31 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
-import { Color } from 'vs/base/common/color';
-
-export interface IDisposableDataProvider<T> extends Slick.DataProvider<T> {
-	dispose(): void;
-}
-
-export interface ITableMouseEvent {
-	anchor: HTMLElement | { x: number, y: number };
-	cell?: { row: number, cell: number };
-}
-
-export interface ITableStyles extends IListStyles {
-	tableHeaderBackground?: Color;
-	tableHeaderForeground?: Color;
-}
-
-export interface ITableSorter<T> {
-	sort(args: Slick.OnSortEventArgs<T>);
-}
-
-export interface ITableConfiguration<T> {
-	dataProvider?: IDisposableDataProvider<T> | Array<T>;
-	columns?: Slick.Column<T>[];
-	sorter?: ITableSorter<T>;
-}

src/sql/base/browser/ui/table/table.ts

@@ -5,18 +5,28 @@
 
 import 'vs/css!./media/table';
 import { TableDataView } from './tableDataView';
-import { IDisposableDataProvider, ITableSorter, ITableMouseEvent, ITableConfiguration, ITableStyles } from 'sql/base/browser/ui/table/interfaces';
 
 import { IThemable } from 'vs/platform/theme/common/styler';
+import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
 import * as DOM from 'vs/base/browser/dom';
+import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { isArray, isBoolean } from 'vs/base/common/types';
 import { Event, Emitter } from 'vs/base/common/event';
 import { range } from 'vs/base/common/arrays';
-import { $ } from 'vs/base/browser/builder';
+
+export interface ITableMouseEvent {
+	anchor: HTMLElement | { x: number, y: number };
+	cell?: { row: number, cell: number };
+}
+
+export interface ITableStyles extends IListStyles {
+	tableHeaderBackground?: Color;
+	tableHeaderForeground?: Color;
+}
 
 function getDefaultOptions<T>(): Slick.GridOptions<T> {
 	return <Slick.GridOptions<T>>{
@@ -25,13 +35,23 @@ function getDefaultOptions<T>(): Slick.GridOptions<T> {
 	};
 }
 
+export interface ITableSorter<T> {
+	sort(args: Slick.OnSortEventArgs<T>);
+}
+
+export interface ITableConfiguration<T> {
+	dataProvider?: Slick.DataProvider<T> | Array<T>;
+	columns?: Slick.Column<T>[];
+	sorter?: ITableSorter<T>;
+}
+
 export class Table<T extends Slick.SlickData> extends Widget implements IThemable, IDisposable {
 	private styleElement: HTMLStyleElement;
 	private idPrefix: string;
 
 	private _grid: Slick.Grid<T>;
 	private _columns: Slick.Column<T>[];
-	private _data: IDisposableDataProvider<T>;
+	private _data: Slick.DataProvider<T>;
 	private _sorter: ITableSorter<T>;
 
 	private _autoscroll: boolean;
@@ -40,6 +60,8 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 
 	private _classChangeTimeout: number;
 
+	private _disposables: IDisposable[] = [];
+
 	private _onContextMenu = new Emitter<ITableMouseEvent>();
 	public readonly onContextMenu: Event<ITableMouseEvent> = this._onContextMenu.event;
 
@@ -54,8 +76,6 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 			this._data = configuration.dataProvider;
 		}
 
-		this._register(this._data);
-
 		if (configuration && configuration.columns) {
 			this._columns = configuration.columns;
 		} else {
@@ -97,12 +117,6 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 			});
 		}
 
-		this._register({
-			dispose: () => {
-				this._grid.destroy();
-			}
-		});
-
 		this.mapMouseEvent(this._grid.onContextMenu, this._onContextMenu);
 		this.mapMouseEvent(this._grid.onClick, this._onClick);
 	}
@@ -117,8 +131,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 	}
 
 	public dispose() {
-		$(this._container).dispose();
-		super.dispose();
+		dispose(this._disposables);
 	}
 
 	public invalidateRows(rows: number[], keepEditor: boolean) {
@@ -153,7 +166,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 		this._grid.setData(this._data, true);
 	}
 
-	getData(): IDisposableDataProvider<T> {
+	getData(): Slick.DataProvider<T> {
 		return this._data;
 	}
 

src/sql/base/browser/ui/table/tableDataView.ts

@@ -9,8 +9,6 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as types from 'vs/base/common/types';
 
-import { IDisposableDataProvider } from 'sql/base/browser/ui/table/interfaces';
-
 export interface IFindPosition {
 	col: number;
 	row: number;
@@ -22,7 +20,7 @@ function defaultSort<T>(args: Slick.OnSortEventArgs<T>, data: Array<T>): Array<T
 	return data.sort((a, b) => (a[field] === b[field] ? 0 : (a[field] > b[field] ? 1 : -1)) * sign);
 }
 
-export class TableDataView<T extends Slick.SlickData> implements IDisposableDataProvider<T> {
+export class TableDataView<T extends Slick.SlickData> implements Slick.DataProvider<T> {
 	private _data: Array<T>;
 	private _findArray: Array<IFindPosition>;
 	private _findObs: Observable<IFindPosition>;
@@ -156,10 +154,4 @@ export class TableDataView<T extends Slick.SlickData> implements IDisposableData
 	get findCount(): number {
 		return types.isUndefinedOrNull(this._findArray) ? 0 : this._findArray.length;
 	}
-
-	dispose() {
-		this._data = undefined;
-		this._findArray = undefined;
-		this._findObs = undefined;
-	}
 }

src/sql/base/browser/ui/taskbar/media/taskbar.css

@@ -23,7 +23,7 @@
 
 .carbon-taskbar.monaco-toolbar .monaco-action-bar.animated .actions-container {
 	justify-content: flex-start;
-	padding: 5px 5px 5px 15px;
+	padding-left: 15px;
 	flex-wrap: wrap;
 }
 

src/sql/media/icons/check.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#424242" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>

src/sql/media/icons/check_inverse.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#C5C5C5" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>

src/sql/media/icons/common-icons.css

@@ -227,51 +227,6 @@
 	background: url('unpin.svg') center center no-repeat;
 }
 
-.vs .sql.icon.pause {
-	background-image: url('pause.svg')
-}
-
-.vs-dark .sql.icon.pause,
-.hc-black .sql.icon.pause {
-	background-image: url('pause_inverse.svg')
-}
-
-.vs .sql.icon.continue {
-	background-image: url('continue.svg')
-}
-
-.vs-dark .sql.icon.continue,
-.hc-black .sql.icon.continue {
-	background-image: url('continue_inverse.svg')
-}
-
-.vs .sql.icon.checked {
-	background-image: url('check.svg')
-}
-
-.vs-dark .sql.icon.checked,
-.hc-black .sql.icon.checked {
-	background-image: url('check_inverse.svg')
-}
-
-.vs .sql.icon.start {
-	background-image: url('start.svg')
-}
-
-.vs-dark .sql.icon.start,
-.hc-black .sql.icon.start {
-	background-image: url('start_inverse.svg')
-}
-
-.vs .sql.icon.stop {
-	background-image: url('stop.svg')
-}
-
-.vs-dark .sql.icon.stop,
-.hc-black .sql.icon.stop {
-	background-image: url('stop_inverse.svg')
-}
-
 .small {
 	width: 16px;
 	height: 16px;

src/sql/media/icons/continue.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#00539c;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M15.64,8l-7.8,6H2V2H7.84Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M3,3H5V13H3ZM7.5,3V13L14,8Z"/></g></svg>

src/sql/media/icons/continue_inverse.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#75beff;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M15.64,8l-7.8,6H2V2H7.84Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M3,3H5V13H3ZM7.5,3V13L14,8Z"/></g></svg>

src/sql/media/icons/pause.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#00539c;}</style></defs><title>pause</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,2V14H8.5V2ZM3,14H7.5V2H3Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M4,3H6.5V13H4ZM9.5,3V13H12V3Z"/></g></svg>

src/sql/media/icons/pause_inverse.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#75beff;}</style></defs><title>pause</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,2V14H8.5V2ZM3,14H7.5V2H3Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M4,3H6.5V13H4ZM9.5,3V13H12V3Z"/></g></svg>

src/sql/media/icons/start.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#388a34;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14.334,8,3.667,16H3V0h.667Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M4,1.5v13L12.667,8,4,1.5Z"/></g></svg>

src/sql/media/icons/start_inverse.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#89d185;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14.334,8,3.667,16H3V0h.667Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M4,1.5v13L12.667,8,4,1.5Z"/></g></svg>

src/sql/media/icons/stop.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-red{fill:#a1260d;}</style></defs><title>stop</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14,2V14H2V2Z"/></g><g id="iconBg"><path class="icon-vs-action-red" d="M13,3V13H3V3Z"/></g></svg>

src/sql/media/icons/stop_inverse.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-red{fill:#f48771;}</style></defs><title>stop</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14,2V14H2V2Z"/></g><g id="iconBg"><path class="icon-vs-action-red" d="M13,3V13H3V3Z"/></g></svg>

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

@@ -26,7 +26,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 export class ClearRecentConnectionsAction extends Action {
 
 	public static ID = 'clearRecentConnectionsAction';
-	public static LABEL = nls.localize('ClearRecentlyUsedLabel', 'Clear List');
+	public static LABEL = nls.localize('ClearRecentlyUsedLabel', 'Clear Recent Connections List');
 	public static ICON = 'search-action clear-search-results';
 
 	private _onRecentConnectionsRemoved = new Emitter<void>();
@@ -83,7 +83,7 @@ export class ClearRecentConnectionsAction extends Action {
 				{ key: nls.localize('connectionAction.no', 'No'), value: false }
 			];
 
-			self._quickOpenService.pick(choices.map(x => x.key), { placeHolder: nls.localize('ClearRecentlyUsedLabel', 'Clear List'), ignoreFocusLost: true }).then((choice) => {
+			self._quickOpenService.pick(choices.map(x => x.key), { placeHolder: nls.localize('ClearRecentlyUsedLabel', 'Clear Recent Connections List'), ignoreFocusLost: true }).then((choice) => {
 				let confirm = choices.find(x => x.key === choice);
 				resolve(confirm && confirm.value);
 			});

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

@@ -38,7 +38,7 @@ export class AdvancedPropertiesController {
 	public get advancedDialog() {
 		if (!this._advancedDialog) {
 			this._advancedDialog = this._instantiationService.createInstance(
-				OptionsDialog, localize('connectionAdvancedProperties', 'Advanced Properties'), TelemetryKeys.ConnectionAdvancedProperties, { hasBackButton: true });
+				OptionsDialog, localize('connectionAdvancedProperties', 'Advanced properties'), TelemetryKeys.ConnectionAdvancedProperties, { hasBackButton: true });
 			this._advancedDialog.cancelLabel = localize('advancedProperties.discard', 'Discard');
 			this._advancedDialog.onCloseEvent(() => this._onCloseAdvancedProperties());
 			this._advancedDialog.onOk(() => this.handleOnOk());

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

@@ -37,7 +37,6 @@ import * as styler from 'vs/platform/theme/common/styler';
 import * as DOM from 'vs/base/browser/dom';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 
 export interface OnShowUIResponse {
 	selectedProviderType: string;
@@ -50,7 +49,7 @@ export class ConnectionDialogWidget extends Modal {
 	private _noRecentConnectionBuilder: Builder;
 	private _savedConnectionBuilder: Builder;
 	private _noSavedConnectionBuilder: Builder;
-	private _connectionDetailTitle: Builder;
+	private _dividerBuilder: Builder;
 	private _connectButton: Button;
 	private _closeButton: Button;
 	private _providerTypeSelectBox: SelectBox;
@@ -144,7 +143,7 @@ export class ConnectionDialogWidget extends Modal {
 		this._panel = new TabbedPanel(connectionContainer.getHTMLElement());
 		this._recentConnectionTabId = this._panel.pushTab({
 			identifier: 'recent_connection',
-			title: localize('recentConnectionTitle', 'Recent Connections'),
+			title: localize('recentConnectionTitle', 'Recent connections'),
 			view: {
 				render: c => {
 					recentConnectionTab.appendTo(c);
@@ -155,7 +154,7 @@ export class ConnectionDialogWidget extends Modal {
 
 		let savedConnectionTabId = this._panel.pushTab({
 			identifier: 'saved_connection',
-			title: localize('savedConnectionTitle', 'Saved Connections'),
+			title: localize('savedConnectionTitle', 'Saved connections'),
 			view: {
 				layout: () => { },
 				render: c => {
@@ -180,9 +179,8 @@ export class ConnectionDialogWidget extends Modal {
 			}
 		});
 
-		this._bodyBuilder.div({ class: 'connection-details-title' }, (dividerContainer) => {
-			this._connectionDetailTitle = dividerContainer;
-			this._connectionDetailTitle.text(localize('connectionDetailsTitle', 'Connection Details'));
+		this._bodyBuilder.div({ class: 'Connection-divider' }, (dividerContainer) => {
+			this._dividerBuilder = dividerContainer;
 		});
 
 		this._bodyBuilder.div({ class: 'connection-type' }, (modelTableContent) => {
@@ -219,12 +217,10 @@ export class ConnectionDialogWidget extends Modal {
 	private updateTheme(theme: IColorTheme): void {
 		let borderColor = theme.getColor(contrastBorder);
 		let border = borderColor ? borderColor.toString() : null;
-		let backgroundColor = theme.getColor(SIDE_BAR_BACKGROUND);
-		if (this._connectionDetailTitle) {
-			this._connectionDetailTitle.style('border-width', border ? '1px 0px' : null);
-			this._connectionDetailTitle.style('border-style', border ? 'solid none' : null);
-			this._connectionDetailTitle.style('border-color', border);
-			this._connectionDetailTitle.style('background-color', backgroundColor ? backgroundColor.toString() : null);
+		if (this._dividerBuilder) {
+			this._dividerBuilder.style('border-top-width', border ? '1px' : null);
+			this._dividerBuilder.style('border-top-style', border ? 'solid' : null);
+			this._dividerBuilder.style('border-top-color', border);
 		}
 	}
 
@@ -281,13 +277,17 @@ 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) => {
+				container.div({ class: 'connection-history-label' }, (recentTitle) => {
+					recentTitle.text(recentHistoryLabel);
+				});
 				container.div({ class: 'connection-history-actions' }, (actionsContainer) => {
 					this._actionbar = this._register(new ActionBar(actionsContainer.getHTMLElement(), { animated: false }));
 					let clearAction = this._instantiationService.createInstance(ClearRecentConnectionsAction, ClearRecentConnectionsAction.ID, ClearRecentConnectionsAction.LABEL);
 					clearAction.useConfirmationMessage = true;
 					clearAction.onRecentConnectionsRemoved(() => this.open(false));
-					this._actionbar.push(clearAction, { icon: true, label: true });
+					this._actionbar.push(clearAction, { icon: true, label: false });
 				});
 			});
 			recentConnectionContainer.div({ class: 'server-explorer-viewlet' }, (divContainer: Builder) => {

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

@@ -9,35 +9,25 @@
 }
 
 .connection-input {
+	padding-right:8px;
 	width: 200px;
 	padding-bottom: 5px;
 }
 
 .connection-dialog {
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	overflow-x: hidden;
-	overflow-y: auto;
+	height: calc(100% - 20px);
 }
 
 .connection-dialog .tabbedPanel {
 	border-top-color: transparent;
-	flex: 1 1;
+	height: calc(100% - 350px);
+	display: block;
 	min-height: 120px;
-	overflow: hidden;
-	margin: 0px 11px;
-}
-.connection-dialog .tabBody {
-	overflow: hidden;
-    flex: 1 1;
-    display: flex;
-    flex-direction: column;
 }
 
 .connection-recent, .connection-saved {
-	margin: 5px;
-	flex: 1 1;
+	margin: 15px;
+	height: calc(100% - 60px);
 	overflow-y: auto;
 }
 
@@ -55,8 +45,6 @@
 .recent-titles-container {
 	display: flex;
 	justify-content: space-between;
-	margin: 5px;
-	flex: 0 0 auto;
 }
 
 .connection-provider-info {
@@ -65,13 +53,7 @@
 }
 
 .connection-recent-content {
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-}
-
-.connection-recent-content .server-explorer-viewlet {
-	flex: 1 1;
+	height: calc(100% - 20px);
 }
 
 .connection-table-content {
@@ -84,9 +66,8 @@
 }
 
 .connection-type {
-	flex: 0 0 auto;
-	overflow: hidden;
-	margin: 0px 13px;
+	margin: 15px;
+	overflow-y: hidden;
 }
 
 .connection-dialog .connection-history-actions .action-label.icon {
@@ -95,9 +76,8 @@
 	line-height: 20px;
 	min-width: 20px;
 	background-size: 16px;
-	background-position: 2px center;
+	background-position: center center;
 	background-repeat: no-repeat;
-	padding-left: 25px;
 }
 
 .search-action.clear-search-results {
@@ -107,11 +87,4 @@
 .vs-dark .search-action.clear-search-results,
 .hc-black .search-action.clear-search-results {
 	background: url('clear-search-results-dark.svg');
-}
-
-.connection-details-title {
-	font-size: 14px;
-	margin: 5px 0px;
-	padding: 5px 15px;
-	font-weight: 600;
 }

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

@@ -5,5 +5,6 @@
 
 .advanced-button {
 	width: 100px;
+	padding-right:8px;
 	padding-bottom: 5px;
 }

src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts

@@ -24,6 +24,7 @@ import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
 import { NodeType } from 'sql/parts/objectExplorer/common/nodeType';
 import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
+import { NewProfilerAction } from 'sql/parts/profiler/contrib/profilerActions';
 import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
 import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
 import { MenuId, IMenuService } from 'vs/platform/actions/common/actions';
@@ -89,11 +90,9 @@ export class ServerTreeActionProvider extends ContributableActionProvider {
 	 * Return actions for connection elements
 	 */
 	public getConnectionActions(tree: ITree, profile: ConnectionProfile): IAction[] {
-		let node = new TreeNode(NodeType.Server, '', false, '', '', '', undefined, undefined, undefined, undefined);
 		return this.getAllActions({
 			tree: tree,
-			profile: profile,
-			treeNode: node
+			profile: profile
 		}, (context) => this.getBuiltinConnectionActions(context));
 	}
 
@@ -126,6 +125,10 @@ export class ServerTreeActionProvider extends ContributableActionProvider {
 		actions.push(this._instantiationService.createInstance(DeleteConnectionAction, DeleteConnectionAction.ID, DeleteConnectionAction.DELETE_CONNECTION_LABEL, context.profile));
 		actions.push(this._instantiationService.createInstance(RefreshAction, RefreshAction.ID, RefreshAction.LABEL, context.tree, context.profile));
 
+		if (process.env['VSCODE_DEV'] && constants.MssqlProviderId === context.profile.providerName) {
+			actions.push(this._instantiationService.createInstance(OEAction, NewProfilerAction.ID, NewProfilerAction.LABEL));
+		}
+
 		return actions;
 	}
 

src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts

@@ -31,8 +31,8 @@ export class TreeCreationUtils {
 
 		return new Tree(treeContainer, { dataSource, renderer, controller, dnd, filter, sorter, accessibilityProvider },
 			{
-				indentPixels: 0,
-				twistiePixels: 0,
+				indentPixels: 10,
+				twistiePixels: 20,
 				ariaLabel: nls.localize('treeAriaLabel', "Recent Connections")
 			});
 	}

src/sql/parts/profiler/contrib/profilerActions.contribution.ts

@@ -9,7 +9,7 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati
 import * as nls from 'vs/nls';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IConnectionManagementService, IConnectionDialogService} from 'sql/parts/connection/common/connectionManagement';
+import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
 import { IObjectExplorerService } from '../../objectExplorer/common/objectExplorerService';
 import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -18,10 +18,6 @@ import { IProfilerService } from '../service/interfaces';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/editor/editor.api';
 import { ProfilerEditor } from '../editor/profilerEditor';
-import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions';
-import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
-import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
-import { mssqlProviderName } from 'sql/parts/connection/common/constants';
 
 // Contribute Global Actions
 const category = nls.localize('profilerCategory', "Profiler");
@@ -34,45 +30,15 @@ const newProfilerSchema: IJSONSchema = {
 
 CommandsRegistry.registerCommand({
 	id: 'profiler.newProfiler',
-	handler: (accessor: ServicesAccessor, ...args: any[]) => {
-		let connectionProfile: ConnectionProfile = undefined;
-		let instantiationService: IInstantiationService = accessor.get(IInstantiationService);
+	handler: (accessor: ServicesAccessor) => {
 		let editorService: IEditorService = accessor.get(IEditorService);
+		let instantiationService: IInstantiationService = accessor.get(IInstantiationService);
 		let connectionService: IConnectionManagementService = accessor.get(IConnectionManagementService);
 		let objectExplorerService: IObjectExplorerService = accessor.get(IObjectExplorerService);
-		let connectionDialogService: IConnectionDialogService = accessor.get(IConnectionDialogService);
-		let capabilitiesService: ICapabilitiesService = accessor.get(ICapabilitiesService);
 
-		// If a context is available if invoked from the context menu, we will use the connection profiler of the server node
-		if (args && args.length === 1 && args[0] && args[0] instanceof ObjectExplorerActionsContext) {
-			let context = args[0] as ObjectExplorerActionsContext;
-			connectionProfile = ConnectionProfile.fromIConnectionProfile(capabilitiesService, context.connectionProfile);
-		}
-		else {
-			// No context available, we will try to get the current global active connection
-			connectionProfile = TaskUtilities.getCurrentGlobalConnection(objectExplorerService, connectionService, editorService) as ConnectionProfile;
-		}
-
-		let promise;
-		if (connectionProfile) {
-			promise = connectionService.connectIfNotConnected(connectionProfile);
-		} else {
-			// if still no luck, we will open the Connection dialog and let user connect to a server
-			promise = connectionDialogService.openDialogAndWait(connectionService, { connectionType: 1, providers: [mssqlProviderName] }).then((profile) => {
-				connectionProfile = profile as ConnectionProfile;
-			});
-		}
-
-		return promise.then(() => {
-			if (!connectionProfile) {
-				connectionProfile = TaskUtilities.getCurrentGlobalConnection(objectExplorerService, connectionService, editorService) as ConnectionProfile;
-			}
-
-			if (connectionProfile && connectionProfile.providerName === mssqlProviderName) {
-				let profilerInput = instantiationService.createInstance(ProfilerInput, connectionProfile);
-				editorService.openEditor(profilerInput, { pinned: true }, ACTIVE_GROUP).then(() => TPromise.as(true));
-			}
-		});
+		let connectionProfile = TaskUtilities.getCurrentGlobalConnection(objectExplorerService, connectionService, editorService);
+		let profilerInput = instantiationService.createInstance(ProfilerInput, connectionProfile);
+		return editorService.openEditor(profilerInput, { pinned: true }, ACTIVE_GROUP).then(() => TPromise.as(true));
 	}
 });
 

src/sql/parts/profiler/contrib/profilerActions.ts

@@ -10,6 +10,7 @@ import { IProfilerController } from 'sql/parts/profiler/editor/controller/interf
 import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput';
 import { BaseActionContext } from 'sql/workbench/common/actions';
 import { Task } from 'sql/platform/tasks/common/tasks';
+import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions';
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
 import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType } from 'sql/parts/connection/common/connectionManagement';
 import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
@@ -24,11 +25,8 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class ProfilerConnect extends Action {
-	private static readonly ConnectText = nls.localize('profilerAction.connect', 'Connect');
-	private static readonly DisconnectText = nls.localize('profilerAction.disconnect', 'Disconnect');
-
 	public static ID = 'profiler.connect';
-	public static LABEL = ProfilerConnect.ConnectText;
+	public static LABEL = nls.localize('profiler.connect', "Connect");
 
 	private _connected: boolean = false;
 
@@ -61,7 +59,7 @@ export class ProfilerConnect extends Action {
 	public set connected(value: boolean) {
 		this._connected = value;
 		this._setClass(value ? 'disconnect' : 'connect');
-		this._setLabel(value ? ProfilerConnect.DisconnectText : ProfilerConnect.ConnectText);
+		this._setLabel(value ? nls.localize('profilerAction.disconnect', 'Disconnect') : nls.localize('profilerAction.connect', "Connect"));
 	}
 
 	public get connected(): boolean {
@@ -77,7 +75,7 @@ export class ProfilerStart extends Action {
 		id: string, label: string,
 		@IProfilerService private _profilerService: IProfilerService
 	) {
-		super(id, label, 'sql start');
+		super(id, label, 'start');
 	}
 
 	public run(input: ProfilerInput): TPromise<boolean> {
@@ -88,7 +86,7 @@ export class ProfilerStart extends Action {
 
 export class ProfilerCreate extends Action {
 	public static ID = 'profiler.create';
-	public static LABEL = nls.localize('create', "New Session");
+	public static LABEL = nls.localize('create', "Create");
 
 	constructor(
 		id: string, label: string,
@@ -107,13 +105,8 @@ export class ProfilerCreate extends Action {
 }
 
 export class ProfilerPause extends Action {
-	private static readonly PauseText = nls.localize('profilerAction.pauseCapture', 'Pause');
-	private static readonly ResumeText = nls.localize('profilerAction.resumeCapture', 'Resume');
-	private static readonly PauseCssClass = 'sql pause';
-	private static readonly ResumeCssClass = 'sql continue';
-
 	public static ID = 'profiler.pause';
-	public static LABEL = ProfilerPause.PauseText;
+	public static LABEL = nls.localize('profiler.capture', "Pause Capture");
 
 	private _paused: boolean = false;
 
@@ -121,7 +114,7 @@ export class ProfilerPause extends Action {
 		id: string, label: string,
 		@IProfilerService private _profilerService: IProfilerService
 	) {
-		super(id, label, ProfilerPause.PauseCssClass);
+		super(id, label, 'stop');
 	}
 
 	public run(input: ProfilerInput): TPromise<boolean> {
@@ -134,8 +127,8 @@ export class ProfilerPause extends Action {
 
 	public set paused(value: boolean) {
 		this._paused = value;
-		this._setClass(value ? ProfilerPause.ResumeCssClass : ProfilerPause.PauseCssClass);
-		this._setLabel(value ? ProfilerPause.ResumeText : ProfilerPause.PauseText);
+		this._setClass(value ? 'start' : 'stop');
+		this._setLabel(value ? nls.localize('profilerAction.resumeCapture', "Resume Capture") : nls.localize('profilerAction.pauseCapture', "Pause Capture"));
 	}
 
 	public get paused(): boolean {
@@ -151,7 +144,7 @@ export class ProfilerStop extends Action {
 		id: string, label: string,
 		@IProfilerService private _profilerService: IProfilerService
 	) {
-		super(id, label, 'sql stop');
+		super(id, label, 'stop');
 	}
 
 	public run(input: ProfilerInput): TPromise<boolean> {
@@ -174,21 +167,16 @@ export class ProfilerClear extends Action {
 }
 
 export class ProfilerAutoScroll extends Action {
-	private static readonly AutoScrollOnText = nls.localize('profilerAction.autoscrollOn', 'Auto Scroll: On');
-	private static readonly AutoScrollOffText = nls.localize('profilerAction.autoscrollOff', 'Auto Scroll: Off');
-	private static readonly CheckedCssClass = 'sql checked';
-
 	public static ID = 'profiler.autoscroll';
-	public static LABEL = ProfilerAutoScroll.AutoScrollOnText;
+	public static LABEL = nls.localize('profiler.autoscrollOn', "Auto Scroll: On");
 
 	constructor(id: string, label: string) {
-		super(id, label, ProfilerAutoScroll.CheckedCssClass);
+		super(id, label);
 	}
 
 	run(input: ProfilerInput): TPromise<boolean> {
 		this.checked = !this.checked;
-		this._setLabel(this.checked ? ProfilerAutoScroll.AutoScrollOnText : ProfilerAutoScroll.AutoScrollOffText);
-		this._setClass(this.checked ? ProfilerAutoScroll.CheckedCssClass : '');
+		this._setLabel(this.checked ? nls.localize('profilerAction.autoscrollOn', "Auto Scroll: On") : nls.localize('profilerAction.autoscrollOff', "Auto Scroll: Off"));
 		input.state.change({ autoscroll: this.checked });
 		return TPromise.as(true);
 	}
@@ -268,7 +256,7 @@ export class ProfilerFindPrevious implements IEditorAction {
 
 export class NewProfilerAction extends Task {
 	public static readonly ID = 'profiler.newProfiler';
-	public static readonly LABEL = nls.localize('profilerAction.newProfiler', 'Launch Profiler');
+	public static readonly LABEL = nls.localize('profilerAction.newProfiler', 'New Profiler');
 	public static readonly ICON = 'profile';
 
 	private _connectionProfile: ConnectionProfile;

src/sql/parts/profiler/contrib/profilerWorkbenchActions.ts

@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { Action } from 'vs/base/common/actions';
+import * as nls from 'vs/nls';
+
+import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
+import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
+
+export class GlobalNewProfilerAction extends Action {
+	public static ID = 'explorer.newProfiler';
+	public static LABEL = nls.localize('profilerWorkbenchAction.newProfiler', "New Profiler");
+
+	constructor(
+		id: string, label: string,
+		@IEditorService private _editorService: IEditorService,
+		@IInstantiationService private _instantiationService: IInstantiationService,
+		@IConnectionManagementService private _connectionService: IConnectionManagementService
+	) {
+		super(id, label);
+	}
+
+	run(context?: any): TPromise<boolean> {
+		// TODO: for test-only, grab the first MSSQL active connection for the profiler session
+		// TODO: when finishing the feature the connection should come from the launch context
+		let connectionProfile: IConnectionProfile;
+		if (context && context.connectionProfile) {
+			connectionProfile = context.connectionProfile;
+		} else {
+			let activeConnections = this._connectionService.getActiveConnections();
+			if (activeConnections) {
+				for (let i = 0; i < activeConnections.length; ++i) {
+					if (activeConnections[i].providerName === 'MSSQL') {
+						connectionProfile = activeConnections[i];
+						break;
+					}
+				}
+			}
+		}
+
+		let profilerInput = this._instantiationService.createInstance(ProfilerInput, connectionProfile);
+		return this._editorService.openEditor(profilerInput, { pinned: true }, ACTIVE_GROUP).then(() => TPromise.as(true));
+	}
+}

src/sql/parts/profiler/editor/profilerEditor.ts

@@ -122,6 +122,7 @@ export class ProfilerEditor extends BaseEditor {
 	private _viewTemplates: Array<IProfilerViewTemplate>;
 	private _sessionSelector: SelectBox;
 	private _sessionsList: Array<string>;
+	private _connectionInfoText: HTMLElement;
 
 	// Actions
 	private _connectAction: Actions.ProfilerConnect;
@@ -210,7 +211,6 @@ export class ProfilerEditor extends BaseEditor {
 
 		this._viewTemplates = this._profilerService.getViewTemplates();
 		this._viewTemplateSelector = new SelectBox(this._viewTemplates.map(i => i.name), 'Standard View', this._contextViewService);
-		this._viewTemplateSelector.setAriaLabel(nls.localize('profiler.viewSelectAccessibleName', 'Select View'));
 		this._register(this._viewTemplateSelector.onDidSelect(e => {
 			if (this.input) {
 				this.input.viewTemplate = this._viewTemplates.find(i => i.name === e.selected);
@@ -223,7 +223,6 @@ export class ProfilerEditor extends BaseEditor {
 
 		this._sessionsList = [''];
 		this._sessionSelector = new SelectBox(this._sessionsList, '', this._contextViewService);
-		this._sessionSelector.setAriaLabel(nls.localize('profiler.sessionSelectAccessibleName', 'Select Session'));
 		this._register(this._sessionSelector.onDidSelect(e => {
 			if (this.input) {
 				this.input.sessionName = e.selected;
@@ -234,36 +233,32 @@ export class ProfilerEditor extends BaseEditor {
 		sessionsContainer.style.paddingRight = '5px';
 		this._sessionSelector.render(sessionsContainer);
 
+		this._connectionInfoText = document.createElement('div');
+		this._connectionInfoText.style.paddingRight = '5px';
+		this._connectionInfoText.innerText = '';
+		this._connectionInfoText.style.textAlign = 'center';
+		this._connectionInfoText.style.display = 'flex';
+		this._connectionInfoText.style.alignItems = 'center';
+
 		this._register(attachSelectBoxStyler(this._viewTemplateSelector, this.themeService));
 		this._register(attachSelectBoxStyler(this._sessionSelector, this.themeService));
 
 		this._actionBar.setContent([
-			{ action: this._createAction },
-			{ element: Taskbar.createTaskbarSeparator() },
-			{ element: this._createTextElement(nls.localize('profiler.sessionSelectLabel', 'Select Session:')) },
-			{ element: sessionsContainer },
 			{ action: this._startAction },
 			{ action: this._stopAction },
-			{ action: this._pauseAction },
+			{ element: sessionsContainer },
+			{ action: this._createAction },
+			{ element: Taskbar.createTaskbarSeparator() },
+			{ action: this._pauseAction },
+			{ action: this._autoscrollAction },
+			{ action: this._instantiationService.createInstance(Actions.ProfilerClear, Actions.ProfilerClear.ID, Actions.ProfilerClear.LABEL) },
 			{ element: Taskbar.createTaskbarSeparator() },
-			{ element: this._createTextElement(nls.localize('profiler.viewSelectLabel', 'Select View:')) },
 			{ element: viewTemplateContainer },
 			{ element: Taskbar.createTaskbarSeparator() },
-			{ action: this._autoscrollAction },
-			{ action: this._instantiationService.createInstance(Actions.ProfilerClear, Actions.ProfilerClear.ID, Actions.ProfilerClear.LABEL) }
+			{ element: this._connectionInfoText }
 		]);
 	}
 
-	private _createTextElement(text: string): HTMLDivElement {
-		let textElement = document.createElement('div');
-		textElement.style.paddingRight = '10px';
-		textElement.innerText = text;
-		textElement.style.textAlign = 'center';
-		textElement.style.display = 'flex';
-		textElement.style.alignItems = 'center';
-		return textElement;
-	}
-
 	private _createProfilerTable(): HTMLElement {
 		let profilerTableContainer = document.createElement('div');
 		profilerTableContainer.className = 'profiler-table monaco-editor';
@@ -422,6 +417,7 @@ export class ProfilerEditor extends BaseEditor {
 				autoscroll: true,
 				isPanelCollapsed: true
 			});
+			this._connectionInfoText.innerText = input.connectionName;
 			this._profilerTableEditor.updateState();
 			this._splitView.layout();
 			this._profilerTableEditor.focus();
@@ -468,16 +464,34 @@ export class ProfilerEditor extends BaseEditor {
 			this._connectAction.connected = this.input.state.isConnected;
 
 			if (this.input.state.isConnected) {
+
 				this._updateToolbar();
+				this._sessionSelector.enable();
+				this._profilerService.getXEventSessions(this.input.id).then((r) => {
+					// set undefined result to empty list
+					if (!r) {
+						r = [];
+					}
 
-				// Launch the create session dialog if openning a new window.
-				let uiState = this._profilerService.getSessionViewState(this.input.id);
-				let previousSessionName = uiState && uiState.previousSessionName;
-				if (!this.input.sessionName && !previousSessionName) {
-					this._profilerService.launchCreateSessionDialog(this.input);
-				}
+					this._sessionSelector.setOptions(r);
+					this._sessionsList = r;
+					if ((this.input.sessionName === undefined || this.input.sessionName === '') && this._sessionsList.length > 0) {
+						let sessionIndex: number = 0;
+						let uiState = this._profilerService.getSessionViewState(this.input.id);
+						if (uiState && uiState.previousSessionName) {
+							sessionIndex = this._sessionsList.indexOf(uiState.previousSessionName);
+						} else {
+							this._profilerService.launchCreateSessionDialog(this.input);
+						}
 
-				this._updateSessionSelector(previousSessionName);
+						if (sessionIndex < 0) {
+							sessionIndex = 0;
+						}
+
+						this.input.sessionName = this._sessionsList[sessionIndex];
+						this._sessionSelector.selectWithOptionName(this.input.sessionName);
+					}
+				});
 			} else {
 				this._startAction.enabled = false;
 				this._stopAction.enabled = false;
@@ -503,35 +517,23 @@ export class ProfilerEditor extends BaseEditor {
 			}
 			if (this.input.state.isStopped) {
 				this._updateToolbar();
-				this._updateSessionSelector();
+				this._sessionSelector.enable();
+				this._profilerService.getXEventSessions(this.input.id).then((r) => {
+					// set undefined result to empty list
+					if (!r) {
+						r = [];
+					}
+
+					this._sessionsList = r;
+					this._sessionSelector.setOptions(r);
+					if ((this.input.sessionName === undefined || this.input.sessionName === '') && this._sessionsList.length > 0) {
+						this.input.sessionName = this._sessionsList[0];
+					}
+				});
 			}
 		}
 	}
 
-	private _updateSessionSelector(previousSessionName: string = undefined) {
-		this._sessionSelector.enable();
-		this._profilerService.getXEventSessions(this.input.id).then((r) => {
-			if (!r) {
-				r = [];
-			}
-
-			this._sessionSelector.setOptions(r);
-			this._sessionsList = r;
-			if (this._sessionsList.length > 0) {
-				if (!this.input.sessionName) {
-					this.input.sessionName = previousSessionName;
-				}
-
-				if (this._sessionsList.indexOf(this.input.sessionName) === -1) {
-					this.input.sessionName = this._sessionsList[0];
-				}
-
-				this._sessionSelector.selectWithOptionName(this.input.sessionName);
-			};
-		});
-
-	}
-
 	private _updateToolbar(): void {
 		this._startAction.enabled = !this.input.state.isRunning && !this.input.state.isPaused && this.input.state.isConnected;
 		this._createAction.enabled = !this.input.state.isRunning && !this.input.state.isPaused && this.input.state.isConnected;

src/sql/parts/profiler/editor/profilerInput.ts

@@ -12,7 +12,7 @@ import * as sqlops from 'sqlops';
 import * as nls from 'vs/nls';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { EditorInput, ConfirmResult } from 'vs/workbench/common/editor';
+import { EditorInput } from 'vs/workbench/common/editor';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -22,7 +22,6 @@ import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/
 import { escape } from 'sql/base/common/strings';
 import * as types from 'vs/base/common/types';
 import URI from 'vs/base/common/uri';
-import Severity from 'vs/base/common/severity';
 
 export class ProfilerInput extends EditorInput implements IProfilerSession {
 
@@ -42,7 +41,7 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 	public onColumnsChanged: Event<Slick.Column<Slick.SlickData>[]> = this._onColumnsChanged.event;
 
 	constructor(
-		public connection: IConnectionProfile,
+		private _connection: IConnectionProfile,
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@IProfilerService private _profilerService: IProfilerService,
 		@INotificationService private _notificationService: INotificationService,
@@ -59,7 +58,7 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 			autoscroll: true
 		});
 
-		this._profilerService.registerSession(generateUuid(), connection, this).then((id) => {
+		this._profilerService.registerSession(generateUuid(), _connection, this).then((id) => {
 			this._id = id;
 			this.state.change({ isConnected: true });
 		});
@@ -73,10 +72,23 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 			return ret;
 		};
 		this._data = new TableDataView<Slick.SlickData>(undefined, searchFn);
-	}
 
-	public get providerType(): string {
-		return this.connection ? this.connection.providerName : undefined;
+		this.onDispose(() => {
+			if (this._state.isRunning || this.state.isPaused) {
+				let confirm: IConfirmation = {
+					message: nls.localize('confirmStopProfilerSession', "Would you like to stop the running XEvent session?"),
+					primaryButton: nls.localize('profilerClosingActions.yes', 'Yes'),
+					secondaryButton: nls.localize('profilerClosingActions.no', 'No'),
+					type: 'question'
+				};
+
+				this._dialogService.confirm(confirm).then(result => {
+					if (result.confirmed) {
+						this._profilerService.stopSession(this.id);
+					}
+				});
+			}
+		});
 	}
 
 	public set viewTemplate(template: IProfilerViewTemplate) {
@@ -102,7 +114,7 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 	}
 
 	public set sessionName(name: string) {
-		if (!this.state.isRunning || !this.state.isPaused) {
+		if (!this._state.isRunning || !this.state.isPaused) {
 			this._sessionName = name;
 		}
 	}
@@ -121,10 +133,10 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 
 	public getName(): string {
 		let name: string = nls.localize('profilerInput.profiler', 'Profiler');
-		if (!this.connection) {
+		if (!this._connection) {
 			return name;
 		}
-		name += ': ' + this.connection.serverName.substring(0, 20);
+		name += ': ' + this._connection.serverName.substring(0, 20);
 		return name;
 	}
 
@@ -166,11 +178,11 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 	}
 
 	public get connectionName(): string {
-		if (!types.isUndefinedOrNull(this.connection)) {
-			if (this.connection.databaseName) {
-				return `${this.connection.serverName} ${this.connection.databaseName}`;
+		if (!types.isUndefinedOrNull(this._connection)) {
+			if (this._connection.databaseName) {
+				return `${this._connection.serverName} ${this._connection.databaseName}`;
 			} else {
-				return `${this.connection.serverName}`;
+				return `${this._connection.serverName}`;
 			}
 		}
 		else {
@@ -187,7 +199,7 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 	}
 
 	public onSessionStopped(notification: sqlops.ProfilerSessionStoppedParams) {
-		this._notificationService.error(nls.localize("profiler.sessionStopped", "XEvent Profiler Session stopped unexpectedly on the server {0}.", this.connection.serverName));
+		this._notificationService.error(nls.localize("profiler.sessionStopped", "XEvent Profiler Session stopped unexpectedly on the server {0}.", this._connection.serverName));
 
 		this.state.change({
 			isStopped: true,
@@ -228,7 +240,7 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 
 	public onMoreRows(eventMessage: sqlops.ProfilerSessionEvents) {
 		if (eventMessage.eventsLost) {
-			this._notificationService.warn(nls.localize("profiler.eventsLost", "The XEvent Profiler session for {0} has lost events.", this.connection.serverName));
+			this._notificationService.warn(nls.localize("profiler.eventsLost", "The XEvent Profiler session for {0} has lost events.", this._connection.serverName));
 		}
 
 		for (let i: number = 0; i < eventMessage.events.length && i < 500; ++i) {
@@ -252,31 +264,4 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 		}
 
 	}
-
-	confirmSave(): TPromise<ConfirmResult> {
-		if (this.state.isRunning || this.state.isPaused) {
-			return this._dialogService.show(Severity.Warning,
-				nls.localize('confirmStopProfilerSession', "Would you like to stop the running XEvent session?"),
-				[
-					nls.localize('profilerClosingActions.yes', 'Yes'),
-					nls.localize('profilerClosingActions.no', 'No'),
-					nls.localize('profilerClosingActions.cancel', 'Cancel')
-				]).then((selection: number) => {
-					if (selection === 0) {
-						this._profilerService.stopSession(this.id);
-						return ConfirmResult.DONT_SAVE;
-					} else if (selection === 1) {
-						return ConfirmResult.DONT_SAVE;
-					} else {
-						return ConfirmResult.CANCEL;
-					}
-				});;
-		} else {
-			return TPromise.wrap(ConfirmResult.DONT_SAVE);
-		}
-	}
-
-	isDirty(): boolean {
-		return this.state.isRunning || this.state.isPaused;
-	}
 }

src/sql/parts/profiler/service/profilerService.ts

@@ -141,10 +141,7 @@ export class ProfilerService implements IProfilerService {
 			this._sessionMap.get(this._idMap.reverseGet(id)).onSessionStateChanged({ isStopped: true, isPaused: false, isRunning: false });
 			return true;
 		}, (reason) => {
-			// The error won't be actionable to the user, so only log it to console.
-			// In case of error, the state of the UI is not usable, makes more sense to
-			// set it to stopped so that user can restart it or pick a different session
-			this._sessionMap.get(this._idMap.reverseGet(id)).onSessionStateChanged({ isStopped: true, isPaused: false, isRunning: false });
+			this._notificationService.error(reason.message);
 		});
 	}
 
@@ -231,6 +228,6 @@ export class ProfilerService implements IProfilerService {
 	}
 
 	public launchCreateSessionDialog(input?: ProfilerInput): Thenable<void> {
-		return this._commandService.executeCommand('profiler.openCreateSessionDialog', input.id, input.providerType, this.getSessionTemplates());
+		return this._commandService.executeCommand('profiler.openCreateSessionDialog', input.id, this.getSessionTemplates());
 	}
 }

src/sql/parts/query/common/query.contribution.ts

@@ -339,7 +339,7 @@ let registryProperties = {
 	'sql.showConnectionInfoInTitle': {
 		'type': 'boolean',
 		'description': localize('showConnectionInfoInTitle', "Controls whether to show the connection info for a tab in the title."),
-		'default': true
+		'default': false
 	},
 	'mssql.intelliSense.enableIntelliSense': {
 		'type': 'boolean',

src/sql/parts/query/common/queryEditorService.ts

@@ -32,6 +32,9 @@ export interface IQueryEditorService {
 	// Creates new edit data session
 	newEditDataEditor(schemaName: string, tableName: string, queryString: string): Promise<IConnectableInput>;
 
+	// Clears any QueryEditor data for the given URI held by this service
+	onQueryInputClosed(uri: string): void;
+
 	/**
 	 * Handles updating of SQL files on a save as event. These need special consideration
 	 * due to query results and other information being tied to the URI of the file

src/sql/parts/query/common/queryInput.ts

@@ -116,11 +116,11 @@ export class QueryInput extends EditorInput implements IEncodingSupport, IConnec
 		}
 
 		if (this._configurationService) {
-			this._toDispose.push(this._configurationService.onDidChangeConfiguration(e => {
+			this._configurationService.onDidChangeConfiguration(e => {
 				if (e.affectedKeys.includes('sql.showConnectionInfoInTitle')) {
 					this._onDidChangeLabel.fire();
 				}
-			}));
+			});
 		}
 
 		this.onDisconnect();
@@ -196,17 +196,17 @@ export class QueryInput extends EditorInput implements IEncodingSupport, IConnec
 
 	// State update funtions
 	public runQuery(selection: ISelectionData, executePlanOptions?: ExecutionPlanOptions): void {
-		this._queryModelService.runQuery(this.uri, selection, this, executePlanOptions);
+		this._queryModelService.runQuery(this.uri, selection, this.uri, this, executePlanOptions);
 		this.showQueryResultsEditor();
 	}
 
 	public runQueryStatement(selection: ISelectionData): void {
-		this._queryModelService.runQueryStatement(this.uri, selection, this);
+		this._queryModelService.runQueryStatement(this.uri, selection, this.uri, this);
 		this.showQueryResultsEditor();
 	}
 
 	public runQueryString(text: string): void {
-		this._queryModelService.runQueryString(this.uri, text, this);
+		this._queryModelService.runQueryString(this.uri, text, this.uri, this);
 		this.showQueryResultsEditor();
 	}
 
@@ -276,6 +276,7 @@ export class QueryInput extends EditorInput implements IEncodingSupport, IConnec
 
 	// Clean up functions
 	public dispose(): void {
+		this._queryModelService.disposeQuery(this.uri);
 		this._sql.dispose();
 		this._results.dispose();
 		this._toDispose = dispose(this._toDispose);
@@ -284,7 +285,7 @@ export class QueryInput extends EditorInput implements IEncodingSupport, IConnec
 	}
 
 	public close(): void {
-		this._queryModelService.disposeQuery(this.uri);
+		this._queryEditorService.onQueryInputClosed(this.uri);
 		this._connectionManagementService.disconnectEditor(this, true);
 
 		this._sql.close();

src/sql/parts/query/common/queryManagement.ts

@@ -215,7 +215,6 @@ export class QueryManagementService implements IQueryManagementService {
 		});
 	}
 	public disposeQuery(ownerUri: string): Thenable<void> {
-		this._queryRunners.delete(ownerUri);
 		return this._runAction(ownerUri, (runner) => {
 			return runner.disposeQuery(ownerUri);
 		});

src/sql/parts/query/common/queryResultsInput.ts

@@ -29,13 +29,6 @@ export class ResultsViewState {
 	constructor(@IConfigurationService private configurationService: IConfigurationService) {
 
 	}
-
-	dispose() {
-		this.gridPanelState.dispose();
-		this.messagePanelState.dispose();
-		this.chartState.dispose();
-		this.queryPlanState.dispose();
-	}
 }
 
 /**
@@ -57,11 +50,7 @@ export class QueryResultsInput extends EditorInput {
 	public readonly onRestoreViewStateEmitter = new Emitter<void>();
 	public readonly onSaveViewStateEmitter = new Emitter<void>();
 
-	private _state = new ResultsViewState(this.configurationService);
-
-	public get state(): ResultsViewState {
-		return this._state;
-	}
+	public readonly state = new ResultsViewState(this.configurationService);
 
 	constructor(private _uri: string,
 		@IConfigurationService private configurationService: IConfigurationService
@@ -71,12 +60,6 @@ export class QueryResultsInput extends EditorInput {
 		this._hasBootstrapped = false;
 	}
 
-	close() {
-		this.state.dispose();
-		this._state = undefined;
-		super.close();
-	}
-
 	getTypeId(): string {
 		return QueryResultsInput.ID;
 	}

src/sql/parts/query/editor/charting/chartTab.ts

@@ -33,8 +33,4 @@ export class ChartTab implements IPanelTab {
 	public dispose() {
 		this.view.dispose();
 	}
-
-	public clear() {
-		this.view.clear();
-	}
 }

src/sql/parts/query/editor/charting/chartView.ts

@@ -35,10 +35,6 @@ export class ChartState {
 	options: IInsightOptions = {
 		type: ChartType.Bar
 	};
-
-	dispose() {
-
-	}
 }
 
 declare class Proxy {
@@ -138,15 +134,6 @@ export class ChartView extends Disposable implements IPanelView {
 		this.buildOptions();
 	}
 
-	public clear() {
-
-	}
-
-	public dispose() {
-		dispose(this.optionDisposables);
-		super.dispose();
-	}
-
 	render(container: HTMLElement): void {
 		if (!this.container) {
 			this.container = $('div.chart-parent-container');

src/sql/parts/query/editor/gridPanel.ts

@@ -7,7 +7,7 @@
 import { attachTableStyler } from 'sql/common/theme/styler';
 import QueryRunner from 'sql/parts/query/execution/queryRunner';
 import { VirtualizedCollection, AsyncDataProvider } from 'sql/base/browser/ui/table/asyncDataView';
-import { Table } from 'sql/base/browser/ui/table/table';
+import { Table, ITableStyles, ITableMouseEvent } from 'sql/base/browser/ui/table/table';
 import { ScrollableSplitView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview';
 import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin';
 import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';
@@ -19,7 +19,6 @@ import { escape } from 'sql/base/common/strings';
 import { hyperLinkFormatter, textFormatter } from 'sql/parts/grid/services/sharedServices';
 import { CopyKeybind } from 'sql/base/browser/ui/table/plugins/copyKeybind.plugin';
 import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin';
-import { ITableStyles, ITableMouseEvent } from 'sql/base/browser/ui/table/interfaces';
 
 import * as sqlops from 'sqlops';
 import * as pretty from 'pretty-data';
@@ -62,10 +61,6 @@ export class GridPanelState {
 	public tableStates: GridTableState[] = [];
 	public scrollPosition: number;
 	public collapsed = false;
-
-	dispose() {
-		dispose(this.tableStates);
-	}
 }
 
 export interface IGridTableState {
@@ -73,14 +68,14 @@ export interface IGridTableState {
 	maximized: boolean;
 }
 
-export class GridTableState extends Disposable {
+export class GridTableState {
 
 	private _maximized: boolean;
 
-	private _onMaximizedChange = this._register(new Emitter<boolean>());
+	private _onMaximizedChange = new Emitter<boolean>();
 	public onMaximizedChange: Event<boolean> = this._onMaximizedChange.event;
 
-	private _onCanBeMaximizedChange = this._register(new Emitter<boolean>());
+	private _onCanBeMaximizedChange = new Emitter<boolean>();
 	public onCanBeMaximizedChange: Event<boolean> = this._onCanBeMaximizedChange.event;
 
 	private _canBeMaximized: boolean;
@@ -91,7 +86,6 @@ export class GridTableState extends Disposable {
 	public activeCell: Slick.Cell;
 
 	constructor(public readonly resultId: number, public readonly batchId: number) {
-		super();
 	}
 
 	public get canBeMaximized(): boolean {
@@ -223,13 +217,13 @@ export class GridPanel extends ViewletPanel {
 			}
 			let table = this.instantiationService.createInstance(GridTable, this.runner, set);
 			table.state = tableState;
-			this.tableDisposable.push(tableState.onMaximizedChange(e => {
+			tableState.onMaximizedChange(e => {
 				if (e) {
 					this.maximizeTable(table.id);
 				} else {
 					this.minimizeTables();
 				}
-			}));
+			});
 			this.tableDisposable.push(attachTableStyler(table, this.themeService));
 
 			tables.push(table);
@@ -244,17 +238,11 @@ export class GridPanel extends ViewletPanel {
 		this.tables = this.tables.concat(tables);
 	}
 
-	public clear() {
-		this.reset();
-	}
-
 	private reset() {
 		for (let i = this.splitView.length - 1; i >= 0; i--) {
 			this.splitView.removeView(i);
 		}
 		dispose(this.tables);
-		dispose(this.tableDisposable);
-		this.tableDisposable = [];
 		this.tables = [];
 		this.maximizedGrid = undefined;
 
@@ -305,15 +293,6 @@ export class GridPanel extends ViewletPanel {
 	public get state(): GridPanelState {
 		return this._state;
 	}
-
-	public dispose() {
-		dispose(this.queryRunnerDisposables);
-		dispose(this.tableDisposable);
-		dispose(this.tables);
-		this.tableDisposable = undefined;
-		this.tables = undefined;
-		super.dispose();
-	}
 }
 
 class GridTable<T> extends Disposable implements IView {
@@ -465,9 +444,9 @@ class GridTable<T> extends Disposable implements IView {
 
 	private setupState() {
 		// change actionbar on maximize change
-		this._register(this.state.onMaximizedChange(this.rebuildActionBar, this));
+		this.state.onMaximizedChange(this.rebuildActionBar, this);
 
-		this._register(this.state.onCanBeMaximizedChange(this.rebuildActionBar, this));
+		this.state.onCanBeMaximizedChange(this.rebuildActionBar, this);
 
 		if (this.state.scrollPosition) {
 			// most of the time this won't do anything
@@ -677,8 +656,6 @@ class GridTable<T> extends Disposable implements IView {
 
 	public dispose() {
 		$(this.container).destroy();
-		this.table.dispose();
-		this.actionBar.dispose();
 		super.dispose();
 	}
 }

src/sql/parts/query/editor/messagePanel.ts

@@ -7,7 +7,6 @@
 import 'vs/css!./media/messagePanel';
 import { IMessagesActionContext, SelectAllMessagesAction, CopyMessagesAction } from './actions';
 import QueryRunner from 'sql/parts/query/execution/queryRunner';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
 
 import { IResultMessage, ISelectionData } from 'sqlops';
 
@@ -29,6 +28,8 @@ import { $ } from 'vs/base/browser/builder';
 import { isArray, isUndefinedOrNull } from 'vs/base/common/types';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditor } from 'vs/editor/common/editorCommon';
+import { QueryInput } from 'sql/parts/query/common/queryInput';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 
 export interface IResultMessageIntern extends IResultMessage {
@@ -70,10 +71,6 @@ export class MessagePanelState {
 			this.collapsed = !messagesOpenedSettings;
 		}
 	}
-
-	dispose() {
-
-	}
 }
 
 export class MessagePanel extends ViewletPanel {
@@ -105,7 +102,6 @@ export class MessagePanel extends ViewletPanel {
 			renderer: this.renderer,
 			controller: this.controller
 		}, { keyboardSupport: false, horizontalScrollMode: ScrollbarVisibility.Auto });
-		this.disposables.push(this.tree);
 		this.tree.onDidScroll(e => {
 			if (this.state) {
 				this.state.scrollPosition = this.tree.getScrollPosition();
@@ -121,7 +117,7 @@ export class MessagePanel extends ViewletPanel {
 	protected renderBody(container: HTMLElement): void {
 		this.container.style.width = '100%';
 		this.container.style.height = '100%';
-		this.disposables.push(attachListStyler(this.tree, this.themeService));
+		attachListStyler(this.tree, this.themeService);
 		container.appendChild(this.container);
 		this.tree.setInput(this.model);
 	}
@@ -197,19 +193,9 @@ export class MessagePanel extends ViewletPanel {
 		}
 		this.setExpanded(!this.state.collapsed);
 	}
-
 	public get state(): MessagePanelState {
 		return this._state;
 	}
-
-	public clear() {
-		this.reset();
-	}
-
-	public dispose() {
-		dispose(this.queryRunnerDisposables);
-		super.dispose();
-	}
 }
 
 class MessageDataSource implements IDataSource {

src/sql/parts/query/editor/queryEditor.ts

@@ -478,11 +478,11 @@ export class QueryEditor extends BaseEditor {
 
 		this.setTaskbarContent();
 
-		this._toDispose.push(this._configurationService.onDidChangeConfiguration(e => {
+		this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectedKeys.includes('workbench.enablePreviewFeatures')) {
 				this.setTaskbarContent();
 			}
-		}));
+		});
 	}
 
 	private setTaskbarContent(): void {

src/sql/parts/query/editor/queryResultsEditor.ts

@@ -90,6 +90,7 @@ export class QueryResultsEditor extends BaseEditor {
 	public static ID: string = 'workbench.editor.queryResultsEditor';
 	public static AngularSelectorString: string = 'slickgrid-container.slickgridContainer';
 	protected _rawOptions: BareResultsGridInfo;
+	protected _input: QueryResultsInput;
 
 	private resultsView: QueryResultsView;
 	private styleSheet = DOM.createStyleSheet();
@@ -103,17 +104,17 @@ export class QueryResultsEditor extends BaseEditor {
 	) {
 		super(QueryResultsEditor.ID, telemetryService, themeService);
 		this._rawOptions = BareResultsGridInfo.createFromRawSettings(this._configurationService.getValue('resultsGrid'), getZoomLevel());
-		this._register(this._configurationService.onDidChangeConfiguration(e => {
+		this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('resultsGrid')) {
 				this._rawOptions = BareResultsGridInfo.createFromRawSettings(this._configurationService.getValue('resultsGrid'), getZoomLevel());
 				this.applySettings();
 			}
-		}));
+		});
 		this.applySettings();
 	}
 
 	public get input(): QueryResultsInput {
-		return this._input as QueryResultsInput;
+		return this._input;
 	}
 
 	private applySettings() {
@@ -132,16 +133,10 @@ export class QueryResultsEditor extends BaseEditor {
 		this.styleSheet.remove();
 		parent.appendChild(this.styleSheet);
 		if (!this.resultsView) {
-			this.resultsView = this._register(new QueryResultsView(parent, this._instantiationService, this._queryModelService));
+			this.resultsView = new QueryResultsView(parent, this._instantiationService, this._queryModelService);
 		}
 	}
 
-	dispose() {
-		this.styleSheet.remove();
-		this.styleSheet = undefined;
-		super.dispose();
-	}
-
 	layout(dimension: DOM.Dimension): void {
 		this.resultsView.layout(dimension);
 	}
@@ -152,11 +147,6 @@ export class QueryResultsEditor extends BaseEditor {
 		return TPromise.wrap<void>(null);
 	}
 
-	clearInput() {
-		this.resultsView.clearInput();
-		super.clearInput();
-	}
-
 	public chart(dataId: { batchId: number, resultId: number }) {
 		this.resultsView.chartData(dataId);
 	}
@@ -164,4 +154,11 @@ export class QueryResultsEditor extends BaseEditor {
 	public showQueryPlan(xml: string) {
 		this.resultsView.showPlan(xml);
 	}
+
+	public dispose(): void {
+		super.dispose();
+		if (this.resultsView) {
+			this.resultsView.dispose();
+		}
+	}
 }

src/sql/parts/query/editor/queryResultsView.ts

@@ -111,15 +111,6 @@ class ResultsView extends Disposable implements IPanelView {
 		}
 	}
 
-	dispose() {
-		super.dispose();
-	}
-
-	public clear() {
-		this.gridPanel.clear();
-		this.messagePanel.clear();
-	}
-
 	remove(): void {
 		this.container.remove();
 	}
@@ -160,10 +151,6 @@ class ResultsTab implements IPanelTab {
 	public dispose() {
 		dispose(this.view);
 	}
-
-	public clear() {
-		this.view.clear();
-	}
 }
 
 export class QueryResultsView extends Disposable {
@@ -234,11 +221,8 @@ export class QueryResultsView extends Disposable {
 		}
 	}
 
-	clearInput() {
-		this._input = undefined;
-		this.resultsTab.clear();
-		this.qpTab.clear();
-		this.chartTab.clear();
+	public dispose() {
+		this._panelView.dispose();
 	}
 
 	public get input(): QueryResultsInput {
@@ -280,8 +264,4 @@ export class QueryResultsView extends Disposable {
 			this._panelView.removeTab(this.qpTab.identifier);
 		}
 	}
-
-	public dispose() {
-		super.dispose();
-	}
 }

src/sql/parts/query/execution/queryModel.ts

@@ -35,9 +35,9 @@ export interface IQueryModelService {
 	getConfig(): Promise<{ [key: string]: any }>;
 	getShortcuts(): Promise<any>;
 	getQueryRows(uri: string, rowStart: number, numberOfRows: number, batchId: number, resultId: number): Thenable<ResultSetSubset>;
-	runQuery(uri: string, selection: ISelectionData, queryInput: QueryInput, runOptions?: ExecutionPlanOptions): void;
-	runQueryStatement(uri: string, selection: ISelectionData, queryInput: QueryInput): void;
-	runQueryString(uri: string, selection: string, queryInput: QueryInput);
+	runQuery(uri: string, selection: ISelectionData, title: string, queryInput: QueryInput, runOptions?: ExecutionPlanOptions): void;
+	runQueryStatement(uri: string, selection: ISelectionData, title: string, queryInput: QueryInput): void;
+	runQueryString(uri: string, selection: string, title: string, queryInput: QueryInput);
 	cancelQuery(input: QueryRunner | string): void;
 	disposeQuery(uri: string): void;
 	isRunningQuery(uri: string): boolean;

src/sql/parts/query/execution/queryModelService.ts

@@ -209,28 +209,32 @@ export class QueryModelService implements IQueryModelService {
 	/**
 	 * Run a query for the given URI with the given text selection
 	 */
-	public runQuery(uri: string, selection: sqlops.ISelectionData, queryInput: QueryInput, runOptions?: sqlops.ExecutionPlanOptions): void {
-		this.doRunQuery(uri, selection, queryInput, false, runOptions);
+	public runQuery(uri: string, selection: sqlops.ISelectionData,
+		title: string, queryInput: QueryInput, runOptions?: sqlops.ExecutionPlanOptions): void {
+		this.doRunQuery(uri, selection, title, queryInput, false, runOptions);
 	}
 
 	/**
 	 * Run the current SQL statement for the given URI
 	 */
-	public runQueryStatement(uri: string, selection: sqlops.ISelectionData, queryInput: QueryInput): void {
-		this.doRunQuery(uri, selection, queryInput, true);
+	public runQueryStatement(uri: string, selection: sqlops.ISelectionData,
+		title: string, queryInput: QueryInput): void {
+		this.doRunQuery(uri, selection, title, queryInput, true);
 	}
 
 	/**
 	 * Run the current SQL statement for the given URI
 	 */
-	public runQueryString(uri: string, selection: string, queryInput: QueryInput): void {
-		this.doRunQuery(uri, selection, queryInput, true);
+	public runQueryString(uri: string, selection: string,
+		title: string, queryInput: QueryInput): void {
+		this.doRunQuery(uri, selection, title, queryInput, true);
 	}
 
 	/**
 	 * Run Query implementation
 	 */
-	private doRunQuery(uri: string, selection: sqlops.ISelectionData | string, queryInput: QueryInput,
+	private doRunQuery(uri: string, selection: sqlops.ISelectionData | string,
+		title: string, queryInput: QueryInput,
 		runCurrentStatement: boolean, runOptions?: sqlops.ExecutionPlanOptions): void {
 		// Reuse existing query runner if it exists
 		let queryRunner: QueryRunner;
@@ -252,7 +256,7 @@ export class QueryModelService implements IQueryModelService {
 		} else {
 			// We do not have a query runner for this editor, so create a new one
 			// and map it to the results uri
-			info = this.initQueryRunner(uri);
+			info = this.initQueryRunner(uri, title);
 			queryRunner = info.queryRunner;
 		}
 
@@ -273,8 +277,8 @@ export class QueryModelService implements IQueryModelService {
 		}
 	}
 
-	private initQueryRunner(uri: string): QueryInfo {
-		let queryRunner = this._instantiationService.createInstance(QueryRunner, uri);
+	private initQueryRunner(uri: string, title: string): QueryInfo {
+		let queryRunner = this._instantiationService.createInstance(QueryRunner, uri, title);
 		let info = new QueryInfo();
 		queryRunner.addListener(QREvents.RESULT_SET, e => {
 			this._fireQueryEvent(uri, 'resultSet', e);
@@ -359,10 +363,6 @@ export class QueryModelService implements IQueryModelService {
 		if (queryRunner) {
 			queryRunner.disposeQuery();
 		}
-		// remove our info map
-		if (this._queryInfoMap.has(ownerUri)) {
-			this._queryInfoMap.delete(ownerUri);
-		}
 	}
 
 	// EDIT DATA METHODS /////////////////////////////////////////////////////
@@ -386,7 +386,7 @@ export class QueryModelService implements IQueryModelService {
 
 			// We do not have a query runner for this editor, so create a new one
 			// and map it to the results uri
-			queryRunner = this._instantiationService.createInstance(QueryRunner, ownerUri);
+			queryRunner = this._instantiationService.createInstance(QueryRunner, ownerUri, ownerUri);
 			queryRunner.addListener(QREvents.RESULT_SET, resultSet => {
 				this._fireQueryEvent(ownerUri, 'resultSet', resultSet);
 			});

src/sql/parts/query/execution/queryRunner.ts

@@ -20,7 +20,7 @@ import * as nls from 'vs/nls';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import * as types from 'vs/base/common/types';
 import { EventEmitter } from 'sql/base/common/eventEmitter';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -62,7 +62,7 @@ export interface IGridMessage extends sqlops.IResultMessage {
 * Query Runner class which handles running a query, reports the results to the content manager,
 * and handles getting more rows from the service layer and disposing when the content is closed.
 */
-export default class QueryRunner extends Disposable {
+export default class QueryRunner {
 	// MEMBER VARIABLES ////////////////////////////////////////////////////
 	private _resultLineOffset: number;
 	private _totalElapsedMilliseconds: number = 0;
@@ -76,7 +76,7 @@ export default class QueryRunner extends Disposable {
 	private _planXml = new Deferred<string>();
 	public get planXml(): Thenable<string> { return this._planXml.promise; }
 
-	private _onMessage = this._register(new Emitter<sqlops.IResultMessage>());
+	private _onMessage = new Emitter<sqlops.IResultMessage>();
 	private _debouncedMessage = debounceEvent<sqlops.IResultMessage, sqlops.IResultMessage[]>(this._onMessage.event, (l, e) => {
 		// on first run
 		if (types.isUndefinedOrNull(l)) {
@@ -88,7 +88,7 @@ export default class QueryRunner extends Disposable {
 	private _echoedMessages = echo(this._debouncedMessage.event);
 	public readonly onMessage = this._echoedMessages.event;
 
-	private _onResultSet = this._register(new Emitter<sqlops.ResultSetSummary>());
+	private _onResultSet = new Emitter<sqlops.ResultSetSummary>();
 	private _debouncedResultSet = debounceEvent<sqlops.ResultSetSummary, sqlops.ResultSetSummary[]>(this._onResultSet.event, (l, e) => {
 		// on first run
 		if (types.isUndefinedOrNull(l)) {
@@ -100,16 +100,16 @@ export default class QueryRunner extends Disposable {
 	private _echoedResultSet = echo(this._debouncedResultSet.event);
 	public readonly onResultSet = this._echoedResultSet.event;
 
-	private _onQueryStart = this._register(new Emitter<void>());
+	private _onQueryStart = new Emitter<void>();
 	public readonly onQueryStart: Event<void> = this._onQueryStart.event;
 
-	private _onQueryEnd = this._register(new Emitter<string>());
+	private _onQueryEnd = new Emitter<string>();
 	public readonly onQueryEnd: Event<string> = this._onQueryEnd.event;
 
-	private _onBatchStart = this._register(new Emitter<sqlops.BatchSummary>());
+	private _onBatchStart = new Emitter<sqlops.BatchSummary>();
 	public readonly onBatchStart: Event<sqlops.BatchSummary> = this._onBatchStart.event;
 
-	private _onBatchEnd = this._register(new Emitter<sqlops.BatchSummary>());
+	private _onBatchEnd = new Emitter<sqlops.BatchSummary>();
 	public readonly onBatchEnd: Event<sqlops.BatchSummary> = this._onBatchEnd.event;
 
 	private _queryStartTime: Date;
@@ -124,14 +124,13 @@ export default class QueryRunner extends Disposable {
 	// CONSTRUCTOR /////////////////////////////////////////////////////////
 	constructor(
 		public uri: string,
+		public title: string,
 		@IQueryManagementService private _queryManagementService: IQueryManagementService,
 		@INotificationService private _notificationService: INotificationService,
 		@IWorkspaceConfigurationService private _workspaceConfigurationService: IWorkspaceConfigurationService,
 		@IClipboardService private _clipboardService: IClipboardService,
 		@IInstantiationService private instantiationService: IInstantiationService
-	) {
-		super();
-	}
+	) { }
 
 	get isExecuting(): boolean {
 		return this._isExecuting;
@@ -505,16 +504,10 @@ export default class QueryRunner extends Disposable {
 
 	/**
 	 * Disposes the Query from the service client
+	 * @returns A promise that will be rejected if a problem occured
 	 */
 	public disposeQuery(): void {
-		this._queryManagementService.disposeQuery(this.uri).then(() => {
-			this.dispose();
-		});
-	}
-
-	public dispose() {
-		this._batchSets = undefined;
-		super.dispose();
+		this._queryManagementService.disposeQuery(this.uri);
 	}
 
 	get totalElapsedMilliseconds(): number {

src/sql/parts/query/services/queryEditorService.ts

@@ -152,6 +152,12 @@ export class QueryEditorService implements IQueryEditorService {
 		});
 	}
 
+	/**
+	 * Clears any QueryEditor data for the given URI held by this service
+	 */
+	public onQueryInputClosed(uri: string): void {
+	}
+
 	onSaveAsCompleted(oldResource: URI, newResource: URI): void {
 		let oldResourceString: string = oldResource.toString();
 

src/sql/parts/queryPlan/queryPlan.ts

@@ -15,9 +15,6 @@ import { dispose, Disposable } from 'vs/base/common/lifecycle';
 
 export class QueryPlanState {
 	xml: string;
-	dispose() {
-
-	}
 }
 
 export class QueryPlanTab implements IPanelTab {
@@ -32,10 +29,6 @@ export class QueryPlanTab implements IPanelTab {
 	public dispose() {
 		dispose(this.view);
 	}
-
-	public clear() {
-		this.view.clear();
-	}
 }
 
 export class QueryPlanView implements IPanelView {
@@ -66,12 +59,6 @@ export class QueryPlanView implements IPanelView {
 		this.container.style.height = dimension.height + 'px';
 	}
 
-	public clear() {
-		if (this.qp) {
-			this.qp.xml = undefined;
-		}
-	}
-
 	public showPlan(xml: string) {
 		if (this.qp) {
 			this.qp.xml = xml;

src/sql/platform/dialog/media/dialogModal.css

@@ -16,18 +16,6 @@
 	min-width: 800px;
 }
 
-.dialog-message-and-page-container {
-	display: flex;
-	flex-direction: column;
-	flex: 1 1;
-	overflow: hidden;
-}
-
-.dialogModal-page-container {
-	flex: 1 1;
-	overflow: hidden;
-}
-
 .dialogModal-pane {
 	display: flex;
 	flex-direction: column;

src/sql/platform/dialog/wizardModal.ts

@@ -34,9 +34,6 @@ export class WizardModal extends Modal {
 	// Wizard HTML elements
 	private _body: HTMLElement;
 
-	private _messageAndPageContainer: HTMLElement;
-	private _pageContainer: HTMLElement;
-
 	// Buttons
 	private _previousButton: Button;
 	private _nextButton: Button;
@@ -56,7 +53,6 @@ export class WizardModal extends Modal {
 		@IClipboardService clipboardService: IClipboardService
 	) {
 		super(_wizard.title, name, partService, telemetryService, clipboardService, themeService, contextKeyService, options);
-		this._useDefaultMessageBoxLocation = false;
 	}
 
 	public layout(): void {
@@ -130,21 +126,12 @@ export class WizardModal extends Modal {
 	}
 
 	protected renderBody(container: HTMLElement): void {
-		let bodyBuilderObj;
 		new Builder(container).div({ class: 'dialogModal-body' }, (bodyBuilder) => {
-			bodyBuilderObj = bodyBuilder;
 			this._body = bodyBuilder.getHTMLElement();
 		});
 
 		this.initializeNavigation(this._body);
 
-		bodyBuilderObj.div({ class: 'dialog-message-and-page-container' }, (mpContainer) => {
-			this._messageAndPageContainer = mpContainer.getHTMLElement();
-			mpContainer.append(this._messageElement);
-			this._pageContainer = mpContainer.div({ class: 'dialogModal-page-container' }).getHTMLElement();
-		});
-
-
 		this._wizard.pages.forEach(page => {
 			this.registerPage(page);
 		});
@@ -172,7 +159,7 @@ export class WizardModal extends Modal {
 
 	private registerPage(page: WizardPage): void {
 		let dialogPane = new DialogPane(page.title, page.content, valid => page.notifyValidityChanged(valid), this._instantiationService, this._wizard.displayPageTitles, page.description);
-		dialogPane.createBody(this._pageContainer);
+		dialogPane.createBody(this._body);
 		this._dialogPanes.set(page, dialogPane);
 		page.onUpdate(() => this.setButtonsForPage(this._wizard.currentPage));
 	}

src/sql/workbench/common/taskUtilities.ts

@@ -28,7 +28,6 @@ import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectEx
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
 import { DashboardInput } from 'sql/parts/dashboard/dashboardInput';
-import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput';
 
 // map for the version of SQL Server (default is 140)
 const scriptCompatibilityOptionMap = {
@@ -401,9 +400,6 @@ export function getCurrentGlobalConnection(objectExplorerService: IObjectExplore
 		if (activeInput instanceof QueryInput || activeInput instanceof EditDataInput || activeInput instanceof DashboardInput) {
 			connection = connectionManagementService.getConnectionProfile(activeInput.uri);
 		}
-		else if (activeInput instanceof ProfilerInput) {
-			connection = activeInput.connection;
-		}
 	}
 
 	return connection;

src/sql/workbench/errorMessageDialog/errorMessageDialog.ts

@@ -14,7 +14,7 @@ import { attachButtonStyler, attachModalDialogStyler } from 'sql/common/theme/st
 import { Builder } from 'vs/base/browser/builder';
 import Severity from 'vs/base/common/severity';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
+import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -76,7 +76,7 @@ export class ErrorMessageDialog extends Modal {
 		this._copyButton = this.addFooterButton(copyButtonLabel, () => this._clipboardService.writeText(this._messageDetails), 'left');
 		this._copyButton.icon = 'icon scriptToClipboard';
 		this._copyButton.element.title = copyButtonLabel;
-		this._register(attachButtonStyler(this._copyButton, this._themeService, { buttonBackground: SIDE_BAR_BACKGROUND, buttonHoverBackground: SIDE_BAR_BACKGROUND, buttonForeground: SIDE_BAR_FOREGROUND }));
+		this._register(attachButtonStyler(this._copyButton, this._themeService, { buttonBackground: SIDE_BAR_BACKGROUND, buttonHoverBackground: SIDE_BAR_BACKGROUND }));
 	}
 
 	private createStandardButton(label: string, onSelect: () => void): Button {

src/sqltest/parts/query/editor/queryEditor.test.ts

@@ -141,8 +141,6 @@ suite('SQL QueryEditor Tests', () => {
 		connectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, memento.object, undefined);
 		connectionManagementService.callBase = true;
 		connectionManagementService.setup(x => x.isConnected(TypeMoq.It.isAny())).returns(() => false);
-		connectionManagementService.setup(x => x.disconnectEditor(TypeMoq.It.isAny())).returns(() => void 0);
-		connectionManagementService.setup(x => x.ensureDefaultLanguageFlavor(TypeMoq.It.isAnyString())).returns(() => void 0);
 
 		// Create a QueryModelService
 		queryModelService = new QueryModelService(instantiationService.object, notificationService.object);
@@ -330,9 +328,6 @@ suite('SQL QueryEditor Tests', () => {
 			queryConnectionService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, memento.object, undefined);
 			queryConnectionService.callBase = true;
 
-			queryConnectionService.setup(x => x.disconnectEditor(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => void 0);
-			queryConnectionService.setup(x => x.ensureDefaultLanguageFlavor(TypeMoq.It.isAnyString())).returns(() => void 0);
-
 			// Mock InstantiationService to give us the actions
 			queryActionInstantiationService = TypeMoq.Mock.ofType(InstantiationService, TypeMoq.MockBehavior.Loose);
 
@@ -359,13 +354,12 @@ suite('SQL QueryEditor Tests', () => {
 			let fileInput = new UntitledEditorInput(URI.parse('testUri'), false, '', '', '', instantiationService.object, undefined, undefined, undefined);
 			queryModelService = TypeMoq.Mock.ofType(QueryModelService, TypeMoq.MockBehavior.Loose, undefined, undefined);
 			queryModelService.callBase = true;
-			queryModelService.setup(x => x.disposeQuery(TypeMoq.It.isAny())).returns(() => void 0);
 			queryInput = new QueryInput(
 				'',
 				fileInput,
 				undefined,
 				undefined,
-				connectionManagementService.object,
+				undefined,
 				queryModelService.object,
 				undefined,
 				undefined
@@ -401,7 +395,7 @@ suite('SQL QueryEditor Tests', () => {
 		test('Test that we attempt to dispose query when the queryInput is disposed', (done) => {
 			let queryResultsInput = new QueryResultsInput('testUri', configurationService.object);
 			queryInput['_results'] = queryResultsInput;
-			queryInput.close();
+			queryInput.dispose();
 			queryModelService.verify(x => x.disposeQuery(TypeMoq.It.isAnyString()), TypeMoq.Times.once());
 			done();
 		});

src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts

@@ -199,7 +199,7 @@ suite('Keybindings Editor Model test', () => {
 		});
 	});
 
-	test('convert with title and without binding to entry', () => {
+	test('convert with title and wihtout binding to entry', () => {
 		const id = 'a' + uuid.generateUuid();
 		registerCommandWithTitle(id, 'some title');
 		prepareKeybindingService();