diff --git a/src/sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution.ts b/src/sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution.ts index 131505169b..0e2a73183c 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution.ts @@ -9,32 +9,13 @@ import { localize } from 'vs/nls'; import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, ShowViewletAction } from 'vs/workbench/browser/viewlet'; import { Registry } from 'vs/platform/registry/common/platform'; import { VIEWLET_ID } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerExtensionPoint'; -import { DataExplorerViewlet, DataExplorerViewletViewsContribution } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet'; +import { DataExplorerViewlet, DataExplorerViewletViewsContribution, OpenDataExplorerViewletAction } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; -import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; -import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; - -// Viewlet Action -export class OpenDataExplorerViewletAction extends ShowViewletAction { - public static ID = VIEWLET_ID; - public static LABEL = localize('showDataExplorer', "Show Connections"); - - constructor( - id: string, - label: string, - @IViewletService viewletService: IViewletService, - @IEditorGroupsService editorGroupService: IEditorGroupsService, - @IWorkbenchLayoutService layoutService: IWorkbenchLayoutService - ) { - super(id, label, VIEWLET_ID, viewletService, editorGroupService, layoutService); - } -} // Data Explorer Viewlet const viewletDescriptor = new ViewletDescriptor( @@ -88,4 +69,4 @@ configurationRegistry.registerConfiguration({ 'default': true } } -}); \ No newline at end of file +}); diff --git a/src/sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet.ts b/src/sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet.ts index 569717aa85..c6e251a5a9 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet.ts @@ -27,6 +27,24 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { Registry } from 'vs/platform/registry/common/platform'; import { IMenuService, MenuId } from 'vs/platform/actions/common/actions'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; +import { ShowViewletAction } from 'vs/workbench/browser/viewlet'; +import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; + +// Viewlet Action +export class OpenDataExplorerViewletAction extends ShowViewletAction { + public static ID = VIEWLET_ID; + public static LABEL = localize('showDataExplorer', "Show Connections"); + + constructor( + id: string, + label: string, + @IViewletService viewletService: IViewletService, + @IEditorGroupsService editorGroupService: IEditorGroupsService, + @IWorkbenchLayoutService layoutService: IWorkbenchLayoutService + ) { + super(id, label, VIEWLET_ID, viewletService, editorGroupService, layoutService); + } +} export class DataExplorerViewletViewsContribution implements IWorkbenchContribution { diff --git a/src/vs/workbench/contrib/watermark/browser/watermark.ts b/src/vs/workbench/contrib/watermark/browser/watermark.ts index b18168d511..311315b904 100644 --- a/src/vs/workbench/contrib/watermark/browser/watermark.ts +++ b/src/vs/workbench/contrib/watermark/browser/watermark.ts @@ -30,8 +30,8 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IDimension } from 'vs/platform/layout/browser/layoutService'; // {{SQL CARBON EDIT}} -import { OpenDataExplorerViewletAction } from 'sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution'; import { NewNotebookAction } from 'sql/workbench/parts/notebook/browser/notebookActions'; +import { OpenDataExplorerViewletAction } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet'; const $ = dom.$;