Disable resource viewer (#12291)

* Disable resource viewer

* comment

* Remove unused
This commit is contained in:
Charles Gagnon
2020-09-15 07:31:49 -07:00
committed by GitHub
parent e75b3d69f6
commit 95b76f08f2

View File

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