diff --git a/src/sql/workbench/contrib/resourceViewer/browser/resourceViewer.contribution.ts b/src/sql/workbench/contrib/resourceViewer/browser/resourceViewer.contribution.ts index e63a4df169..fd85f62c17 100644 --- a/src/sql/workbench/contrib/resourceViewer/browser/resourceViewer.contribution.ts +++ b/src/sql/workbench/contrib/resourceViewer/browser/resourceViewer.contribution.ts @@ -12,16 +12,9 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { isString } from 'vs/base/common/types'; -import { IViewContainersRegistry, ViewContainerLocation, Extensions as ViewExtensions, IViewsRegistry } from 'vs/workbench/common/views'; -import { RESOURCE_VIEWER_VIEW_CONTAINER_ID, RESOURCE_VIEWER_VIEW_ID } from 'sql/workbench/contrib/resourceViewer/common/resourceViewer'; -import { localize } from 'vs/nls'; -import { Codicon } from 'vs/base/common/codicons'; -import { ResourceViewerViewlet } from 'sql/workbench/contrib/resourceViewer/browser/resourceViewerViewlet'; -import { ResourceViewerView } from 'sql/workbench/contrib/resourceViewer/browser/resourceViewerView'; -import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions'; +import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { ResourceViewResourcesExtensionHandler } from 'sql/workbench/contrib/resourceViewer/common/resourceViewerViewExtensionPoint'; -import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; CommandsRegistry.registerCommand({ id: 'resourceViewer.openResourceViewer', @@ -48,40 +41,39 @@ Registry.as(EditorExtensions.Editors) Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(ResourceViewResourcesExtensionHandler, LifecyclePhase.Ready); -class ResourceViewerContributor implements IWorkbenchContribution { - constructor( - @IExtensionService private readonly extensionService: IExtensionService - ) { - void this.checkForArc(); - } +// TODO: chgagnon disabling until the resource viewer is feature complete +// class ResourceViewerContributor implements IWorkbenchContribution { +// constructor( +// @IExtensionService private readonly extensionService: IExtensionService +// ) { +// this.checkForArc(); +// } - private async checkForArc(): Promise { - if (await this.extensionService.getExtension('Microsoft.arc')) { - registerResourceViewerContainer(); - } else { - const disposable = this.extensionService.onDidChangeExtensions(async () => { - if (await this.extensionService.getExtension('Microsoft.arc')) { - registerResourceViewerContainer(); - disposable.dispose(); - } - }); - } - } -} +// private async checkForArc(): Promise { +// if (await this.extensionService.getExtension('Microsoft.arc')) { +// registerResourceViewerContainer(); +// } else { +// const disposable = this.extensionService.onDidChangeExtensions(async () => { +// if (await this.extensionService.getExtension('Microsoft.arc')) { +// registerResourceViewerContainer(); +// disposable.dispose(); +// } +// }); +// } +// } +// } -Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(ResourceViewerContributor, LifecyclePhase.Ready); +// Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(ResourceViewerContributor, LifecyclePhase.Ready); -function registerResourceViewerContainer() { - const viewContainer = Registry.as(ViewExtensions.ViewContainersRegistry).registerViewContainer({ - id: RESOURCE_VIEWER_VIEW_CONTAINER_ID, - name: localize('resourceViewer', "Resource Viewer"), - ctorDescriptor: new SyncDescriptor(ResourceViewerViewlet), - icon: Codicon.database.classNames, - alwaysUseContainerInfo: true - }, ViewContainerLocation.Sidebar); - // registry.registerWorkbenchAction(SyncActionDescriptor.from(OpenDebugViewletAction, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_D }), 'View: Show Run and Debug', nls.localize('view', "View")); +// function registerResourceViewerContainer() { +// const viewContainer = Registry.as(ViewExtensions.ViewContainersRegistry).registerViewContainer({ +// id: RESOURCE_VIEWER_VIEW_CONTAINER_ID, +// name: localize('resourceViewer', "Resource Viewer"), +// ctorDescriptor: new SyncDescriptor(ResourceViewerViewlet), +// icon: Codicon.database.classNames, +// alwaysUseContainerInfo: true +// }, ViewContainerLocation.Sidebar); - // Register default debug views - const viewsRegistry = Registry.as(ViewExtensions.ViewsRegistry); - viewsRegistry.registerViews([{ id: RESOURCE_VIEWER_VIEW_ID, name: localize('resourceViewer', "Resource Viewer"), containerIcon: Codicon.database.classNames, ctorDescriptor: new SyncDescriptor(ResourceViewerView), canToggleVisibility: false, canMoveView: false }], viewContainer); -} +// const viewsRegistry = Registry.as(ViewExtensions.ViewsRegistry); +// viewsRegistry.registerViews([{ id: RESOURCE_VIEWER_VIEW_ID, name: localize('resourceViewer', "Resource Viewer"), containerIcon: Codicon.database.classNames, ctorDescriptor: new SyncDescriptor(ResourceViewerView), canToggleVisibility: false, canMoveView: false }], viewContainer); +// }