diff --git a/src/sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution.ts b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution.ts index a235876a61..5b1e8a7c26 100644 --- a/src/sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution.ts @@ -6,9 +6,9 @@ import 'vs/css!sql/media/actionBarLabel'; import 'vs/css!./media/dataExplorer.contribution'; import { localize } from 'vs/nls'; -import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet'; +import { ViewletRegistry, Extensions as ViewletExtensions } from 'vs/workbench/browser/viewlet'; import { Registry } from 'vs/platform/registry/common/platform'; -import { DataExplorerViewlet, DataExplorerViewletViewsContribution, OpenDataExplorerViewletAction, VIEWLET_ID } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet'; +import { DataExplorerViewletViewsContribution, OpenDataExplorerViewletAction, VIEWLET_ID } from 'sql/workbench/contrib/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'; @@ -17,16 +17,6 @@ import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { DataExplorerContainerExtensionHandler } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerExtensionPoint'; -// Data Explorer Viewlet -const viewletDescriptor = ViewletDescriptor.create( - DataExplorerViewlet, - VIEWLET_ID, - localize('workbench.dataExplorer', "Connections"), - 'dataExplorer', - 0 -); - -Registry.as(ViewletExtensions.Viewlets).registerViewlet(viewletDescriptor); Registry.as(ViewletExtensions.Viewlets).setDefaultViewletId(VIEWLET_ID); const workbenchRegistry = Registry.as(WorkbenchExtensions.Workbench); workbenchRegistry.registerWorkbenchContribution(DataExplorerViewletViewsContribution, LifecyclePhase.Starting); diff --git a/src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts index b65e123df1..afd7e27c8d 100644 --- a/src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts @@ -156,5 +156,6 @@ export const VIEW_CONTAINER = Registry.as(ViewContainer id: VIEWLET_ID, name: localize('dataexplorer.name', "Connections"), ctorDescriptor: new SyncDescriptor(DataExplorerViewPaneContainer), - icon: 'dataExplorer' + icon: 'dataExplorer', + order: 0 }, ViewContainerLocation.Sidebar);