From 92fbfcdac91ef20ebd71f2b8aa6f6c60b3bec37d Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Wed, 3 Jul 2019 13:45:04 -0700 Subject: [PATCH] move edit data and query plan to their own files (#6256) --- .../editData/browser/editData.contribution.ts | 32 ++++++++++++++++ .../parts/query/browser/query.contribution.ts | 38 ------------------- .../queryPlan.contribution.ts | 21 ++++++++++ src/vs/workbench/workbench.main.ts | 9 +++++ 4 files changed, 62 insertions(+), 38 deletions(-) create mode 100644 src/sql/workbench/parts/editData/browser/editData.contribution.ts create mode 100644 src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.contribution.ts diff --git a/src/sql/workbench/parts/editData/browser/editData.contribution.ts b/src/sql/workbench/parts/editData/browser/editData.contribution.ts new file mode 100644 index 0000000000..542047c040 --- /dev/null +++ b/src/sql/workbench/parts/editData/browser/editData.contribution.ts @@ -0,0 +1,32 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor'; +import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput'; +import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor'; +import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput'; +import { EditorDescriptor, IEditorRegistry, Extensions } from 'vs/workbench/browser/editor'; +import { Registry } from 'vs/platform/registry/common/platform'; +import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; + +// Editor +const editDataEditorDescriptor = new EditorDescriptor( + EditDataEditor, + EditDataEditor.ID, + 'EditData' +); + +Registry.as(Extensions.Editors) + .registerEditor(editDataEditorDescriptor, [new SyncDescriptor(EditDataInput)]); + +// Editor +const editDataResultsEditorDescriptor = new EditorDescriptor( + EditDataResultsEditor, + EditDataResultsEditor.ID, + 'EditDataResults' +); + +Registry.as(Extensions.Editors) + .registerEditor(editDataResultsEditorDescriptor, [new SyncDescriptor(EditDataResultsInput)]); diff --git a/src/sql/workbench/parts/query/browser/query.contribution.ts b/src/sql/workbench/parts/query/browser/query.contribution.ts index bd1de3475b..d761bcb93e 100644 --- a/src/sql/workbench/parts/query/browser/query.contribution.ts +++ b/src/sql/workbench/parts/query/browser/query.contribution.ts @@ -21,20 +21,14 @@ import { QueryResultsEditor } from 'sql/workbench/parts/query/browser/queryResul 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/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/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'; const gridCommandsWeightBonus = 100; // give our commands a little bit more weight over other default list/tree commands @@ -62,37 +56,6 @@ const queryEditorDescriptor = new EditorDescriptor( Registry.as(EditorExtensions.Editors) .registerEditor(queryEditorDescriptor, [new SyncDescriptor(QueryInput)]); -// Query Plan editor registration - -const queryPlanEditorDescriptor = new EditorDescriptor( - QueryPlanEditor, - QueryPlanEditor.ID, - 'QueryPlan' -); - -Registry.as(EditorExtensions.Editors) - .registerEditor(queryPlanEditorDescriptor, [new SyncDescriptor(QueryPlanInput)]); - -// Editor -const editDataEditorDescriptor = new EditorDescriptor( - EditDataEditor, - EditDataEditor.ID, - 'EditData' -); - -Registry.as(EditorExtensions.Editors) - .registerEditor(editDataEditorDescriptor, [new SyncDescriptor(EditDataInput)]); - -// Editor -const editDataResultsEditorDescriptor = new EditorDescriptor( - EditDataResultsEditor, - EditDataResultsEditor.ID, - 'EditDataResults' -); - -Registry.as(EditorExtensions.Editors) - .registerEditor(editDataResultsEditorDescriptor, [new SyncDescriptor(EditDataResultsInput)]); - let actionRegistry = Registry.as(Extensions.WorkbenchActions); // Query Actions @@ -116,7 +79,6 @@ if (isMacintosh) { }); } - actionRegistry.registerWorkbenchAction( new SyncActionDescriptor( RunCurrentQueryKeyboardAction, diff --git a/src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.contribution.ts b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.contribution.ts new file mode 100644 index 0000000000..123884731f --- /dev/null +++ b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.contribution.ts @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { QueryPlanEditor } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor'; +import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; +import { EditorDescriptor, IEditorRegistry, Extensions } from 'vs/workbench/browser/editor'; +import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; +import { Registry } from 'vs/platform/registry/common/platform'; + +// Query Plan editor registration + +const queryPlanEditorDescriptor = new EditorDescriptor( + QueryPlanEditor, + QueryPlanEditor.ID, + 'QueryPlan' +); + +Registry.as(Extensions.Editors) + .registerEditor(queryPlanEditorDescriptor, [new SyncDescriptor(QueryPlanInput)]); diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 70b50ee76a..de94adc957 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -455,8 +455,17 @@ 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'; + +// query editor import 'sql/workbench/parts/query/browser/query.contribution'; import 'sql/workbench/parts/query/common/resultsGridContribution'; + +// edit data editor +import 'sql/workbench/parts/editData/browser/editData.contribution'; + +// query plan editor +import 'sql/workbench/parts/queryPlan/electron-browser/queryPlan.contribution'; + import 'sql/workbench/parts/profiler/browser/profiler.contribution'; import 'sql/workbench/parts/profiler/browser/profilerActions.contribution'; import 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution';