Last of the layering (#5187)

* layer query

* update imports

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

@@ -27,7 +27,7 @@ import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
 import { warn } from 'sql/base/common/log';
 import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService';
 import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService';
-import * as QueryConstants from 'sql/parts/query/common/constants';
+import * as QueryConstants from 'sql/workbench/parts/query/common/constants';
 import { Deferred } from 'sql/base/common/promise';
 import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { values, entries } from 'sql/base/common/objects';

src/sql/platform/node/resultSerializer.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as ConnectionConstants from 'sql/platform/connection/common/constants';
-import * as Constants from 'sql/parts/query/common/constants';
+import * as Constants from 'sql/workbench/parts/query/common/constants';
-import * as LocalizedConstants from 'sql/parts/query/common/localizedConstants';
+import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants';
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
 import { SaveResultsRequestParams } from 'azdata';
 import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';

src/sql/platform/query/common/queryModel.ts

@@ -7,7 +7,7 @@ import QueryRunner from 'sql/platform/query/common/queryRunner';
 import { DataService } from 'sql/workbench/parts/grid/services/dataService';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import {
 	ISelectionData,
 	ResultSetSubset,

src/sql/platform/query/common/queryModelService.ts

@@ -3,18 +3,16 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents';
-import * as LocalizedConstants from 'sql/parts/query/common/localizedConstants';
+import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants';
 import QueryRunner, { EventType as QREvents } from 'sql/platform/query/common/queryRunner';
 import { DataService } from 'sql/workbench/parts/grid/services/dataService';
 import { IQueryModelService, IQueryEvent } from 'sql/platform/query/common/queryModel';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
-import { QueryStatusbarItem } from 'sql/parts/query/execution/queryStatus';
+import { QueryStatusbarItem } from 'sql/workbench/parts/query/browser/queryStatus';
-import { SqlFlavorStatusbarItem } from 'sql/parts/query/common/flavorStatus';
+import { SqlFlavorStatusbarItem } from 'sql/workbench/parts/query/browser/flavorStatus';
-import { RowCountStatusBarItem } from 'sql/parts/query/common/rowCountStatus';
+import { RowCountStatusBarItem } from 'sql/workbench/parts/query/browser/rowCountStatus';
-import { TimeElapsedStatusBarItem } from 'sql/parts/query/common/timeElapsedStatus';
+import { TimeElapsedStatusBarItem } from 'sql/workbench/parts/query/browser/timeElapsedStatus';
 
 import * as azdata from 'azdata';
 

src/sql/platform/query/common/queryRunner.ts

@@ -5,7 +5,7 @@
 
 import * as azdata from 'azdata';
 
-import * as Constants from 'sql/parts/query/common/constants';
+import * as Constants from 'sql/workbench/parts/query/common/constants';
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
 import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
 import * as Utils from 'sql/platform/connection/common/utils';

src/sql/workbench/api/node/mainThreadQueryEditor.ts

@@ -9,7 +9,7 @@ import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
-import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
+import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IQueryModelService, IQueryEvent } from 'sql/platform/query/common/queryModel';

src/sql/workbench/common/customInputConverter.ts

@@ -8,8 +8,8 @@ import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiat
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 import { URI } from 'vs/base/common/uri';
 
-import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
+import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
 import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';

src/sql/workbench/common/sqlWorkbenchUtils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import ConnectionConstants = require('sql/platform/connection/common/constants');
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { URI } from 'vs/base/common/uri';

src/sql/workbench/common/taskUtilities.ts

@@ -19,7 +19,7 @@ import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/
 import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService';
 import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput';
 import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';

src/sql/workbench/parts/charts/browser/actions.ts

@@ -3,11 +3,9 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
+import { IInsightOptions, IInsight } from './interfaces';
-
+import { Graph } from './graphInsight';
-import { IInsightOptions, IInsight } from './insights/interfaces';
+import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor';
-import { Graph } from './insights/graphInsight';
-import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 import { resolveCurrentDirectory, getRootPath } from 'sql/platform/node/pathUtilities';

src/sql/workbench/parts/charts/browser/chartOptions.ts

@@ -3,13 +3,11 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { localize } from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 
 import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
-import { InsightType, IInsightOptions } from './insights/interfaces';
+import { InsightType, IInsightOptions } from './interfaces';
 import { DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
 
 const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution);

src/sql/workbench/parts/charts/browser/chartView.ts

@@ -3,21 +3,14 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
+import 'vs/css!./media/chartView';
-
-import 'vs/css!./chartView';
 
 import { IPanelView } from 'sql/base/browser/ui/panel/panel';
-import { Insight } from './insights/insight';
+import { Insight } from './insight';
 import QueryRunner from 'sql/platform/query/common/queryRunner';
-import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 import { ChartOptions, IChartOption, ControlType } from './chartOptions';
 import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
-import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
+import { IInsightOptions } from './interfaces';
-import { IInsightOptions } from './insights/interfaces';
-import { CopyAction, SaveImageAction, CreateInsightAction, IChartActionContext } from './actions';
-import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
-import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
 import { Registry } from 'vs/platform/registry/common/platform';
 import * as DOM from 'vs/base/browser/dom';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
@@ -28,6 +21,11 @@ import { attachSelectBoxStyler, attachInputBoxStyler } from 'vs/platform/theme/c
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { isUndefinedOrNull } from 'vs/base/common/types';
+import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
+import { CreateInsightAction, CopyAction, SaveImageAction, IChartActionContext } from 'sql/workbench/parts/charts/browser/actions';
+import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
+import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
 
 export class ChartState {
 	dataId: { batchId: number, resultId: number };

src/sql/workbench/parts/charts/browser/countInsight.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./countInsight';
+import 'vs/css!./media/countInsight';
 
 import { IInsight, InsightType } from './interfaces';
 import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';

src/sql/workbench/parts/charts/browser/media/countInsight.css

@@ -10,7 +10,3 @@
 .label-container {
 	font-size: 20px
 }
-
-.value-container {
-
-}

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

@@ -12,7 +12,7 @@ import { INotificationService, INotificationActions } from 'vs/platform/notifica
 import Severity from 'vs/base/common/severity';
 import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
 import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';

src/sql/workbench/parts/editData/browser/editDataEditor.ts

@@ -3,8 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!sql/parts/query/editor/media/queryEditor';
-
 import * as strings from 'vs/base/common/strings';
 import * as DOM from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
@@ -19,7 +17,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
 
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import * as queryContext from 'sql/parts/query/common/queryContext';
+import * as queryContext from 'sql/workbench/parts/query/common/queryContext';
 import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';
@@ -32,7 +30,7 @@ import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResour
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
-import { IFlexibleSash, HorizontalFlexibleSash } from 'sql/parts/query/views/flexibleSash';
+import { IFlexibleSash, HorizontalFlexibleSash } from 'sql/workbench/parts/query/browser/flexibleSash';
 import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor';
 import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
 import { CancellationToken } from 'vs/base/common/cancellation';

src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts

@@ -16,7 +16,7 @@ import * as types from 'vs/base/common/types';
 
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
-import { BareResultsGridInfo } from 'sql/parts/query/editor/queryResultsEditor';
+import { BareResultsGridInfo } from 'sql/workbench/parts/query/browser/queryResultsEditor';
 import { IEditDataComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams';
 import { EditDataModule } from 'sql/workbench/parts/grid/views/editData/editData.module';
 import { EDITDATA_SELECTOR } from 'sql/workbench/parts/grid/views/editData/editData.component';

src/sql/workbench/parts/grid/views/gridCommands.ts

@@ -5,7 +5,7 @@
 
 import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
-import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
+import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor';
 import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor';
 
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';

src/sql/workbench/parts/grid/views/gridParentComponent.ts

@@ -10,15 +10,15 @@ import { Subscription, Subject } from 'rxjs/Rx';
 import { ElementRef, QueryList, ChangeDetectorRef, ViewChildren } from '@angular/core';
 import { SlickGrid } from 'angular2-slickgrid';
 import { toDisposableSubscription } from 'sql/base/node/rxjsUtils';
-import * as Constants from 'sql/parts/query/common/constants';
+import * as Constants from 'sql/workbench/parts/query/common/constants';
-import * as LocalizedConstants from 'sql/parts/query/common/localizedConstants';
+import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants';
 import { IGridInfo, IGridDataSet, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces';
 import * as Utils from 'sql/platform/connection/common/utils';
 import { DataService } from 'sql/workbench/parts/grid/services/dataService';
 import * as actions from 'sql/workbench/parts/grid/views/gridActions';
 import * as Services from 'sql/base/browser/ui/table/formatters';
 import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents';
-import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/parts/query/common/queryContext';
+import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/workbench/parts/query/common/queryContext';
 import { error } from 'sql/base/common/log';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';

src/sql/workbench/parts/notebook/outputs/tableRenderers.ts

@@ -14,7 +14,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin';
 import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';
 import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin';
-import { RESULTS_GRID_DEFAULTS } from 'sql/parts/query/editor/queryResultsEditor';
+import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/parts/query/browser/queryResultsEditor';
 
 /**
  * Render DataResource as a grid into a host node.

src/sql/workbench/parts/query/browser/actions.ts

@@ -12,10 +12,9 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import QueryRunner from 'sql/platform/query/common/queryRunner';
 import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces';
 import { Table } from 'sql/base/browser/ui/table/table';
-import { GridTableState } from 'sql/parts/query/editor/gridPanel';
+import { GridTableState } from 'sql/workbench/parts/query/electron-browser/gridPanel';
 import { QueryEditor } from './queryEditor';
 import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
-import { MessagePanel } from 'sql/parts/query/editor/messagePanel';
 import { isWindows } from 'vs/base/common/platform';
 import { removeAnsiEscapeCodes } from 'vs/base/common/strings';
 
@@ -128,7 +127,6 @@ export class CopyMessagesAction extends Action {
 	public static LABEL = localize('copyMessages', 'Copy');
 
 	constructor(
-		private messagePanel: MessagePanel,
 		@IClipboardService private clipboardService: IClipboardService
 	) {
 		super(CopyMessagesAction.ID, CopyMessagesAction.LABEL);
@@ -216,24 +214,3 @@ export class ChartDataAction extends Action {
 		}
 	}
 }
-
-export class ShowQueryPlanAction extends Action {
-	public static ID = 'showQueryPlan';
-	public static LABEL = localize('showQueryPlan', 'Show Query Plan');
-
-	constructor(
-		@IEditorService private editorService: IEditorService
-	) {
-		super(ShowQueryPlanAction.ID, ShowQueryPlanAction.LABEL);
-	}
-
-	public run(xml: string): Promise<boolean> {
-		let activeEditor = this.editorService.activeControl;
-		if (activeEditor instanceof QueryEditor) {
-			activeEditor.resultsEditor.showQueryPlan(xml);
-			return Promise.resolve(true);
-		} else {
-			return Promise.resolve(false);
-		}
-	}
-}

src/sql/workbench/parts/query/browser/flavorStatus.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!sql/parts/query/common/media/flavorStatus';
+import 'vs/css!./media/flavorStatus';
 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';
@@ -13,7 +13,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { Action } from 'vs/base/common/actions';
 import errors = require('vs/base/common/errors');
 import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import nls = require('vs/nls');
+import * as nls from 'vs/nls';
 
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
@@ -68,7 +68,6 @@ export class SqlFlavorStatusbarItem implements IStatusbarItem {
 	constructor(
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
 		@IEditorService private _editorService: EditorServiceImpl,
-		@IQuickInputService private _quickInputService: IQuickInputService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
 	) {
 		this._sqlStatusEditors = {};

src/sql/workbench/parts/query/browser/keyboardQueryActions.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import nls = require('vs/nls');
+import * as nls from 'vs/nls';
 
 import { Action } from 'vs/base/common/actions';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -12,10 +12,10 @@ import * as azdata from 'azdata';
 
 import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
+import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
-import * as Constants from 'sql/parts/query/common/constants';
+import * as Constants from 'sql/workbench/parts/query/common/constants';
 import * as ConnectionConstants from 'sql/platform/connection/common/constants';
 import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
@@ -23,7 +23,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 
 const singleQuote = '\'';
 
-export function isConnected(editor: QueryEditor, connectionManagementService: IConnectionManagementService): boolean {
+function isConnected(editor: QueryEditor, connectionManagementService: IConnectionManagementService): boolean {
 	if (!editor || !editor.currentQueryInput) {
 		return false;
 	}

src/sql/workbench/parts/query/browser/messagePanel.ts

@@ -6,7 +6,7 @@
 import 'vs/css!./media/messagePanel';
 import { IMessagesActionContext, CopyMessagesAction, CopyAllMessagesAction } from './actions';
 import QueryRunner from 'sql/platform/query/common/queryRunner';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 
 import { IResultMessage, ISelectionData } from 'azdata';
@@ -128,7 +128,7 @@ export class MessagePanel extends ViewletPanel {
 				};
 				// Ctrl + C for copy
 				if (event.code === 'KeyC') {
-					let copyMessageAction = instantiationService.createInstance(CopyMessagesAction, this, this.clipboardService);
+					let copyMessageAction = instantiationService.createInstance(CopyMessagesAction, this.clipboardService);
 					copyMessageAction.run(context);
 				}
 			}
@@ -155,7 +155,7 @@ export class MessagePanel extends ViewletPanel {
 				},
 				getActions: () => {
 					return [
-						instantiationService.createInstance(CopyMessagesAction, this, this.clipboardService),
+						instantiationService.createInstance(CopyMessagesAction, this.clipboardService),
 						instantiationService.createInstance(CopyAllMessagesAction, this.tree, this.clipboardService)
 					];
 				},

src/sql/workbench/parts/query/browser/query.contribution.ts

@@ -16,22 +16,22 @@ import { ContextKeyExpr, ContextKeyEqualsExpr } from 'vs/platform/contextkey/com
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { isMacintosh } from 'vs/base/common/platform';
 
-import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
+import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor';
-import { QueryResultsEditor } from 'sql/parts/query/editor/queryResultsEditor';
+import { QueryResultsEditor } from 'sql/workbench/parts/query/browser/queryResultsEditor';
-import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
+import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput';
-import * as queryContext from 'sql/parts/query/common/queryContext';
+import * as queryContext from 'sql/workbench/parts/query/common/queryContext';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor';
 import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
 import {
 	RunQueryKeyboardAction, RunCurrentQueryKeyboardAction, CancelQueryKeyboardAction, RefreshIntellisenseKeyboardAction, ToggleQueryResultsKeyboardAction,
 	RunQueryShortcutAction, RunCurrentQueryWithActualPlanKeyboardAction, FocusOnCurrentQueryKeyboardAction, ParseSyntaxAction
-} from 'sql/parts/query/execution/keyboardQueryActions';
+} from 'sql/workbench/parts/query/browser/keyboardQueryActions';
 import * as gridActions from 'sql/workbench/parts/grid/views/gridActions';
 import * as gridCommands from 'sql/workbench/parts/grid/views/gridCommands';
 import { QueryPlanEditor } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor';
 import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
-import * as Constants from 'sql/parts/query/common/constants';
+import * as Constants from 'sql/workbench/parts/query/common/constants';
 import { localize } from 'vs/nls';
 import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor';
 import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';

src/sql/workbench/parts/query/browser/queryActions.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!sql/parts/query/editor/media/queryActions';
+import 'vs/css!./media/queryActions';
 import * as nls from 'vs/nls';
 import { Action, IActionItem, IActionRunner } from 'vs/base/common/actions';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -22,7 +22,7 @@ import {
 	ConnectionType,
 	RunQueryOnConnectionMode
 } from 'sql/platform/connection/common/connectionManagement';
-import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
+import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
 import { attachEditableDropdownStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/styler';

src/sql/workbench/parts/query/browser/queryEditor.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!sql/parts/query/editor/media/queryEditor';
+import 'vs/css!./media/queryEditor';
 import * as strings from 'vs/base/common/strings';
 import * as DOM from 'vs/base/browser/dom';
 import * as types from 'vs/base/common/types';
@@ -11,7 +11,7 @@ import * as types from 'vs/base/common/types';
 import { EditorInput, EditorOptions, IEditorControl, IEditor, TextEditorOptions } from 'vs/workbench/common/editor';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
-import { VerticalFlexibleSash, HorizontalFlexibleSash, IFlexibleSash } from 'sql/parts/query/views/flexibleSash';
+import { VerticalFlexibleSash, HorizontalFlexibleSash, IFlexibleSash } from 'sql/workbench/parts/query/browser/flexibleSash';
 import { Orientation } from 'vs/base/browser/ui/sash/sash';
 
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -29,16 +29,16 @@ import { ISelectionData } from 'azdata';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IRange } from 'vs/editor/common/core/range';
 
-import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
+import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
-import { QueryResultsEditor } from 'sql/parts/query/editor/queryResultsEditor';
+import { QueryResultsEditor } from 'sql/workbench/parts/query/browser/queryResultsEditor';
-import * as queryContext from 'sql/parts/query/common/queryContext';
+import * as queryContext from 'sql/workbench/parts/query/common/queryContext';
 import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar';
 import {
 	RunQueryAction, CancelQueryAction, ListDatabasesAction, ListDatabasesActionItem,
 	ConnectDatabaseAction, ToggleConnectDatabaseAction, EstimatedQueryPlanAction,
 	ActualQueryPlanAction
-} from 'sql/parts/query/execution/queryActions';
+} from 'sql/workbench/parts/query/browser/queryActions';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import { IEditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';

src/sql/workbench/parts/query/browser/queryResultsEditor.ts

@@ -3,8 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -17,9 +15,9 @@ import * as DOM from 'vs/base/browser/dom';
 import * as types from 'vs/base/common/types';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
-import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
+import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
-import { QueryResultsView } from 'sql/parts/query/editor/queryResultsView';
+import { QueryResultsView } from 'sql/workbench/parts/query/browser/queryResultsView';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 

src/sql/workbench/parts/query/browser/queryResultsView.ts

@@ -3,16 +3,16 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { QueryResultsInput, ResultsViewState } from 'sql/parts/query/common/queryResultsInput';
+import { QueryResultsInput, ResultsViewState } from 'sql/workbench/parts/query/common/queryResultsInput';
 import { TabbedPanel, IPanelTab, IPanelView } from 'sql/base/browser/ui/panel/panel';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import QueryRunner from 'sql/platform/query/common/queryRunner';
 import { MessagePanel } from './messagePanel';
-import { GridPanel } from './gridPanel';
+import { GridPanel } from '../electron-browser/gridPanel';
-import { ChartTab } from './charting/chartTab';
+import { ChartTab } from '../../charts/browser/chartTab';
 import { QueryPlanTab } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan';
 import { TopOperationsTab } from 'sql/workbench/parts/queryPlan/browser/topOperations';
-import { QueryModelViewTab } from 'sql/parts/query/modelViewTab/queryModelViewTab';
+import { QueryModelViewTab } from 'sql/workbench/parts/query/modelViewTab/queryModelViewTab';
 
 import * as nls from 'vs/nls';
 import { PanelViewlet } from 'vs/workbench/browser/parts/views/panelViewlet';

src/sql/workbench/parts/query/browser/queryStatus.ts

@@ -9,7 +9,7 @@ import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { IEditorCloseEvent } from 'vs/workbench/common/editor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
-import LocalizedConstants = require('sql/parts/query/common/localizedConstants');
+import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants';
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
 import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
 

src/sql/workbench/parts/query/common/localizedConstants.ts

@@ -36,5 +36,3 @@ export const elapsedTimeLabel = localize('elapsedTimeLabel', 'Total execution ti
 
 /** Warning message for save icons */
 export const msgCannotSaveMultipleSelections = localize('msgCannotSaveMultipleSelections', 'Save results command cannot be used with multiple selections.');
-
-

src/sql/workbench/parts/query/common/queryContext.ts

@@ -3,8 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 
 /**

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

@@ -13,7 +13,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IEditorViewState } from 'vs/editor/common/editorCommon';
 
 import { IConnectionManagementService, IConnectableInput, INewConnectionParams, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement';
-import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
+import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 

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

@@ -3,17 +3,15 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { localize } from 'vs/nls';
 import { EditorInput } from 'vs/workbench/common/editor';
 import { Emitter } from 'vs/base/common/event';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
-import { GridPanelState } from 'sql/parts/query/editor/gridPanel';
+import { GridPanelState } from 'sql/workbench/parts/query/electron-browser/gridPanel';
-import { MessagePanelState } from 'sql/parts/query/editor/messagePanel';
+import { MessagePanelState } from 'sql/workbench/parts/query/browser/messagePanel';
 import { QueryPlanState } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan';
-import { ChartState } from 'sql/parts/query/editor/charting/chartView';
+import { ChartState } from 'sql/workbench/parts/charts/browser/chartView';
 import { TopOperationsState } from 'sql/workbench/parts/queryPlan/browser/topOperations';
 
 export class ResultsViewState {

src/sql/workbench/parts/query/common/resultsGridContribution.ts

@@ -3,16 +3,13 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
+import { Extensions, IConfigurationRegistry, IConfigurationNode } from 'vs/platform/configuration/common/configurationRegistry';
-import { Extensions, IConfigurationRegistry, IConfigurationNode, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
 import * as nls from 'vs/nls';
 import * as editorOptions from 'vs/editor/common/config/editorOptions';
-import EDITOR_DEFAULTS = editorOptions.EDITOR_DEFAULTS;
 import EDITOR_FONT_DEFAULTS = editorOptions.EDITOR_FONT_DEFAULTS;
-import EDITOR_MODEL_DEFAULTS = editorOptions.EDITOR_MODEL_DEFAULTS;
 
-import { RESULTS_GRID_DEFAULTS } from 'sql/parts/query/editor/queryResultsEditor';
+import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/parts/query/browser/queryResultsEditor';
 
 const configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
 

src/sql/workbench/parts/query/electron-browser/gridPanel.ts

@@ -13,7 +13,7 @@ import { ScrollableSplitView, IView } from 'sql/base/browser/ui/scrollableSplitv
 import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin';
 import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';
 import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces';
-import { IGridActionContext, SaveResultAction, CopyResultAction, SelectAllGridAction, MaximizeTableAction, RestoreTableAction, ChartDataAction } from 'sql/parts/query/editor/actions';
+import { IGridActionContext, SaveResultAction, CopyResultAction, SelectAllGridAction, MaximizeTableAction, RestoreTableAction, ChartDataAction } from 'sql/workbench/parts/query/browser/actions';
 import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
 import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin';
 import { escape } from 'sql/base/common/strings';
@@ -67,11 +67,6 @@ export class GridPanelState {
 	}
 }
 
-export interface IGridTableState {
-	canBeMaximized: boolean;
-	maximized: boolean;
-}
-
 export class GridTableState extends Disposable {
 
 	private _maximized: boolean;

src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.module.ts

@@ -3,8 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import 'vs/css!./media/dialogModal';
 
 import { forwardRef, NgModule, ComponentFactoryResolver, Inject, ApplicationRef } from '@angular/core';
@@ -25,7 +23,7 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { QueryModelViewTabContainer } from 'sql/parts/query/modelViewTab/queryModelViewTabContainer.component';
+import { QueryModelViewTabContainer } from 'sql/workbench/parts/query/modelViewTab/queryModelViewTabContainer.component';
 
 export const QueryModelViewTabModule = (params, selector: string, instantiationService: IInstantiationService): any => {
 

src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.ts

@@ -2,14 +2,13 @@
  *  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 { Dimension } from 'vs/base/browser/dom';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { dispose } from 'vs/base/common/lifecycle';
 import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
-import { QueryModelViewTabModule } from 'sql/parts/query/modelViewTab/queryModelViewTab.module';
+import { QueryModelViewTabModule } from 'sql/workbench/parts/query/modelViewTab/queryModelViewTab.module';
 
 export class QueryModelViewTab implements IPanelTab {
 	public identifier = 'QueryModelViewTab_';
@@ -32,9 +31,6 @@ export class QueryModelViewTab implements IPanelTab {
 export class QueryModelViewTabView implements IPanelView {
 
 	public _componentId: string;
-	private _isInitialized: boolean = false;
-
-	private _selector: string;
 
 	constructor(
 		@IInstantiationService private _instantiationService: IInstantiationService) {

src/sql/workbench/parts/query/modelViewTab/queryModelViewTabContainer.component.ts

@@ -3,8 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import 'vs/css!./media/dialogModal';
 import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core';
 import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
@@ -35,7 +33,6 @@ export interface DialogComponentParams extends IBootstrapParams {
 export class QueryModelViewTabContainer implements AfterViewInit {
 	private _onResize = new Emitter<void>();
 	public readonly onResize: Event<void> = this._onResize.event;
-	private _dialogPane: DialogPane;
 
 	public modelViewId: string;
 	@ViewChild(ModelViewContent) private _modelViewContent: ModelViewContent;

src/sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor.ts

@@ -3,7 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!sql/parts/query/editor/media/queryEditor';
 import * as DOM from 'vs/base/browser/dom';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -12,10 +11,6 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
 import { QueryPlanModule } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan.module';
-import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { IMetadataService } from 'sql/platform/metadata/common/metadataService';
-import { IScriptingService } from 'sql/platform/scripting/common/scriptingService';
-import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
 import { IQueryPlanParams } from 'sql/platform/bootstrap/node/bootstrapParams';
 import { QUERYPLAN_SELECTOR } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan.component';
@@ -30,11 +25,7 @@ export class QueryPlanEditor extends BaseEditor {
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IConnectionManagementService private _connectionService: IConnectionManagementService,
+		@IStorageService storageService: IStorageService
-		@IMetadataService private _metadataService: IMetadataService,
-		@IScriptingService private _scriptingService: IScriptingService,
-		@IQueryEditorService private _queryEditorService: IQueryEditorService,
-		@IStorageService private storageService: IStorageService
 	) {
 		super(QueryPlanEditor.ID, telemetryService, themeService, storageService);
 	}

src/sql/workbench/services/notebook/sql/sqlSessionManager.ts

@@ -18,7 +18,7 @@ import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMess
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { escape } from 'sql/base/common/strings';
-import { elapsedTimeLabel } from 'sql/parts/query/common/localizedConstants';
+import { elapsedTimeLabel } from 'sql/workbench/parts/query/common/localizedConstants';
 import * as notebookUtils from 'sql/workbench/parts/notebook/notebookUtils';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';

src/sql/workbench/services/queryEditor/browser/queryEditorService.ts

@@ -3,8 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
+import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
 import { IConnectableInput, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IQueryEditorService, IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';

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

@@ -19,9 +19,9 @@ import { ConnectionDialogService } from 'sql/workbench/services/connection/brows
 import {
 	RunQueryAction, CancelQueryAction, ListDatabasesActionItem,
 	DisconnectDatabaseAction, ConnectDatabaseAction, QueryTaskbarAction
-} from 'sql/parts/query/execution/queryActions';
+} from 'sql/workbench/parts/query/browser/queryActions';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
-import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
+import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor';
 import { QueryModelService } from 'sql/platform/query/common/queryModelService';
 import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';

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

@@ -12,13 +12,13 @@ import * as DOM from 'vs/base/browser/dom';
 import { Memento } from 'vs/workbench/common/memento';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 
-import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
+import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput';
-import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
+import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor';
 import { QueryModelService } from 'sql/platform/query/common/queryModelService';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement';
 import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService';
-import { RunQueryAction, ListDatabasesActionItem } from 'sql/parts/query/execution/queryActions';
+import { RunQueryAction, ListDatabasesActionItem } from 'sql/workbench/parts/query/browser/queryActions';
 import { EditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService';
 
 import { TestThemeService } from 'sqltest/stubs/themeTestService';

src/sqltest/workbench/common/taskUtilities.test.ts

@@ -15,7 +15,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf
 import { WorkbenchEditorTestService } from 'sqltest/stubs/workbenchEditorTestService';
 import { URI } from 'vs/base/common/uri';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 
 suite('TaskUtilities', function () {
 	test('getCurrentGlobalConnection returns the selected OE server if a server or one of its children is selected', () => {

src/vs/editor/browser/widget/diffEditorWidget.ts

@@ -41,7 +41,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { defaultInsertColor, defaultRemoveColor, diffBorder, diffInserted, diffInsertedOutline, diffRemoved, diffRemovedOutline, scrollbarShadow } from 'vs/platform/theme/common/colorRegistry';
 import { ITheme, IThemeService, getThemeTypeSelector, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 // {{SQL CARBON EDIT}}
-import { reverseLineChanges } from 'sql/editor/browser/DiffEditorHelper';
+import { reverseLineChanges } from 'sql/editor/browser/diffEditorHelper';
 
 interface IEditorDiffDecorations {
 	decorations: IModelDeltaDecoration[];

src/vs/workbench/browser/parts/editor/tabsTitleControl.ts

@@ -46,7 +46,7 @@ import { ILabelService } from 'vs/platform/label/common/label';
 
 // {{SQL CARBON EDIT}} -- Display the editor's tab color
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import * as QueryConstants from 'sql/parts/query/common/constants';
+import * as QueryConstants from 'sql/workbench/parts/query/common/constants';
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
 import { GlobalNewUntitledFileAction } from 'vs/workbench/contrib/files/browser/fileActions';
 // {{SQL CARBON EDIT}} -- End

src/vs/workbench/common/editor/editorGroup.ts

@@ -14,7 +14,7 @@ import { ResourceMap } from 'vs/base/common/map';
 import { coalesce } from 'vs/base/common/arrays';
 
 // {{SQL CARBON EDIT}}
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 import * as CustomInputConverter from 'sql/workbench/common/customInputConverter';
 import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';

src/vs/workbench/contrib/files/browser/editors/fileEditorTracker.ts

@@ -30,7 +30,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import { withNullAsUndefined } from 'vs/base/common/types';
 
 // {{SQL CARBON EDIT}}
-import { QueryInput } from 'sql/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 
 export class FileEditorTracker extends Disposable implements IWorkbenchContribution {
 

src/vs/workbench/workbench.main.ts

@@ -450,8 +450,8 @@ import 'sql/workbench/parts/dataExplorer/electron-browser/nodeActions.contributi
 import 'sql/platform/telemetry/telemetry.contribution';
 import 'sql/workbench/api/node/sqlExtHost.contribution';
 import 'sql/workbench/parts/connection/browser/connection.contribution';
-import 'sql/parts/query/common/query.contribution';
+import 'sql/workbench/parts/query/browser/query.contribution';
-import 'sql/parts/query/editor/resultsGridContribution';
+import 'sql/workbench/parts/query/common/resultsGridContribution';
 import 'sql/workbench/parts/profiler/browser/profiler.contribution';
 import 'sql/workbench/parts/profiler/browser/profilerActions.contribution';
 import 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution';