diff --git a/src/sql/platform/connection/common/connectionManagementService.ts b/src/sql/platform/connection/common/connectionManagementService.ts index 2016661756..34a0f90e0e 100644 --- a/src/sql/platform/connection/common/connectionManagementService.ts +++ b/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'; diff --git a/src/sql/platform/node/resultSerializer.ts b/src/sql/platform/node/resultSerializer.ts index 3fc453d3a3..f98659520b 100644 --- a/src/sql/platform/node/resultSerializer.ts +++ b/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 LocalizedConstants from 'sql/parts/query/common/localizedConstants'; +import * as Constants from 'sql/workbench/parts/query/common/constants'; +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'; diff --git a/src/sql/platform/query/common/queryModel.ts b/src/sql/platform/query/common/queryModel.ts index dbf9c9f4d5..cc8fae9c79 100644 --- a/src/sql/platform/query/common/queryModel.ts +++ b/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, diff --git a/src/sql/platform/query/common/queryModelService.ts b/src/sql/platform/query/common/queryModelService.ts index 3ecd7f0f83..b9d225f200 100644 --- a/src/sql/platform/query/common/queryModelService.ts +++ b/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 { QueryStatusbarItem } from 'sql/parts/query/execution/queryStatus'; -import { SqlFlavorStatusbarItem } from 'sql/parts/query/common/flavorStatus'; -import { RowCountStatusBarItem } from 'sql/parts/query/common/rowCountStatus'; -import { TimeElapsedStatusBarItem } from 'sql/parts/query/common/timeElapsedStatus'; +import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryStatusbarItem } from 'sql/workbench/parts/query/browser/queryStatus'; +import { SqlFlavorStatusbarItem } from 'sql/workbench/parts/query/browser/flavorStatus'; +import { RowCountStatusBarItem } from 'sql/workbench/parts/query/browser/rowCountStatus'; +import { TimeElapsedStatusBarItem } from 'sql/workbench/parts/query/browser/timeElapsedStatus'; import * as azdata from 'azdata'; diff --git a/src/sql/platform/query/common/queryRunner.ts b/src/sql/platform/query/common/queryRunner.ts index 3af182a764..9dfe0948c1 100644 --- a/src/sql/platform/query/common/queryRunner.ts +++ b/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'; diff --git a/src/sql/workbench/api/node/mainThreadQueryEditor.ts b/src/sql/workbench/api/node/mainThreadQueryEditor.ts index b39376f316..0f97cc78fc 100644 --- a/src/sql/workbench/api/node/mainThreadQueryEditor.ts +++ b/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'; diff --git a/src/sql/workbench/common/customInputConverter.ts b/src/sql/workbench/common/customInputConverter.ts index 27561b179f..d3b2060f91 100644 --- a/src/sql/workbench/common/customInputConverter.ts +++ b/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 { QueryInput } from 'sql/parts/query/common/queryInput'; +import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; +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'; diff --git a/src/sql/workbench/common/sqlWorkbenchUtils.ts b/src/sql/workbench/common/sqlWorkbenchUtils.ts index f2b78dafab..850a17266e 100644 --- a/src/sql/workbench/common/sqlWorkbenchUtils.ts +++ b/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'; diff --git a/src/sql/workbench/common/taskUtilities.ts b/src/sql/workbench/common/taskUtilities.ts index f4083ceca3..5b53f3e857 100644 --- a/src/sql/workbench/common/taskUtilities.ts +++ b/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'; diff --git a/src/sql/parts/query/editor/charting/actions.ts b/src/sql/workbench/parts/charts/browser/actions.ts similarity index 97% rename from src/sql/parts/query/editor/charting/actions.ts rename to src/sql/workbench/parts/charts/browser/actions.ts index 52aa7cce88..d44906a2c6 100644 --- a/src/sql/parts/query/editor/charting/actions.ts +++ b/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 './insights/interfaces'; -import { Graph } from './insights/graphInsight'; -import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; +import { IInsightOptions, IInsight } from './interfaces'; +import { Graph } from './graphInsight'; +import { QueryEditor } from 'sql/workbench/parts/query/browser/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'; diff --git a/src/sql/parts/query/editor/charting/chartOptions.ts b/src/sql/workbench/parts/charts/browser/chartOptions.ts similarity index 98% rename from src/sql/parts/query/editor/charting/chartOptions.ts rename to src/sql/workbench/parts/charts/browser/chartOptions.ts index ca10b7d3b5..548c570038 100644 --- a/src/sql/parts/query/editor/charting/chartOptions.ts +++ b/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(Extensions.InsightContribution); diff --git a/src/sql/parts/query/editor/charting/chartTab.ts b/src/sql/workbench/parts/charts/browser/chartTab.ts similarity index 100% rename from src/sql/parts/query/editor/charting/chartTab.ts rename to src/sql/workbench/parts/charts/browser/chartTab.ts diff --git a/src/sql/parts/query/editor/charting/chartView.ts b/src/sql/workbench/parts/charts/browser/chartView.ts similarity index 98% rename from src/sql/parts/query/editor/charting/chartView.ts rename to src/sql/workbench/parts/charts/browser/chartView.ts index 0e8b3dd52d..988e609ee8 100644 --- a/src/sql/parts/query/editor/charting/chartView.ts +++ b/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!./chartView'; +import 'vs/css!./media/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 './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 { IInsightOptions } from './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 }; diff --git a/src/sql/parts/query/editor/charting/insights/countInsight.ts b/src/sql/workbench/parts/charts/browser/countInsight.ts similarity index 97% rename from src/sql/parts/query/editor/charting/insights/countInsight.ts rename to src/sql/workbench/parts/charts/browser/countInsight.ts index f21a7edc1b..a40431ae9f 100644 --- a/src/sql/parts/query/editor/charting/insights/countInsight.ts +++ b/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'; diff --git a/src/sql/parts/query/editor/charting/insights/graphInsight.ts b/src/sql/workbench/parts/charts/browser/graphInsight.ts similarity index 100% rename from src/sql/parts/query/editor/charting/insights/graphInsight.ts rename to src/sql/workbench/parts/charts/browser/graphInsight.ts diff --git a/src/sql/parts/query/editor/charting/insights/imageInsight.ts b/src/sql/workbench/parts/charts/browser/imageInsight.ts similarity index 100% rename from src/sql/parts/query/editor/charting/insights/imageInsight.ts rename to src/sql/workbench/parts/charts/browser/imageInsight.ts diff --git a/src/sql/parts/query/editor/charting/insights/insight.ts b/src/sql/workbench/parts/charts/browser/insight.ts similarity index 100% rename from src/sql/parts/query/editor/charting/insights/insight.ts rename to src/sql/workbench/parts/charts/browser/insight.ts diff --git a/src/sql/parts/query/editor/charting/insights/interfaces.ts b/src/sql/workbench/parts/charts/browser/interfaces.ts similarity index 100% rename from src/sql/parts/query/editor/charting/insights/interfaces.ts rename to src/sql/workbench/parts/charts/browser/interfaces.ts diff --git a/src/sql/parts/query/editor/charting/chartView.css b/src/sql/workbench/parts/charts/browser/media/chartView.css similarity index 100% rename from src/sql/parts/query/editor/charting/chartView.css rename to src/sql/workbench/parts/charts/browser/media/chartView.css diff --git a/src/sql/parts/query/editor/charting/insights/countInsight.css b/src/sql/workbench/parts/charts/browser/media/countInsight.css similarity index 95% rename from src/sql/parts/query/editor/charting/insights/countInsight.css rename to src/sql/workbench/parts/charts/browser/media/countInsight.css index d4b36b9023..de3d30a130 100644 --- a/src/sql/parts/query/editor/charting/insights/countInsight.css +++ b/src/sql/workbench/parts/charts/browser/media/countInsight.css @@ -10,7 +10,3 @@ .label-container { font-size: 20px } - -.value-container { - -} diff --git a/src/sql/parts/query/editor/charting/insights/tableInsight.ts b/src/sql/workbench/parts/charts/browser/tableInsight.ts similarity index 100% rename from src/sql/parts/query/editor/charting/insights/tableInsight.ts rename to src/sql/workbench/parts/charts/browser/tableInsight.ts diff --git a/src/sql/workbench/parts/connection/common/connectionActions.ts b/src/sql/workbench/parts/connection/common/connectionActions.ts index 5b85174ca0..c77ab652f0 100644 --- a/src/sql/workbench/parts/connection/common/connectionActions.ts +++ b/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'; diff --git a/src/sql/workbench/parts/editData/browser/editDataEditor.ts b/src/sql/workbench/parts/editData/browser/editDataEditor.ts index ed6a496b1e..7c2d706e84 100644 --- a/src/sql/workbench/parts/editData/browser/editDataEditor.ts +++ b/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'; diff --git a/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts b/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts index 9dbb85a40b..4a1b5a3686 100644 --- a/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts +++ b/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'; diff --git a/src/sql/workbench/parts/grid/views/gridCommands.ts b/src/sql/workbench/parts/grid/views/gridCommands.ts index bc4b8578cd..00135a29f7 100644 --- a/src/sql/workbench/parts/grid/views/gridCommands.ts +++ b/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'; diff --git a/src/sql/workbench/parts/grid/views/gridParentComponent.ts b/src/sql/workbench/parts/grid/views/gridParentComponent.ts index e78f4144a8..80d67a9e8f 100644 --- a/src/sql/workbench/parts/grid/views/gridParentComponent.ts +++ b/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 LocalizedConstants from 'sql/parts/query/common/localizedConstants'; +import * as Constants from 'sql/workbench/parts/query/common/constants'; +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'; diff --git a/src/sql/workbench/parts/notebook/outputs/tableRenderers.ts b/src/sql/workbench/parts/notebook/outputs/tableRenderers.ts index 33af61a343..cf8d1a2589 100644 --- a/src/sql/workbench/parts/notebook/outputs/tableRenderers.ts +++ b/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. diff --git a/src/sql/parts/query/editor/actions.ts b/src/sql/workbench/parts/query/browser/actions.ts similarity index 90% rename from src/sql/parts/query/editor/actions.ts rename to src/sql/workbench/parts/query/browser/actions.ts index 53f371e12b..3660c37c29 100644 --- a/src/sql/parts/query/editor/actions.ts +++ b/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 { - let activeEditor = this.editorService.activeControl; - if (activeEditor instanceof QueryEditor) { - activeEditor.resultsEditor.showQueryPlan(xml); - return Promise.resolve(true); - } else { - return Promise.resolve(false); - } - } -} diff --git a/src/sql/parts/query/common/flavorStatus.ts b/src/sql/workbench/parts/query/browser/flavorStatus.ts similarity index 98% rename from src/sql/parts/query/common/flavorStatus.ts rename to src/sql/workbench/parts/query/browser/flavorStatus.ts index 5997715ec8..618dacbc95 100644 --- a/src/sql/parts/query/common/flavorStatus.ts +++ b/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 = {}; diff --git a/src/sql/parts/query/views/flexibleSash.ts b/src/sql/workbench/parts/query/browser/flexibleSash.ts similarity index 100% rename from src/sql/parts/query/views/flexibleSash.ts rename to src/sql/workbench/parts/query/browser/flexibleSash.ts diff --git a/src/sql/parts/query/execution/keyboardQueryActions.ts b/src/sql/workbench/parts/query/browser/keyboardQueryActions.ts similarity index 98% rename from src/sql/parts/query/execution/keyboardQueryActions.ts rename to src/sql/workbench/parts/query/browser/keyboardQueryActions.ts index 5ea500fc97..a1247d8208 100644 --- a/src/sql/parts/query/execution/keyboardQueryActions.ts +++ b/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; } diff --git a/src/sql/parts/query/editor/media/binarydiffeditor.css b/src/sql/workbench/parts/query/browser/media/binarydiffeditor.css similarity index 100% rename from src/sql/parts/query/editor/media/binarydiffeditor.css rename to src/sql/workbench/parts/query/browser/media/binarydiffeditor.css diff --git a/src/sql/parts/query/editor/media/close-dirty-inverse.svg b/src/sql/workbench/parts/query/browser/media/close-dirty-inverse.svg similarity index 100% rename from src/sql/parts/query/editor/media/close-dirty-inverse.svg rename to src/sql/workbench/parts/query/browser/media/close-dirty-inverse.svg diff --git a/src/sql/parts/query/editor/media/close-dirty.svg b/src/sql/workbench/parts/query/browser/media/close-dirty.svg similarity index 100% rename from src/sql/parts/query/editor/media/close-dirty.svg rename to src/sql/workbench/parts/query/browser/media/close-dirty.svg diff --git a/src/sql/parts/query/editor/media/close-inverse.svg b/src/sql/workbench/parts/query/browser/media/close-inverse.svg similarity index 100% rename from src/sql/parts/query/editor/media/close-inverse.svg rename to src/sql/workbench/parts/query/browser/media/close-inverse.svg diff --git a/src/sql/parts/query/editor/media/close.svg b/src/sql/workbench/parts/query/browser/media/close.svg similarity index 100% rename from src/sql/parts/query/editor/media/close.svg rename to src/sql/workbench/parts/query/browser/media/close.svg diff --git a/src/sql/parts/query/editor/media/editorGroupsControl.css b/src/sql/workbench/parts/query/browser/media/editorGroupsControl.css similarity index 100% rename from src/sql/parts/query/editor/media/editorGroupsControl.css rename to src/sql/workbench/parts/query/browser/media/editorGroupsControl.css diff --git a/src/sql/parts/query/editor/media/editorpart.css b/src/sql/workbench/parts/query/browser/media/editorpart.css similarity index 100% rename from src/sql/parts/query/editor/media/editorpart.css rename to src/sql/workbench/parts/query/browser/media/editorpart.css diff --git a/src/sql/parts/query/editor/media/editorpicker.css b/src/sql/workbench/parts/query/browser/media/editorpicker.css similarity index 100% rename from src/sql/parts/query/editor/media/editorpicker.css rename to src/sql/workbench/parts/query/browser/media/editorpicker.css diff --git a/src/sql/parts/query/editor/media/editorstatus.css b/src/sql/workbench/parts/query/browser/media/editorstatus.css similarity index 100% rename from src/sql/parts/query/editor/media/editorstatus.css rename to src/sql/workbench/parts/query/browser/media/editorstatus.css diff --git a/src/sql/parts/query/common/media/flavorStatus.css b/src/sql/workbench/parts/query/browser/media/flavorStatus.css similarity index 100% rename from src/sql/parts/query/common/media/flavorStatus.css rename to src/sql/workbench/parts/query/browser/media/flavorStatus.css diff --git a/src/sql/parts/query/editor/media/letterpress-dark.svg b/src/sql/workbench/parts/query/browser/media/letterpress-dark.svg similarity index 100% rename from src/sql/parts/query/editor/media/letterpress-dark.svg rename to src/sql/workbench/parts/query/browser/media/letterpress-dark.svg diff --git a/src/sql/parts/query/editor/media/letterpress-hc.svg b/src/sql/workbench/parts/query/browser/media/letterpress-hc.svg similarity index 100% rename from src/sql/parts/query/editor/media/letterpress-hc.svg rename to src/sql/workbench/parts/query/browser/media/letterpress-hc.svg diff --git a/src/sql/parts/query/editor/media/letterpress.svg b/src/sql/workbench/parts/query/browser/media/letterpress.svg similarity index 100% rename from src/sql/parts/query/editor/media/letterpress.svg rename to src/sql/workbench/parts/query/browser/media/letterpress.svg diff --git a/src/sql/parts/query/editor/media/messagePanel.css b/src/sql/workbench/parts/query/browser/media/messagePanel.css similarity index 100% rename from src/sql/parts/query/editor/media/messagePanel.css rename to src/sql/workbench/parts/query/browser/media/messagePanel.css diff --git a/src/sql/parts/query/editor/media/next-diff-inverse.svg b/src/sql/workbench/parts/query/browser/media/next-diff-inverse.svg similarity index 100% rename from src/sql/parts/query/editor/media/next-diff-inverse.svg rename to src/sql/workbench/parts/query/browser/media/next-diff-inverse.svg diff --git a/src/sql/parts/query/editor/media/next-diff.svg b/src/sql/workbench/parts/query/browser/media/next-diff.svg similarity index 100% rename from src/sql/parts/query/editor/media/next-diff.svg rename to src/sql/workbench/parts/query/browser/media/next-diff.svg diff --git a/src/sql/parts/query/editor/media/notabstitle.css b/src/sql/workbench/parts/query/browser/media/notabstitle.css similarity index 100% rename from src/sql/parts/query/editor/media/notabstitle.css rename to src/sql/workbench/parts/query/browser/media/notabstitle.css diff --git a/src/sql/parts/query/editor/media/parseQuery.svg b/src/sql/workbench/parts/query/browser/media/parseQuery.svg similarity index 100% rename from src/sql/parts/query/editor/media/parseQuery.svg rename to src/sql/workbench/parts/query/browser/media/parseQuery.svg diff --git a/src/sql/parts/query/editor/media/previous-diff-inverse.svg b/src/sql/workbench/parts/query/browser/media/previous-diff-inverse.svg similarity index 100% rename from src/sql/parts/query/editor/media/previous-diff-inverse.svg rename to src/sql/workbench/parts/query/browser/media/previous-diff-inverse.svg diff --git a/src/sql/parts/query/editor/media/previous-diff.svg b/src/sql/workbench/parts/query/browser/media/previous-diff.svg similarity index 100% rename from src/sql/parts/query/editor/media/previous-diff.svg rename to src/sql/workbench/parts/query/browser/media/previous-diff.svg diff --git a/src/sql/parts/query/editor/media/queryActions.css b/src/sql/workbench/parts/query/browser/media/queryActions.css similarity index 100% rename from src/sql/parts/query/editor/media/queryActions.css rename to src/sql/workbench/parts/query/browser/media/queryActions.css diff --git a/src/sql/parts/query/editor/media/queryEditor.css b/src/sql/workbench/parts/query/browser/media/queryEditor.css similarity index 100% rename from src/sql/parts/query/editor/media/queryEditor.css rename to src/sql/workbench/parts/query/browser/media/queryEditor.css diff --git a/src/sql/parts/query/editor/media/runWithoutDebug.svg b/src/sql/workbench/parts/query/browser/media/runWithoutDebug.svg similarity index 100% rename from src/sql/parts/query/editor/media/runWithoutDebug.svg rename to src/sql/workbench/parts/query/browser/media/runWithoutDebug.svg diff --git a/src/sql/parts/query/editor/media/sidebysideEditor.css b/src/sql/workbench/parts/query/browser/media/sidebysideEditor.css similarity index 100% rename from src/sql/parts/query/editor/media/sidebysideEditor.css rename to src/sql/workbench/parts/query/browser/media/sidebysideEditor.css diff --git a/src/sql/parts/query/editor/media/split-editor-horizontal-inverse.svg b/src/sql/workbench/parts/query/browser/media/split-editor-horizontal-inverse.svg similarity index 100% rename from src/sql/parts/query/editor/media/split-editor-horizontal-inverse.svg rename to src/sql/workbench/parts/query/browser/media/split-editor-horizontal-inverse.svg diff --git a/src/sql/parts/query/editor/media/split-editor-horizontal.svg b/src/sql/workbench/parts/query/browser/media/split-editor-horizontal.svg similarity index 100% rename from src/sql/parts/query/editor/media/split-editor-horizontal.svg rename to src/sql/workbench/parts/query/browser/media/split-editor-horizontal.svg diff --git a/src/sql/parts/query/editor/media/split-editor-vertical-inverse.svg b/src/sql/workbench/parts/query/browser/media/split-editor-vertical-inverse.svg similarity index 100% rename from src/sql/parts/query/editor/media/split-editor-vertical-inverse.svg rename to src/sql/workbench/parts/query/browser/media/split-editor-vertical-inverse.svg diff --git a/src/sql/parts/query/editor/media/split-editor-vertical.svg b/src/sql/workbench/parts/query/browser/media/split-editor-vertical.svg similarity index 100% rename from src/sql/parts/query/editor/media/split-editor-vertical.svg rename to src/sql/workbench/parts/query/browser/media/split-editor-vertical.svg diff --git a/src/sql/parts/query/editor/media/stackview-inverse.svg b/src/sql/workbench/parts/query/browser/media/stackview-inverse.svg similarity index 100% rename from src/sql/parts/query/editor/media/stackview-inverse.svg rename to src/sql/workbench/parts/query/browser/media/stackview-inverse.svg diff --git a/src/sql/parts/query/editor/media/stackview.svg b/src/sql/workbench/parts/query/browser/media/stackview.svg similarity index 100% rename from src/sql/parts/query/editor/media/stackview.svg rename to src/sql/workbench/parts/query/browser/media/stackview.svg diff --git a/src/sql/parts/query/editor/media/tabstitle.css b/src/sql/workbench/parts/query/browser/media/tabstitle.css similarity index 100% rename from src/sql/parts/query/editor/media/tabstitle.css rename to src/sql/workbench/parts/query/browser/media/tabstitle.css diff --git a/src/sql/parts/query/editor/media/textdiffeditor.css b/src/sql/workbench/parts/query/browser/media/textdiffeditor.css similarity index 100% rename from src/sql/parts/query/editor/media/textdiffeditor.css rename to src/sql/workbench/parts/query/browser/media/textdiffeditor.css diff --git a/src/sql/parts/query/editor/media/titlecontrol.css b/src/sql/workbench/parts/query/browser/media/titlecontrol.css similarity index 100% rename from src/sql/parts/query/editor/media/titlecontrol.css rename to src/sql/workbench/parts/query/browser/media/titlecontrol.css diff --git a/src/sql/parts/query/editor/messagePanel.ts b/src/sql/workbench/parts/query/browser/messagePanel.ts similarity index 99% rename from src/sql/parts/query/editor/messagePanel.ts rename to src/sql/workbench/parts/query/browser/messagePanel.ts index d44e463b2e..7facb93690 100644 --- a/src/sql/parts/query/editor/messagePanel.ts +++ b/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) ]; }, diff --git a/src/sql/parts/query/common/query.contribution.ts b/src/sql/workbench/parts/query/browser/query.contribution.ts similarity index 96% rename from src/sql/parts/query/common/query.contribution.ts rename to src/sql/workbench/parts/query/browser/query.contribution.ts index 90192d6bdf..5b8e2e4126 100644 --- a/src/sql/parts/query/common/query.contribution.ts +++ b/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 { QueryResultsEditor } from 'sql/parts/query/editor/queryResultsEditor'; -import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; -import * as queryContext from 'sql/parts/query/common/queryContext'; -import { QueryInput } from 'sql/parts/query/common/queryInput'; +import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor'; +import { QueryResultsEditor } from 'sql/workbench/parts/query/browser/queryResultsEditor'; +import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; +import * as queryContext from 'sql/workbench/parts/query/common/queryContext'; +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'; diff --git a/src/sql/parts/query/execution/queryActions.ts b/src/sql/workbench/parts/query/browser/queryActions.ts similarity index 99% rename from src/sql/parts/query/execution/queryActions.ts rename to src/sql/workbench/parts/query/browser/queryActions.ts index b857dab5d6..943d886539 100644 --- a/src/sql/parts/query/execution/queryActions.ts +++ b/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'; diff --git a/src/sql/parts/query/editor/queryEditor.ts b/src/sql/workbench/parts/query/browser/queryEditor.ts similarity index 98% rename from src/sql/parts/query/editor/queryEditor.ts rename to src/sql/workbench/parts/query/browser/queryEditor.ts index 26ee0d8e05..75bb2836e2 100644 --- a/src/sql/parts/query/editor/queryEditor.ts +++ b/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 { QueryInput } from 'sql/parts/query/common/queryInput'; -import { QueryResultsEditor } from 'sql/parts/query/editor/queryResultsEditor'; -import * as queryContext from 'sql/parts/query/common/queryContext'; +import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; +import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryResultsEditor } from 'sql/workbench/parts/query/browser/queryResultsEditor'; +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'; diff --git a/src/sql/parts/query/editor/queryResultsEditor.ts b/src/sql/workbench/parts/query/browser/queryResultsEditor.ts similarity index 97% rename from src/sql/parts/query/editor/queryResultsEditor.ts rename to src/sql/workbench/parts/query/browser/queryResultsEditor.ts index c2c85ec6bc..ae95b83fc2 100644 --- a/src/sql/parts/query/editor/queryResultsEditor.ts +++ b/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'; diff --git a/src/sql/parts/query/editor/queryResultsView.ts b/src/sql/workbench/parts/query/browser/queryResultsView.ts similarity index 97% rename from src/sql/parts/query/editor/queryResultsView.ts rename to src/sql/workbench/parts/query/browser/queryResultsView.ts index eab92ae507..bb54a1cebd 100644 --- a/src/sql/parts/query/editor/queryResultsView.ts +++ b/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 { ChartTab } from './charting/chartTab'; +import { GridPanel } from '../electron-browser/gridPanel'; +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'; diff --git a/src/sql/parts/query/execution/queryStatus.ts b/src/sql/workbench/parts/query/browser/queryStatus.ts similarity index 97% rename from src/sql/parts/query/execution/queryStatus.ts rename to src/sql/workbench/parts/query/browser/queryStatus.ts index ff44e8a3ca..a4785963e5 100644 --- a/src/sql/parts/query/execution/queryStatus.ts +++ b/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'; diff --git a/src/sql/parts/query/common/rowCountStatus.ts b/src/sql/workbench/parts/query/browser/rowCountStatus.ts similarity index 100% rename from src/sql/parts/query/common/rowCountStatus.ts rename to src/sql/workbench/parts/query/browser/rowCountStatus.ts diff --git a/src/sql/parts/query/common/timeElapsedStatus.ts b/src/sql/workbench/parts/query/browser/timeElapsedStatus.ts similarity index 100% rename from src/sql/parts/query/common/timeElapsedStatus.ts rename to src/sql/workbench/parts/query/browser/timeElapsedStatus.ts diff --git a/src/sql/parts/query/common/constants.ts b/src/sql/workbench/parts/query/common/constants.ts similarity index 100% rename from src/sql/parts/query/common/constants.ts rename to src/sql/workbench/parts/query/common/constants.ts diff --git a/src/sql/parts/query/common/localizedConstants.ts b/src/sql/workbench/parts/query/common/localizedConstants.ts similarity index 99% rename from src/sql/parts/query/common/localizedConstants.ts rename to src/sql/workbench/parts/query/common/localizedConstants.ts index 1cc2dfd422..d078132f9e 100644 --- a/src/sql/parts/query/common/localizedConstants.ts +++ b/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.'); - - diff --git a/src/sql/parts/query/common/queryContext.ts b/src/sql/workbench/parts/query/common/queryContext.ts similarity index 95% rename from src/sql/parts/query/common/queryContext.ts rename to src/sql/workbench/parts/query/common/queryContext.ts index bf0009eac3..974c91c32b 100644 --- a/src/sql/parts/query/common/queryContext.ts +++ b/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'; /** @@ -18,4 +16,4 @@ export const resultsMessagesFocussedId = 'resultsMessagesFocussed'; export const QueryEditorVisibleContext = new RawContextKey(queryEditorVisibleId, false); export const ResultsVisibleContext = new RawContextKey(resultsVisibleId, false); export const ResultsGridFocussedContext = new RawContextKey(resultsGridFocussedId, false); -export const ResultsMessagesFocussedContext = new RawContextKey(resultsMessagesFocussedId, false); \ No newline at end of file +export const ResultsMessagesFocussedContext = new RawContextKey(resultsMessagesFocussedId, false); diff --git a/src/sql/parts/query/common/queryInput.ts b/src/sql/workbench/parts/query/common/queryInput.ts similarity index 99% rename from src/sql/parts/query/common/queryInput.ts rename to src/sql/workbench/parts/query/common/queryInput.ts index d5ea518648..a0e8b43a8a 100644 --- a/src/sql/parts/query/common/queryInput.ts +++ b/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'; diff --git a/src/sql/parts/query/common/queryResultsInput.ts b/src/sql/workbench/parts/query/common/queryResultsInput.ts similarity index 94% rename from src/sql/parts/query/common/queryResultsInput.ts rename to src/sql/workbench/parts/query/common/queryResultsInput.ts index a2868cad0a..91869262a6 100644 --- a/src/sql/parts/query/common/queryResultsInput.ts +++ b/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 { MessagePanelState } from 'sql/parts/query/editor/messagePanel'; +import { GridPanelState } from 'sql/workbench/parts/query/electron-browser/gridPanel'; +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 { @@ -154,4 +152,4 @@ export class QueryResultsInput extends EditorInput { return this._uri; } -} \ No newline at end of file +} diff --git a/src/sql/parts/query/editor/resultsGridContribution.ts b/src/sql/workbench/parts/query/common/resultsGridContribution.ts similarity index 87% rename from src/sql/parts/query/editor/resultsGridContribution.ts rename to src/sql/workbench/parts/query/common/resultsGridContribution.ts index 7da60f5b78..16d4d4fb7d 100644 --- a/src/sql/parts/query/editor/resultsGridContribution.ts +++ b/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, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; +import { Extensions, IConfigurationRegistry, IConfigurationNode } 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 = Registry.as(Extensions.Configuration); diff --git a/src/sql/parts/query/editor/gridPanel.ts b/src/sql/workbench/parts/query/electron-browser/gridPanel.ts similarity index 99% rename from src/sql/parts/query/editor/gridPanel.ts rename to src/sql/workbench/parts/query/electron-browser/gridPanel.ts index e49682904b..b59f9b321a 100644 --- a/src/sql/parts/query/editor/gridPanel.ts +++ b/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; diff --git a/src/sql/parts/query/modelViewTab/media/dialogModal.css b/src/sql/workbench/parts/query/modelViewTab/media/dialogModal.css similarity index 100% rename from src/sql/parts/query/modelViewTab/media/dialogModal.css rename to src/sql/workbench/parts/query/modelViewTab/media/dialogModal.css diff --git a/src/sql/parts/query/modelViewTab/media/loading.svg b/src/sql/workbench/parts/query/modelViewTab/media/loading.svg similarity index 100% rename from src/sql/parts/query/modelViewTab/media/loading.svg rename to src/sql/workbench/parts/query/modelViewTab/media/loading.svg diff --git a/src/sql/parts/query/modelViewTab/media/loading_inverse.svg b/src/sql/workbench/parts/query/modelViewTab/media/loading_inverse.svg similarity index 100% rename from src/sql/parts/query/modelViewTab/media/loading_inverse.svg rename to src/sql/workbench/parts/query/modelViewTab/media/loading_inverse.svg diff --git a/src/sql/parts/query/modelViewTab/media/wizardNavigation.css b/src/sql/workbench/parts/query/modelViewTab/media/wizardNavigation.css similarity index 100% rename from src/sql/parts/query/modelViewTab/media/wizardNavigation.css rename to src/sql/workbench/parts/query/modelViewTab/media/wizardNavigation.css diff --git a/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts b/src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.module.ts similarity index 96% rename from src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts rename to src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.module.ts index c8afe4977b..24067b141b 100644 --- a/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts +++ b/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 => { diff --git a/src/sql/parts/query/modelViewTab/queryModelViewTab.ts b/src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.ts similarity index 88% rename from src/sql/parts/query/modelViewTab/queryModelViewTab.ts rename to src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.ts index 4470d9581b..b3530f9400 100644 --- a/src/sql/parts/query/modelViewTab/queryModelViewTab.ts +++ b/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) { diff --git a/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts b/src/sql/workbench/parts/query/modelViewTab/queryModelViewTabContainer.component.ts similarity index 97% rename from src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts rename to src/sql/workbench/parts/query/modelViewTab/queryModelViewTabContainer.component.ts index e71c2a21c0..a6ba8f4790 100644 --- a/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts +++ b/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(); public readonly onResize: Event = this._onResize.event; - private _dialogPane: DialogPane; public modelViewId: string; @ViewChild(ModelViewContent) private _modelViewContent: ModelViewContent; diff --git a/src/sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor.ts b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor.ts index e2428f48f3..fbfe5e07cf 100644 --- a/src/sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor.ts +++ b/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, - @IMetadataService private _metadataService: IMetadataService, - @IScriptingService private _scriptingService: IScriptingService, - @IQueryEditorService private _queryEditorService: IQueryEditorService, - @IStorageService private storageService: IStorageService + @IStorageService storageService: IStorageService ) { super(QueryPlanEditor.ID, telemetryService, themeService, storageService); } diff --git a/src/sql/workbench/services/notebook/sql/sqlSessionManager.ts b/src/sql/workbench/services/notebook/sql/sqlSessionManager.ts index cce7b4b5b1..6bc40db9b9 100644 --- a/src/sql/workbench/services/notebook/sql/sqlSessionManager.ts +++ b/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'; diff --git a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts index 7af425697b..9f246c33ff 100644 --- a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts +++ b/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 { QueryInput } from 'sql/parts/query/common/queryInput'; +import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; +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'; diff --git a/src/sqltest/parts/query/editor/queryActions.test.ts b/src/sqltest/parts/query/editor/queryActions.test.ts index 13078626c2..6aa7cb0a17 100644 --- a/src/sqltest/parts/query/editor/queryActions.test.ts +++ b/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'; -import { QueryInput } from 'sql/parts/query/common/queryInput'; -import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; +} from 'sql/workbench/parts/query/browser/queryActions'; +import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +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'; diff --git a/src/sqltest/parts/query/editor/queryEditor.test.ts b/src/sqltest/parts/query/editor/queryEditor.test.ts index 9ee4ec42da..e7b39517c1 100644 --- a/src/sqltest/parts/query/editor/queryEditor.test.ts +++ b/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 { QueryEditor } from 'sql/parts/query/editor/queryEditor'; +import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; +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'; diff --git a/src/sqltest/workbench/common/taskUtilities.test.ts b/src/sqltest/workbench/common/taskUtilities.test.ts index 58b958246f..7fb20729ce 100644 --- a/src/sqltest/workbench/common/taskUtilities.test.ts +++ b/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', () => { diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index 0344aa181b..7799444b15 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/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[]; diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 12cce49aa3..933fdfe712 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/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 diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts index 3151b9d913..48feb10216 100644 --- a/src/vs/workbench/common/editor/editorGroup.ts +++ b/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'; diff --git a/src/vs/workbench/contrib/files/browser/editors/fileEditorTracker.ts b/src/vs/workbench/contrib/files/browser/editors/fileEditorTracker.ts index 2daf9b3332..16896f2138 100644 --- a/src/vs/workbench/contrib/files/browser/editors/fileEditorTracker.ts +++ b/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 { diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 9bbfc4f5d1..e0f43d2a9d 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/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/parts/query/editor/resultsGridContribution'; +import 'sql/workbench/parts/query/browser/query.contribution'; +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';