Merge VS Code 1.26.1 (#2394)

* Squash merge commits for 1.26 (#1) (#2323) * Polish tag search as per feedback (#55269) * Polish tag search as per feedback * Updated regex * Allow users to opt-out of features that send online requests in the background (#55097) * settings sweep #54690 * Minor css tweaks to enable eoverflow elipsis in more places (#55277) * fix an issue with titlebarheight when not scaling with zoom * Settings descriptions update #54690 * fixes #55209 * Settings editor - many padding fixes * More space above level 2 label * Fixing Cannot debug npm script using Yarn #55103 * Settings editor - show ellipsis when description overflows * Settings editor - ... fix measuring around links, relayout * Setting descriptions * Settings editor - fix ... for some short lines, fix select container width * Settings editor - overlay trees so scrollable shadow is full width * Fix #54133 - missing extension settings after reload * Settings color token description tweak * Settings editor - disable overflow indicator temporarily, needs to be faster * Added command to Run the selected npm script * fixes #54452 * fixes #54929 * fixes #55248 * prefix command with extension name * Contribute run selected to the context menu * node-debug@1.26.6 * Allow terminal rendererType to be swapped out at runtime Part of #53274 Fixes #55344 * Settings editor - fix not focusing search when restoring editor setInput must be actually async. Will be fixed naturally when we aren't using winJS promises... * Settings editor - TOC should only expand the section with a selected item * Bump node-debug2 * Settings editor - Tree focus outlines * Settings editor - don't blink the scrollbar when toc selection changes And hide TOC correctly when the editor is narrow * Settings editor - header rows should not be selectable * fixes #54877 * change debug assignee to isi * Settings sweep (#54690) * workaround for #55051 * Settings sweep (#54690) * settings sweep #54690 * Don't try closing tags when you type > after another > * Describe what implementation code lens does Fixes #55370 * fix javadoc formatter setting description * fixes #55325 * update to officical TS version * Settings editor - Even more padding, use semibold instead of bold * Fix #55357 - fix TOC twistie * fixes #55288 * explorer: refresh on di change file system provider registration fixes #53256 * Disable push to Linux repo to test standalone publisher * New env var to notify log level to extensions #54001 * Disable snippets in extension search (when not in suggest dropdown) (#55281) * Disable snippits in extension search (when not in suggest dropdown) * Add monaco input contributions * Fix bug preventing snippetSuggestions from taking effect in sub-editors * Latest emmet helper to fix #52366 * Fix comment updates for threads within same file * Allow extensions to log telemetry to log files #54001 * Pull latest css grammar * files.exclude control - use same style for "add" vs "edit" * files.exclude control - focus/keyboard behavior * don't show menubar too early * files.exclude - better styling * Place cursor at end of extensions search box on autofill (#55254) * Place cursor at end of extensions search box on autofill * Use position instead of selection * fix linux build issue (empty if block) * Settings editor - fix extension category prefixes * Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO * File/Text search provider docs * Fixes #52655 * Include epoch (#55008) * Fixes #53385 * Fixes #49480 * VS Code Insiders (Users) not opening Fixes #55353 * Better handling of the case when the extension host fails to start * Fixes #53966 * Remove confusing Start from wordPartLeft commands ID * vscode-xterm@3.6.0-beta12 Fixes #55488 * Initial size is set to infinity!! Fixes #55461 * Polish embeddedEditorBackground * configuration service misses event * Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query * Select all not working in issue reporter on mac, fixes #55424 * Disable fuzzy matching for extensions autosuggest (#55498) * Fix clipping of extensions search border in some third party themes (#55504) * fixes #55538 * Fix bug causing an aria alert to not be shown the third time (and odd numbers thereafter) * Settings editor - work around rendering glitch with webkit-line-clamp * Settings editor - revert earlier '...' changes * Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason * Settings editor - better overflow indicator * Don't show existing filters in autocomplete (#55495) * Dont show existing filters in autocomplete * Simplify * Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543) * fixes #55223 * Update vscode-css-languageservice to 3.0.10-next.1 * Fix #55509 - settings navigation * Fix #55519 * Fix #55520 * FIx #55524 * Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly * oss updates for endgame * Fix unit tests * fixes #55522 * Avoid missing manifest error from bubbling up #54757 * Settings format crawl * Search provider - Fix FileSearchProvider to return array, not progress * Fix #55598 * Settings editor - fix NPE rendering settings with no description * dont render inden guides in search box (#55600) * fixes #55454 * More settings crawl * Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex * Fix FileSearchProvider unit tests for progress change * fixes #55561 * Settings description update for #54690 * Update setting descriptions for online services * Minor edits * fixes #55513 * fixes #55451 * Fix #55612 - fix findTextInFiles cancellation * fixes #55539 * More setting description tweaks * Setting to disable online experiments #54354 * fixes #55507 * fixes #55515 * Show online services action only in Insiders for now * Settings editor - change toc behavior default to 'filter' * Settings editor - nicer filter count style during search * Fix #55617 - search viewlet icons * Settings editor - better styling for element count indicator * SearchProvider - fix NPE when searching extraFileResources * Allow extends to work without json suffix Fixes #16905 * Remove accessability options logic entirely Follow up on #55451 * use latest version of DAP * fixes #55490 * fixes #55122 * fixes #52332 * Avoid assumptions about git: URIs (fixes #36236) * relative path for descriptions * resourece: get rid of isFile context key fixes #48275 * Register previous ids for compatibility (#53497) * more tuning for #48275 * no need to always re-read "files explorer" fixes #52003 * read out active composites properly fixes #51967 * Update link colors for hc theme to meet color contrast ratio, fixes #55651 Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated * detect 'winpty-agent.exe'; fixes #55672 * node-debug@1.26.7 * reset counter on new label * Settings editor - fix multiple setting links in one description * Settings editor - color code blocks in setting descriptions, fix #55532 * Settings editor - hover color in TOC * Settings editor - fix navigation NPE * Settings editor - fix text control width * Settings editor - maybe fix #55684 * Fix bug causing cursor to not move on paste * fixes #53582 * Use ctrlCmd instead of ctrl for go down from search box * fixes #55264 * fixes #55456 * filter for spcaes before triggering search (#55611) * Fix #55698 - don't lose filtered TOC counts when refreshing TOC * fixes #55421 * fixes #28979 * fixes #55576 * only add check for updates to windows/linux help * readonly files: append decoration to label fixes #53022 * debug: do not show toolbar while initialising fixes #55026 * Opening launch.json should not activate debug extensions fixes #55029 * fixes #55435 * fixes #55434 * fixes #55439 * trigger menu only on altkey up * Fix #50555 - fix settings editor memory leak * Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render * fixes #55335 * proper fix for readonly model fixes #53022 * improve FoldingRangeKind spec (for #55686) * Use class with static fields (fixes #55494) * Fixes #53671 * fixes #54630 * [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324 * cleanup deps * debug issues back to andre * update electron for smoketest * Fix #55757 - prevent settings tabs from overflowing * Fix #53897 - revert setting menu defaults to old editor * Add enum descriptions to `typescript.preferences.importModuleSpecifier` * Fix #55767 - leaking style elements from settings editor * Fix #55521 - prevent flashing when clicking in exclude control * Update Git modified color for contrast ratio, fixes #53140 * Revert "Merge branch 'master' of github.com:Microsoft/vscode" This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917. * Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode"" This reverts commit 53949d963f39e40757557c6526332354a31d9154. * don't ask to install an incomplete menu * Fix NPE in terminal AccessibilityManager Fixes #55744 * don't display fallback menu unless we've closed the last window * fixes #55547 * Fix smoke tests for extension search box * Update OSSREADME.json for Electron 2.0.5 * Update distro Includes Chromium license changes * fix #55455 * fix #55865 * fixes #55893 * Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805) * Fix bug causing workspace recommendations to go away upon ignoring a recommendation * ONly show on @recommended or @recommended:workspace * Make more consistant * Fix #55911 * Understand json activity (#55926) * Understand json file activity * Refactoring * adding composer.json * Distro update for experiments * use terminal.processId for auto-attach; fixes #55918 * Reject invalid URI with vscode.openFolder (for #55891) * improve win32 setup system vs user detection fixes #55840 fixes #55840 delay winreg import related to #55840 show notification earlier related to #55840 fix #55840 update inno setup message related to #55840 * Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead * Bring back the old menu due to electron 2.0 issues (#55913) * add the old menu back for native menus * make menu labels match * `vscode.openFolder`: treat missing URI schema gracefully (for #55891) * delay EH reattach; fixes #55955 * Mark all json files under appSettingsHome as settings * Use localized strings for telemetry opt-out * Exception when saving file editor opened from remote file provider (fixes #55051) * Remove terminal menu from stable Fixes 56003 * VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933 * improve fix for #55891 * fix #55916 * Improve #55891 * increase EH debugging restart delay; fixes #55955 * Revert "Don't include non-resource entries in history quick pick" This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060. * Diff editor: horizontal scrollbar height is smaller (fixes #56062) * improve openFolder uri fix (correctly treat backslashes) * fixes #56116 repair ipc for native menubar keybindings * Fix #56240 - Open the JSON settings editor instead of the UI editor * Fix #55536 * uriDisplay: if no formatter is registered fall back to getPathlabel fixes #56104 * VSCode hangs when opening python file. Fixes #56377 * VS Code Hangs When Opening Specific PowerShell File. Fixes #56430 * Fix #56433 - search extraFileResources even when no folders open * Workaround #55649 * Fix in master #56371 * Fix tests #56371 * Fix in master #56317 * increase version to 1.26.1 * Fixes #56387: Handle SIGPIPE in extension host * fixes #56185 * Fix merge issues (part 1) * Fix build breaks (part 1) * Build breaks (part 2) * Build breaks (part 3) * More build breaks (part 4) * Fix build breaks (part 5) * WIP * Fix menus * Render query result and message panels (#2363) * Put back query editor hot exit changes * Fix grid changes that broke profiler (#2365) * Update APIs for saving query editor state * Fix restore view state for profiler and edit data * Updating custom default themes to support 4.5:1 contrast ratio * Test updates * Fix Extension Manager and Windows Setup * Update license headers * Add appveyor and travis files back * Fix hidden modal dropdown issue
2026-02-01 17:23:35 -05:00 · 2018-09-04 14:55:00 -07:00
parent 3763278366
commit 81329fa7fa
2638 changed files with 118456 additions and 64012 deletions
--- a/src/sql/parts/query/common/flavorStatus.ts
+++ b/src/sql/parts/query/common/flavorStatus.ts
@@ -8,14 +8,14 @@ import { $, append, show, hide } from 'vs/base/browser/dom';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { IEditorCloseEvent } from 'vs/workbench/common/editor';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Action } from 'vs/base/common/actions';
 import errors = require('vs/base/common/errors');
 import { TPromise } from 'vs/base/common/winjs.base';
-import { getCodeEditor as getEditorWidget } from 'vs/editor/browser/services/codeEditorService';
+import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
 import nls = require('vs/nls');

 import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
@@ -24,6 +24,7 @@ import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
 import { DidChangeLanguageFlavorParams } from 'sqlops';
 import Severity from 'vs/base/common/severity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';

 export interface ISqlProviderEntry extends IPickOpenEntry {
 	providerId: string;
@@ -68,8 +69,8 @@ export class SqlFlavorStatusbarItem implements IStatusbarItem {

 	constructor(
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
-		@IEditorGroupService private _editorGroupService: IEditorGroupService,
+		@IEditorService private _editorService: EditorServiceImpl,
+		@IEditorGroupsService private _editorGroupService: IEditorGroupsService,
 		@IQuickOpenService private _quickOpenService: IQuickOpenService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
 	) {
@@ -86,10 +87,9 @@ export class SqlFlavorStatusbarItem implements IStatusbarItem {
 		this._toDispose = [];
 		this._toDispose.push(
 			this._connectionManagementService.onLanguageFlavorChanged((changeParams: DidChangeLanguageFlavorParams) => this._onFlavorChanged(changeParams)),
-			this._editorGroupService.onEditorsChanged(() => this._onEditorsChanged()),
-			this._editorGroupService.getStacksModel().onEditorClosed(event => this._onEditorClosed(event))
+			this._editorService.onDidVisibleEditorsChange(() => this._onEditorsChanged()),
+			this._editorService.onDidCloseEditor(event => this._onEditorClosed(event))
 		);
-
 		return combinedDisposable(this._toDispose);
 	}

@@ -104,7 +104,7 @@ export class SqlFlavorStatusbarItem implements IStatusbarItem {
 		let uri = WorkbenchUtils.getEditorUri(event.editor);
 		if (uri && uri in this._sqlStatusEditors) {
 			// If active editor is being closed, hide the query status.
-			let activeEditor = this._editorService.getActiveEditor();
+			let activeEditor = this._editorService.activeControl;
 			if (activeEditor) {
 				let currentUri = WorkbenchUtils.getEditorUri(activeEditor.input);
 				if (uri === currentUri) {
@@ -117,7 +117,7 @@ export class SqlFlavorStatusbarItem implements IStatusbarItem {
 	}

 	private _onEditorsChanged(): void {
-		let activeEditor = this._editorService.getActiveEditor();
+		let activeEditor = this._editorService.activeControl;
 		if (activeEditor) {
 			let uri = WorkbenchUtils.getEditorUri(activeEditor.input);

@@ -148,7 +148,7 @@ export class SqlFlavorStatusbarItem implements IStatusbarItem {

 	// Show/hide query status for active editor
 	private _showStatus(uri: string): void {
-		let activeEditor = this._editorService.getActiveEditor();
+		let activeEditor = this._editorService.activeControl
 		if (activeEditor) {
 			let currentUri = WorkbenchUtils.getEditorUri(activeEditor.input);
 			if (uri === currentUri) {
@@ -172,7 +172,7 @@ export class ChangeFlavorAction extends Action {
 	constructor(
 		actionId: string,
 		actionLabel: string,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
+		@IEditorService private _editorService: IEditorService,
 		@IQuickOpenService private _quickOpenService: IQuickOpenService,
 		@INotificationService private _notificationService: INotificationService,
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService
@@ -181,14 +181,14 @@ export class ChangeFlavorAction extends Action {
 	}

 	public run(): TPromise<any> {
-		let activeEditor = this._editorService.getActiveEditor();
+		let activeEditor = this._editorService.activeControl;
 		let currentUri = WorkbenchUtils.getEditorUri(activeEditor.input);
 		if (this._connectionManagementService.isConnected(currentUri)) {
 			let currentProvider = this._connectionManagementService.getProviderIdFromUri(currentUri);
 			return this._showMessage(Severity.Info, nls.localize('alreadyConnected',
 				"A connection using engine {0} exists. To change please disconnect or change connection", currentProvider));
 		}
-		const editorWidget = getEditorWidget(activeEditor);
+		const editorWidget = getCodeEditor(activeEditor);
 		if (!editorWidget) {
 			return this._showMessage(Severity.Info, nls.localize('noEditor', "No text editor active at this time"));
 		}
@@ -202,8 +202,8 @@ export class ChangeFlavorAction extends Action {
 		// TODO: select the current language flavor
 		return this._quickOpenService.pick(ProviderOptions, { placeHolder: nls.localize('pickSqlProvider', "Select SQL Language Provider"), autoFocus: { autoFocusIndex: 0 } }).then(provider => {
 			if (provider) {
-				activeEditor = this._editorService.getActiveEditor();
-				const editorWidget = getEditorWidget(activeEditor);
+				activeEditor = this._editorService.activeControl;
+				const editorWidget = getCodeEditor(activeEditor);
 				if (editorWidget) {
 					if (currentUri) {
 						this._connectionManagementService.doChangeLanguageFlavor(currentUri, 'sql', provider.providerId);
--- a/src/sql/parts/query/common/query.contribution.ts
+++ b/src/sql/parts/query/common/query.contribution.ts
@@ -12,7 +12,7 @@ import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/action
 import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';

@@ -178,7 +178,7 @@ actionRegistry.registerWorkbenchAction(

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.GRID_COPY_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: ResultsGridFocusCondition,
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
 	handler: gridCommands.copySelection
@@ -186,7 +186,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.MESSAGES_SELECTALL_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: ResultsMessagesFocusCondition,
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_A,
 	handler: gridCommands.selectAllMessages
@@ -194,7 +194,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.GRID_SELECTALL_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: ResultsGridFocusCondition,
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_A,
 	handler: gridCommands.selectAll
@@ -202,7 +202,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.MESSAGES_COPY_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: ResultsMessagesFocusCondition,
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
 	handler: gridCommands.copyMessagesSelection
@@ -210,7 +210,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.GRID_SAVECSV_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: ResultsGridFocusCondition,
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_C),
 	handler: gridCommands.saveAsCsv
@@ -218,7 +218,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.GRID_SAVEJSON_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: ResultsGridFocusCondition,
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_J),
 	handler: gridCommands.saveAsJson
@@ -226,7 +226,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.GRID_SAVEEXCEL_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: ResultsGridFocusCondition,
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_E),
 	handler: gridCommands.saveAsExcel
@@ -234,7 +234,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.GRID_VIEWASCHART_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: ResultsGridFocusCondition,
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_V),
 	handler: gridCommands.viewAsChart
@@ -242,7 +242,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.GRID_GOTONEXTGRID_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: ResultsGridFocusCondition,
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_N),
 	handler: gridCommands.goToNextGrid
@@ -250,7 +250,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.TOGGLERESULTS_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: QueryEditorVisibleCondition,
 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_R,
 	handler: gridCommands.toggleResultsPane
@@ -258,7 +258,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.TOGGLEMESSAGES_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: QueryEditorVisibleCondition,
 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_Y,
 	handler: gridCommands.toggleMessagePane
@@ -266,7 +266,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({

 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: gridActions.GOTONEXTQUERYOUTPUTTAB_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(gridCommandsWeightBonus),
+	weight: KeybindingWeight.EditorContrib,
 	when: QueryEditorVisibleCondition,
 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_P,
 	handler: gridCommands.goToNextQueryOutputTab
@@ -383,7 +383,7 @@ for (let i = 0; i < 9; i++) {

 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: `workbench.action.query.shortcut${queryIndex}`,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: QueryEditorVisibleCondition,
 		primary: defaultPrimary,
 		handler: accessor => {
--- a/src/sql/parts/query/common/queryInput.ts
+++ b/src/sql/parts/query/common/queryInput.ts
@@ -54,7 +54,6 @@ export class QueryInput extends EditorInput implements IEncodingSupport, IConnec
 	private _showQueryResultsEditor: Emitter<void>;
 	private _updateSelection: Emitter<ISelectionData>;

-	private _toDispose: IDisposable[];
 	private _currentEventCallbacks: IDisposable[];

 	public savedViewState: IEditorViewState;
--- a/src/sql/parts/query/common/resultSerializer.ts
+++ b/src/sql/parts/query/common/resultSerializer.ts
@@ -15,7 +15,6 @@ import * as PathUtilities from 'sql/common/pathUtilities';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IOutputService, IOutputChannel, IOutputChannelRegistry, Extensions as OutputExtensions } from 'vs/workbench/parts/output/common/output';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IWindowsService, IWindowService, FileFilter } from 'vs/platform/windows/common/windows';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -31,6 +30,7 @@ import Severity from 'vs/base/common/severity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { getBaseLabel } from 'vs/base/common/labels';
 import { ShowFileInFolderAction, OpenFileInFolderAction } from 'sql/workbench/common/workspaceActions';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';

 let prevSavePath: string;

@@ -49,7 +49,7 @@ export class ResultSerializer {
 		@IOutputService private _outputService: IOutputService,
 		@IQueryManagementService private _queryManagementService: IQueryManagementService,
 		@IWorkspaceConfigurationService private _workspaceConfigurationService: IWorkspaceConfigurationService,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
+		@IEditorService private _editorService: IEditorService,
 		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
 		@IWindowsService private _windowsService: IWindowsService,
 		@IWindowService private _windowService: IWindowService,
--- a/src/sql/parts/query/common/rowCountStatus.ts
+++ b/src/sql/parts/query/common/rowCountStatus.ts
@@ -9,11 +9,12 @@ import QueryRunner from 'sql/parts/query/execution/queryRunner';

 import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { IDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorCloseEvent } from 'vs/workbench/common/editor';
 import { append, $, hide, show } from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
+import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';

 export class RowCountStatusBarItem implements IStatusbarItem {

@@ -23,15 +24,15 @@ export class RowCountStatusBarItem implements IStatusbarItem {
 	private dispose: IDisposable;

 	constructor(
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
-		@IEditorGroupService private _editorGroupService: IEditorGroupService,
+		@IEditorService private _editorService: EditorServiceImpl,
+		@IEditorGroupsService private _editorGroupService: IEditorGroupsService,
 		@IQueryModelService private _queryModelService: IQueryModelService
 	) { }

 	render(container: HTMLElement): IDisposable {
 		let disposables = [
-			this._editorGroupService.onEditorsChanged(this._onEditorsChanged, this),
-			this._editorGroupService.getStacksModel().onEditorClosed(this._onEditorClosed, this)
+			this._editorService.onDidVisibleEditorsChange(() => this._onEditorsChanged()),
+			this._editorService.onDidCloseEditor(event => this._onEditorClosed(event))
 		];

 		this._element = append(container, $('.query-statusbar-group'));
@@ -56,7 +57,7 @@ export class RowCountStatusBarItem implements IStatusbarItem {
 	private _showStatus(): void {
 		hide(this._flavorElement);
 		dispose(this.dispose);
-		let activeEditor = this._editorService.getActiveEditor();
+		let activeEditor = this._editorService.activeControl;
 		if (activeEditor) {
 			let currentUri = WorkbenchUtils.getEditorUri(activeEditor.input);
 			if (currentUri) {
--- a/src/sql/parts/query/editor/actions.ts
+++ b/src/sql/parts/query/editor/actions.ts
@@ -16,11 +16,8 @@ import QueryRunner from 'sql/parts/query/execution/queryRunner';
 import { SaveFormat } from 'sql/parts/grid/common/interfaces';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { GridTableState } from 'sql/parts/query/editor/gridPanel';
-import { IEditorService } from 'vs/platform/editor/common/editor';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { QueryEditor } from './queryEditor';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';

 export interface IGridActionContext {
 	cell: { row: number; cell: number; };
@@ -169,12 +166,12 @@ export class ChartDataAction extends Action {
 	public static LABEL = localize('chart', 'Chart');
 	public static ICON = 'viewChart';

-	constructor(@IWorkbenchEditorService private editorService: IWorkbenchEditorService) {
+	constructor(@IEditorService private editorService: IEditorService) {
 		super(ChartDataAction.ID, ChartDataAction.LABEL, ChartDataAction.ICON);
 	}

 	public run(context: IGridActionContext): TPromise<boolean> {
-		let activeEditor = this.editorService.getActiveEditor();
+		let activeEditor = this.editorService.activeEditor;
 		if (activeEditor instanceof QueryEditor) {
 			activeEditor.resultsEditor.chart({ batchId: context.batchId, resultId: context.resultId });
 			return TPromise.as(true);
--- a/src/sql/parts/query/editor/gridPanel.ts
+++ b/src/sql/parts/query/editor/gridPanel.ts
@@ -90,14 +90,14 @@ export class GridPanel extends ViewletPanel {
 	private maximizedGrid: GridTable<any>;

 	constructor(
-		title: string, options: IViewletPanelOptions,
+		options: IViewletPanelOptions,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IThemeService private themeService: IThemeService,
 		@IInstantiationService private instantiationService: IInstantiationService
 	) {
-		super(title, options, keybindingService, contextMenuService, configurationService);
+		super(options, keybindingService, contextMenuService, configurationService);
 		this.splitView = new ScrollableSplitView(this.container, { enableResizing: false });
 	}

@@ -219,6 +219,7 @@ class GridTable<T> extends Disposable implements IView {
 	public readonly onDidChange: Event<number> = this._onDidChange.event;

 	public id = generateUuid();
+	readonly element: HTMLElement = this.container;

 	constructor(
 		private runner: QueryRunner,
--- a/src/sql/parts/query/editor/messagePanel.ts
+++ b/src/sql/parts/query/editor/messagePanel.ts
@@ -28,7 +28,7 @@ import { $ } from 'vs/base/browser/builder';
 import { isArray } from 'vs/base/common/types';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditor } from 'vs/editor/common/editorCommon';

 export interface IResultMessageIntern extends IResultMessage {
@@ -71,14 +71,14 @@ export class MessagePanel extends ViewletPanel {
 	private tree: ITree;

 	constructor(
-		title: string, options: IViewletPanelOptions,
+		options: IViewletPanelOptions,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IThemeService private themeService: IThemeService,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
-		super(title, options, keybindingService, contextMenuService, configurationService);
+		super(options, keybindingService, contextMenuService, configurationService);
 		this.controller = instantiationService.createInstance(MessageController, { openMode: OpenMode.SINGLE_CLICK, clickBehavior: ClickBehavior.ON_MOUSE_UP /* do not change, to preserve focus behaviour in input field */ });
 		this.controller.toFocusOnClick = this.model;
 		this.tree = new Tree(this.container, {
@@ -257,7 +257,7 @@ export class MessageController extends WorkbenchTreeController {
 	constructor(
 		options: IControllerOptions,
 		@IConfigurationService configurationService: IConfigurationService,
-		@IWorkbenchEditorService private workbenchEditorService: IWorkbenchEditorService,
+		@IEditorService private workbenchEditorService: IEditorService,
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IInstantiationService private instantiationService: IInstantiationService
 	) {
@@ -283,7 +283,7 @@ export class MessageController extends WorkbenchTreeController {
 		if (element.selection) {
 			let selection: ISelectionData = element.selection;
 			// this is a batch statement
-			let control = this.workbenchEditorService.getActiveEditor().getControl() as IEditor;
+			let control = this.workbenchEditorService.activeControl.getControl() as IEditor;
 			control.setSelection({
 				startColumn: selection.startColumn + 1,
 				endColumn: selection.endColumn + 1,
--- a/src/sql/parts/query/editor/queryEditor.ts
+++ b/src/sql/parts/query/editor/queryEditor.ts
@@ -8,9 +8,8 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as strings from 'vs/base/common/strings';
 import * as DOM from 'vs/base/browser/dom';

-import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
+import { EditorInput, EditorOptions, IEditorControl, IEditor } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
-import { IEditorControl, Position, IEditor, IEditorInput } from 'vs/platform/editor/common/editor';
 import { VerticalFlexibleSash, HorizontalFlexibleSash, IFlexibleSash } from 'sql/parts/query/views/flexibleSash';
 import { Orientation } from 'vs/base/browser/ui/sash/sash';

@@ -21,18 +20,15 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';

-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';
 import { ISelectionData } from 'sqlops';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { CodeEditor } from 'vs/editor/browser/codeEditor';
+import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IRange } from 'vs/editor/common/core/range';
-import { IEditorViewState } from 'vs/editor/common/editorCommon';
-import { Emitter } from 'vs/base/common/event';

 import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
@@ -48,6 +44,8 @@ import { IQueryModelService } from 'sql/parts/query/execution/queryModel';
 import { IEditorDescriptorService } from 'sql/parts/query/editor/editorDescriptorService';
 import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
 import { attachEditableDropdownStyler } from 'sql/common/theme/styler';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';

 /**
 * Editor that hosts 2 sub-editors: A TextResourceEditor for SQL file editing, and a QueryResultsEditor
@@ -93,11 +91,10 @@ export class QueryEditor extends BaseEditor {
 		@ITelemetryService _telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
+		@IEditorService private _editorService: IEditorService,
 		@IContextMenuService private _contextMenuService: IContextMenuService,
 		@IQueryModelService private _queryModelService: IQueryModelService,
 		@IEditorDescriptorService private _editorDescriptorService: IEditorDescriptorService,
-		@IEditorGroupService private _editorGroupService: IEditorGroupService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService
 	) {
@@ -109,11 +106,12 @@ export class QueryEditor extends BaseEditor {
 			this.queryEditorVisible = queryContext.QueryEditorVisibleContext.bindTo(contextKeyService);
 		}

-		if (_editorGroupService) {
-			_editorGroupService.onEditorOpening(e => {
-				if (this.isVisible() && (e.input !== this.input || e.position !== this.position)) {
+		if (_editorService) {
+			_editorService.overrideOpenEditor((editor, options, group) => {
+				if (this.isVisible() && (editor !== this.input || group !== this.group)) {
 					this.saveEditorViewState();
 				}
+				return {};
 			});
 		}
 	}
@@ -157,7 +155,7 @@ export class QueryEditor extends BaseEditor {
 	/**
 	 * Sets the input data for this editor.
 	 */
-	public setInput(newInput: QueryInput, options?: EditorOptions): TPromise<void> {
+	public setInput(newInput: QueryInput, options?: EditorOptions): Thenable<void> {
 		const oldInput = <QueryInput>this.input;

 		if (newInput.matches(oldInput)) {
@@ -171,21 +169,21 @@ export class QueryEditor extends BaseEditor {
 		let selectionCallback: IDisposable = newInput.updateSelectionEvent((selection) => this._setSelection(selection));
 		newInput.setEventCallbacks([taskbarCallback, showResultsCallback, selectionCallback]);

-		return super.setInput(newInput, options)
+		return super.setInput(newInput, options, CancellationToken.None)
 			.then(() => this._updateInput(oldInput, newInput, options));
 	}

 	/**
 	 * Sets this editor and the 2 sub-editors to visible.
 	 */
-	public setEditorVisible(visible: boolean, position: Position): void {
+	public setEditorVisible(visible: boolean, group: IEditorGroup): void {
 		if (this._resultsEditor) {
-			this._resultsEditor.setVisible(visible, position);
+			this._resultsEditor.setVisible(visible, group);
 		}
 		if (this._sqlEditor) {
-			this._sqlEditor.setVisible(visible, position);
+			this._sqlEditor.setVisible(visible, group);
 		}
-		super.setEditorVisible(visible, position);
+		super.setEditorVisible(visible, group);

 		// Note: must update after calling super.setEditorVisible so that the accurate count is handled
 		this.updateQueryEditorVisible(visible);
@@ -197,7 +195,7 @@ export class QueryEditor extends BaseEditor {
 			let visible = currentEditorIsVisible;
 			if (!currentEditorIsVisible) {
 				// Current editor is closing but still tracked as visible. Check if any other editor is visible
-				const candidates = [...this._editorService.getVisibleEditors()].filter(e => {
+				const candidates = [...this._editorService.visibleControls].filter(e => {
 					if (e && e.getId) {
 						return e.getId() === QueryEditor.ID;
 					}
@@ -211,20 +209,6 @@ export class QueryEditor extends BaseEditor {
 		}
 	}

-
-	/**
-	 * Changes the position of the editor.
-	 */
-	public changePosition(position: Position): void {
-		if (this._resultsEditor) {
-			this._resultsEditor.changePosition(position);
-		}
-		if (this._sqlEditor) {
-			this._sqlEditor.changePosition(position);
-		}
-		super.changePosition(position);
-	}
-
 	/**
 	 * Called to indicate to the editor that the input should be cleared and resources associated with the
 	 * input should be freed.
@@ -303,7 +287,8 @@ export class QueryEditor extends BaseEditor {
 			return;
 		}

-		this._editorGroupService.pinEditor(this.position, this.input);
+		const activeControl = this._editorService.activeControl;
+		activeControl.group.pinEditor(activeControl.input);

 		let input = <QueryInput>this.input;
 		this._createResultsEditorContainer();
@@ -363,7 +348,7 @@ export class QueryEditor extends BaseEditor {
 	public isSelectionEmpty(): boolean {
 		if (this._sqlEditor && this._sqlEditor.getControl()) {
 			let control = this._sqlEditor.getControl();
-			let codeEditor: CodeEditor = <CodeEditor>control;
+			let codeEditor: ICodeEditor = <ICodeEditor>control;

 			if (codeEditor) {
 				let value = codeEditor.getValue();
@@ -378,7 +363,7 @@ export class QueryEditor extends BaseEditor {
 	public getAllText(): string {
 		if (this._sqlEditor && this._sqlEditor.getControl()) {
 			let control = this._sqlEditor.getControl();
-			let codeEditor: CodeEditor = <CodeEditor>control;
+			let codeEditor: ICodeEditor = <ICodeEditor>control;
 			if (codeEditor) {
 				let value = codeEditor.getValue();
 				if (value !== undefined && value.length > 0) {
@@ -394,7 +379,7 @@ export class QueryEditor extends BaseEditor {
 	public getSelectionText(): string {
 		if (this._sqlEditor && this._sqlEditor.getControl()) {
 			let control = this._sqlEditor.getControl();
-			let codeEditor: CodeEditor = <CodeEditor>control;
+			let codeEditor: ICodeEditor = <ICodeEditor>control;
 			let vscodeSelection = control.getSelection();

 			if (codeEditor && vscodeSelection) {
@@ -569,7 +554,9 @@ export class QueryEditor extends BaseEditor {
 				return this._createEditor(<UntitledEditorInput>newInput.sql, this._sqlEditorContainer);
 			};
 			onEditorsCreated = (result: TextResourceEditor) => {
-				return this._onSqlEditorCreated(result, newInput.sql, options);
+				return TPromise.join([
+					this._onSqlEditorCreated(result, newInput.sql, options)
+				]);
 			};
 		}

@@ -604,16 +591,16 @@ export class QueryEditor extends BaseEditor {

 		let editor = descriptor.instantiate(this._instantiationService);
 		editor.create(container);
-		editor.setVisible(this.isVisible(), this.position);
+		editor.setVisible(this.isVisible(), editor.group);
 		return TPromise.as(editor);
 	}

 	/**
 	 * Sets input for the SQL editor after it has been created.
 	 */
-	private _onSqlEditorCreated(sqlEditor: TextResourceEditor, sqlInput: UntitledEditorInput, options: EditorOptions): TPromise<void> {
+	private _onSqlEditorCreated(sqlEditor: TextResourceEditor, sqlInput: UntitledEditorInput, options: EditorOptions): Thenable<void> {
 		this._sqlEditor = sqlEditor;
-		return this._sqlEditor.setInput(sqlInput, options);
+		return this._sqlEditor.setInput(sqlInput, options, CancellationToken.None);
 	}

 	/**
--- a/src/sql/parts/query/editor/queryResultsEditor.ts
+++ b/src/sql/parts/query/editor/queryResultsEditor.ts
@@ -20,11 +20,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti

 import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
 import { IQueryModelService } from 'sql/parts/query/execution/queryModel';
-import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService';
-import { IQueryComponentParams } from 'sql/services/bootstrap/bootstrapParams';
-import { QueryOutputModule } from 'sql/parts/query/views/queryOutput.module';
-import { QUERY_OUTPUT_SELECTOR } from 'sql/parts/query/views/queryOutput.component';
 import { QueryResultsView } from 'sql/parts/query/editor/queryResultsView';
+import { CancellationToken } from 'vs/base/common/cancellation';

 export const RESULTS_GRID_DEFAULTS = {
 	cellPadding: [6, 10, 5],
@@ -146,7 +143,7 @@ export class QueryResultsEditor extends BaseEditor {
 	}

 	setInput(input: QueryResultsInput, options: EditorOptions): TPromise<void> {
-		super.setInput(input, options);
+		super.setInput(input, options, CancellationToken.None);
 		this.resultsView.input = input;
 		return TPromise.wrap<void>(null);
 	}
--- a/src/sql/parts/query/editor/queryResultsView.ts
+++ b/src/sql/parts/query/editor/queryResultsView.ts
@@ -26,8 +26,10 @@ class ResultsView implements IPanelView {

 	constructor(instantiationService: IInstantiationService) {
 		this.panelViewlet = instantiationService.createInstance(PanelViewlet, 'resultsView', { showHeaderInTitleWhenSingleView: false });
-		this.gridPanel = instantiationService.createInstance(GridPanel, nls.localize('gridPanel', 'Results'), {});
-		this.messagePanel = instantiationService.createInstance(MessagePanel, nls.localize('messagePanel', 'Messages'), {});
+		this.gridPanel = instantiationService.createInstance(GridPanel, { title: nls.localize('gridPanel', 'Results') });
+		this.messagePanel = instantiationService.createInstance(MessagePanel, { title: nls.localize('messagePanel', 'Messages') });
+		this.gridPanel.render();
+		this.messagePanel.render();
 		this.panelViewlet.create(this.container).then(() => {
 			this.panelViewlet.addPanels([
 				{ panel: this.gridPanel, size: 1000, index: 0 },
--- a/src/sql/parts/query/execution/keyboardQueryActions.ts
+++ b/src/sql/parts/query/execution/keyboardQueryActions.ts
@@ -6,7 +6,7 @@
 import nls = require('vs/nls');

 import { Action } from 'vs/base/common/actions';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';

@@ -31,8 +31,8 @@ export function isConnected(editor: QueryEditor, connectionManagementService: IC
 	return connectionManagementService.isConnected(editor.currentQueryInput.uri);
 }

-function runActionOnActiveQueryEditor(editorService: IWorkbenchEditorService, action: (QueryEditor) => void): void {
-	const candidates = [editorService.getActiveEditor(), ...editorService.getVisibleEditors()].filter(e => e instanceof QueryEditor);
+function runActionOnActiveQueryEditor(editorService: IEditorService, action: (QueryEditor) => void): void {
+	const candidates = [editorService.activeControl, ...editorService.visibleControls].filter(e => e instanceof QueryEditor);
 	if (candidates.length > 0) {
 		action(candidates[0]);
 	}
@@ -65,14 +65,14 @@ export class FocusOnCurrentQueryKeyboardAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService
+		@IEditorService private _editorService: IEditorService
 	) {
 		super(id, label);
 		this.enabled = true;
 	}

 	public run(): TPromise<void> {
-		let editor = this._editorService.getActiveEditor();
+		let editor = this._editorService.activeControl;
 		if (editor && editor instanceof QueryEditor) {
 			let queryEditor: QueryEditor = editor;
 			queryEditor.focus();
@@ -92,14 +92,14 @@ export class RunQueryKeyboardAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService
+		@IEditorService private _editorService: IEditorService
 	) {
 		super(id, label);
 		this.enabled = true;
 	}

 	public run(): TPromise<void> {
-		let editor = this._editorService.getActiveEditor();
+		let editor = this._editorService.activeControl;
 		if (editor && (editor instanceof QueryEditor || editor instanceof EditDataEditor)) {
 			let queryEditor: QueryEditor | EditDataEditor = editor;
 			queryEditor.runQuery();
@@ -118,14 +118,14 @@ export class RunCurrentQueryKeyboardAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService
+		@IEditorService private _editorService: IEditorService
 	) {
 		super(id, label);
 		this.enabled = true;
 	}

 	public run(): TPromise<void> {
-		let editor = this._editorService.getActiveEditor();
+		let editor = this._editorService.activeControl;
 		if (editor && editor instanceof QueryEditor) {
 			let queryEditor: QueryEditor = editor;
 			queryEditor.runCurrentQuery();
@@ -141,14 +141,14 @@ export class RunCurrentQueryWithActualPlanKeyboardAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService
+		@IEditorService private _editorService: IEditorService
 	) {
 		super(id, label);
 		this.enabled = true;
 	}

 	public run(): TPromise<void> {
-		let editor = this._editorService.getActiveEditor();
+		let editor = this._editorService.activeControl;
 		if (editor && editor instanceof QueryEditor) {
 			let queryEditor: QueryEditor = editor;
 			queryEditor.runCurrentQueryWithActualPlan();
@@ -168,14 +168,14 @@ export class CancelQueryKeyboardAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService
+		@IEditorService private _editorService: IEditorService
 	) {
 		super(id, label);
 		this.enabled = true;
 	}

 	public run(): TPromise<void> {
-		let editor = this._editorService.getActiveEditor();
+		let editor = this._editorService.activeControl;
 		if (editor && (editor instanceof QueryEditor || editor instanceof EditDataEditor)) {
 			let queryEditor: QueryEditor | EditDataEditor = editor;
 			queryEditor.cancelQuery();
@@ -194,14 +194,14 @@ export class RefreshIntellisenseKeyboardAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService
+		@IEditorService private _editorService: IEditorService
 	) {
 		super(id, label);
 		this.enabled = true;
 	}

 	public run(): TPromise<void> {
-		let editor = this._editorService.getActiveEditor();
+		let editor = this._editorService.activeControl;
 		if (editor && editor instanceof QueryEditor) {
 			let queryEditor: QueryEditor = editor;
 			queryEditor.rebuildIntelliSenseCache();
@@ -221,14 +221,14 @@ export class ToggleQueryResultsKeyboardAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService
+		@IEditorService private _editorService: IEditorService
 	) {
 		super(id, label);
 		this.enabled = true;
 	}

 	public run(): TPromise<void> {
-		let editor = this._editorService.getActiveEditor();
+		let editor = this._editorService.activeControl;
 		if (editor && editor instanceof QueryEditor) {
 			let queryEditor: QueryEditor = editor;
 			queryEditor.toggleResultsEditorVisibility();
@@ -244,7 +244,7 @@ export class RunQueryShortcutAction extends Action {
 	public static ID = 'runQueryShortcutAction';

 	constructor(
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
+		@IEditorService private _editorService: IEditorService,
 		@IQueryModelService protected _queryModelService: IQueryModelService,
 		@IQueryManagementService private _queryManagementService: IQueryManagementService,
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
@@ -403,7 +403,7 @@ export class ParseSyntaxAction extends Action {
 		label: string,
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
 		@IQueryManagementService private _queryManagementService: IQueryManagementService,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
+		@IEditorService private _editorService: IEditorService,
 		@INotificationService private _notificationService: INotificationService
 	) {
 		super(id, label);
@@ -411,7 +411,7 @@ export class ParseSyntaxAction extends Action {
 	}

 	public run(): TPromise<void> {
-		let editor = this._editorService.getActiveEditor();
+		let editor = this._editorService.activeControl;
 		if (editor && editor instanceof QueryEditor) {
 			let queryEditor: QueryEditor = editor;
 			if (!queryEditor.isSelectionEmpty()) {
--- a/src/sql/parts/query/execution/queryStatus.ts
+++ b/src/sql/parts/query/execution/queryStatus.ts
@@ -7,11 +7,12 @@ import { $, append, show, hide } from 'vs/base/browser/dom';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { IEditorCloseEvent } from 'vs/workbench/common/editor';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IQueryModelService } from 'sql/parts/query/execution/queryModel';
 import LocalizedConstants = require('sql/parts/query/common/localizedConstants');
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
+import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';

 // Query execution status
 enum QueryExecutionStatus{
@@ -29,8 +30,8 @@ export class QueryStatusbarItem implements IStatusbarItem {

 	constructor(
 		@IQueryModelService private _queryModelService: IQueryModelService,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
-		@IEditorGroupService private _editorGroupService: IEditorGroupService,
+		@IEditorService private _editorService: EditorServiceImpl,
+		@IEditorGroupsService private _editorGroupService: IEditorGroupsService,
 	) {
 		this._queryStatusEditors = {};
 	}
@@ -44,8 +45,8 @@ export class QueryStatusbarItem implements IStatusbarItem {
 		this._toDispose.push(
 			this._queryModelService.onRunQueryStart((uri:string) => this._onRunQueryStart(uri)),
 			this._queryModelService.onRunQueryComplete((uri:string) => this._onRunQueryComplete(uri)),
-			this._editorGroupService.onEditorsChanged(() => this._onEditorsChanged()),
-			this._editorGroupService.getStacksModel().onEditorClosed(event => this._onEditorClosed(event))
+			this._editorService.onDidVisibleEditorsChange(() => this._onEditorsChanged()),
+			this._editorService.onDidCloseEditor(event => this._onEditorClosed(event))
 		);

 		return combinedDisposable(this._toDispose);
@@ -55,7 +56,7 @@ export class QueryStatusbarItem implements IStatusbarItem {
 		let uri = WorkbenchUtils.getEditorUri(event.editor);
 		if (uri && uri in this._queryStatusEditors) {
 			// If active editor is being closed, hide the query status.
-			let activeEditor = this._editorService.getActiveEditor();
+			let activeEditor = this._editorService.activeControl;
 			if (activeEditor) {
 				let currentUri = WorkbenchUtils.getEditorUri(activeEditor.input);
 				if (uri === currentUri) {
@@ -67,7 +68,7 @@ export class QueryStatusbarItem implements IStatusbarItem {
 	}

 	private _onEditorsChanged(): void{
-		let activeEditor = this._editorService.getActiveEditor();
+		let activeEditor = this._editorService.activeControl;
 		if (activeEditor) {
 			let uri = WorkbenchUtils.getEditorUri(activeEditor.input);

@@ -100,7 +101,7 @@ export class QueryStatusbarItem implements IStatusbarItem {

 	// Show/hide query status for active editor
 	private _showStatus(uri: string): void{
-		let activeEditor = this._editorService.getActiveEditor();
+		let activeEditor = this._editorService.activeControl;
 		if (activeEditor) {
 			let currentUri = WorkbenchUtils.getEditorUri(activeEditor.input);
 			if (uri === currentUri) {
--- a/src/sql/parts/query/services/queryEditorService.ts
+++ b/src/sql/parts/query/services/queryEditorService.ts
@@ -7,7 +7,7 @@ import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
 import { EditDataInput } from 'sql/parts/editData/common/editDataInput';
 import { IConnectableInput, IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IQueryEditorService, IQueryEditorOptions } from 'sql/parts/query/common/queryEditorService';
 import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput';
 import { sqlModeId, untitledFilePrefix, getSupportedInputResource } from 'sql/parts/common/customInputConverter';
@@ -15,11 +15,8 @@ import * as TaskUtilities from 'sql/workbench/common/taskUtilities';

 import { IMode } from 'vs/editor/common/modes';
 import { ITextModel } from 'vs/editor/common/model';
-import { IEditor, IEditorInput, Position } from 'vs/platform/editor/common/editor';
-import { CodeEditor } from 'vs/editor/browser/codeEditor';
-import { IEditorGroup } from 'vs/workbench/common/editor';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
 import Severity from 'vs/base/common/severity';
@@ -30,6 +27,8 @@ import { isLinux } from 'vs/base/common/platform';
 import { Schemas } from 'vs/base/common/network';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput';
+import { IEditorInput, IEditor } from 'vs/workbench/common/editor';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';

 const fs = require('fs');

@@ -51,16 +50,16 @@ export class QueryEditorService implements IQueryEditorService {
 	);

 	// service references for static functions
-	private static editorService: IWorkbenchEditorService;
+	private static editorService: IEditorService;
 	private static instantiationService: IInstantiationService;
-	private static editorGroupService: IEditorGroupService;
+	private static editorGroupService: IEditorGroupsService;
 	private static notificationService: INotificationService;

 	constructor(
 		@IUntitledEditorService private _untitledEditorService: IUntitledEditorService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
-		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
-		@IEditorGroupService private _editorGroupService: IEditorGroupService,
+		@IEditorService private _editorService: IEditorService,
+		@IEditorGroupsService private _editorGroupService: IEditorGroupsService,
 		@INotificationService private _notificationService: INotificationService,
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService
 	) {
@@ -90,8 +89,6 @@ export class QueryEditorService implements IQueryEditorService {
 					}
 				});

-				//input.resolve().then(model => this.backupFileService.backupResource(resource, model.getValue(), model.getVersionId())).done(null, errors.onUnexpectedError);
-
 				const queryResultsInput: QueryResultsInput = this._instantiationService.createInstance(QueryResultsInput, docUri.toString());
 				let queryInput: QueryInput = this._instantiationService.createInstance(QueryInput, '', fileInput, queryResultsInput, connectionProviderName);

@@ -113,7 +110,7 @@ export class QueryEditorService implements IQueryEditorService {
 		const self = this;
 		return new Promise<any>((resolve, reject) => {
 			let queryPlanInput: QueryPlanInput = self._instantiationService.createInstance(QueryPlanInput, xmlShowPlan, 'aaa', undefined);
-			self._editorService.openEditor(queryPlanInput, { pinned: true }, false);
+			self._editorService.openEditor(queryPlanInput, { pinned: true }, ACTIVE_GROUP);
 			resolve(true);
 		});
 	}
@@ -163,26 +160,25 @@ export class QueryEditorService implements IQueryEditorService {

 	onSaveAsCompleted(oldResource: URI, newResource: URI): void {
 		let oldResourceString: string = oldResource.toString();
-		const stacks = this._editorGroupService.getStacksModel();
-		stacks.groups.forEach(group => {
-			group.getEditors().forEach(input => {
-				if (input instanceof QueryInput) {
-					const resource = input.getResource();

-					// Update Editor if file (or any parent of the input) got renamed or moved
-					// Note: must check the new file name for this since this method is called after the rename is completed
-					if (paths.isEqualOrParent(resource.fsPath, newResource.fsPath, !isLinux /* ignorecase */)) {
-						// In this case, we know that this is a straight rename so support this as a rename / replace operation
-						TaskUtilities.replaceConnection(oldResourceString, newResource.toString(), this._connectionManagementService).then(result => {
-							if (result && result.connected) {
-								input.onConnectSuccess();
-							} else {
-								input.onConnectReject();
-							}
-						});
-					}
+
+		this._editorService.editors.forEach(input => {
+			if (input instanceof QueryInput) {
+				const resource = input.getResource();
+
+				// Update Editor if file (or any parent of the input) got renamed or moved
+				// Note: must check the new file name for this since this method is called after the rename is completed
+				if (paths.isEqualOrParent(resource.fsPath, newResource.fsPath, !isLinux /* ignorecase */)) {
+					// In this case, we know that this is a straight rename so support this as a rename / replace operation
+					TaskUtilities.replaceConnection(oldResourceString, newResource.toString(), this._connectionManagementService).then(result => {
+						if (result && result.connected) {
+							input.onConnectSuccess();
+						} else {
+							input.onConnectReject();
+						}
+					});
 				}
-			});
+			}
 		});
 	}

@@ -240,12 +236,10 @@ export class QueryEditorService implements IQueryEditorService {
 			return Promise.resolve(undefined);
 		}

-		let group: IEditorGroup = QueryEditorService.editorGroupService.getStacksModel().groupAt(editor.position);
-		let index: number = group.indexOf(editor.input);
-		let position: Position = editor.position;
+		let group: IEditorGroup = editor.group;
+		let index: number = group.editors.indexOf(editor.input);
 		let options: IQueryEditorOptions = editor.options ? editor.options : {};
 		options = Object.assign(options, { index: index });
-		options.pinned = group.isPinned(index);

 		// Return a promise that will resovle when the old editor has been replaced by a new editor
 		return new Promise<ITextModel>((resolve, reject) => {
@@ -256,16 +250,14 @@ export class QueryEditorService implements IQueryEditorService {
 				options.denyQueryEditor = true;
 			}

-			// Close the current editor
-			QueryEditorService.editorService.closeEditor(position, editor.input).then(() => {
-
+			group.closeEditor(editor.input).then(() => {
 				// Reopen a new editor in the same position/index
-				QueryEditorService.editorService.openEditor(newEditorInput, options, position).then((editor) => {
-					resolve(QueryEditorService._onEditorOpened(editor, uri.toString(), position, options.pinned));
+				QueryEditorService.editorService.openEditor(newEditorInput, options, group).then((editor) => {
+					resolve(QueryEditorService._onEditorOpened(editor, uri.toString(), undefined, options.pinned));
 				},
-					(error) => {
-						reject(error);
-					});
+				(error) => {
+					reject(error);
+				});
 			});
 		});
 	}
@@ -365,10 +357,10 @@ export class QueryEditorService implements IQueryEditorService {
 		// causes the text on the tab to slightly flicker for unpinned files (from non-italic to italic to non-italic).
 		// This is currently unavoidable because vscode ignores "pinned" on IEditorOptions if "index" is not undefined,
 		// and we need to specify "index"" so the editor tab remains in the same place
-		let group: IEditorGroup = QueryEditorService.editorGroupService.getStacksModel().groupAt(position);
-		if (isPinned) {
-			QueryEditorService.editorGroupService.pinEditor(group, editor.input);
-		}
+		// let group: IEditorGroup = QueryEditorService.editorGroupService.getStacksModel().groupAt(position);
+		// if (isPinned) {
+		// 	QueryEditorService.editorGroupService.pinEditor(group, editor.input);
+		// }

 		// @SQLTODO do we need the below
 		// else {
@@ -377,7 +369,7 @@ export class QueryEditorService implements IQueryEditorService {

 		// Grab and returns the IModel that will be used to resolve the sqlLanguageModeCheck promise.
 		let control = editor.getControl();
-		let codeEditor: CodeEditor = <CodeEditor>control;
+		let codeEditor: ICodeEditor = <ICodeEditor>control;
 		let newModel = codeEditor ? codeEditor.getModel() : undefined;
 		return newModel;
 	}
--- a/src/sql/parts/query/views/flexibleSash.ts
+++ b/src/sql/parts/query/views/flexibleSash.ts
@@ -9,7 +9,7 @@ import { Dimension } from 'vs/base/browser/dom';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IHorizontalSashLayoutProvider, IVerticalSashLayoutProvider,
-	ISashEvent, Orientation, VSash, Sash } from 'vs/base/browser/ui/sash/sash';
+	ISashEvent, Orientation, Sash } from 'vs/base/browser/ui/sash/sash';
 // There is no need to import the sash CSS - 'vs/base/browser/ui/sash/sash' already includes it

 /**