Expose TreeDataProviders in API

src/api/pickAppResource.ts

@@ -8,7 +8,7 @@ import { PickAppResourceOptions } from "@microsoft/vscode-azext-utils/hostapi";
 import { ext } from "../extensionVariables";
 
 export async function pickAppResource<T extends AzExtTreeItem>(context: ITreeItemPickerContext, options?: PickAppResourceOptions): Promise<T> {
-    return await compatibilityPickAppResourceExperience<T>(context, ext.v2.resourceGroupsTreeDataProvider, {
+    return await compatibilityPickAppResourceExperience<T>(context, ext.v2.applicationResourceTreeDataProvider, {
         resourceTypes: convertAppResourceFilterToAzExtResourceType(options?.filter),
         childItemFilter: convertExpectedChildContextValueToContextValueFilter(options?.expectedChildContextValue)
     });

src/api/v2/v2AzureResourcesApi.ts

@@ -179,6 +179,10 @@ export interface ResourcePickOptions {
  * The current (v2) Azure Resources extension API.
  */
 export interface V2AzureResourcesApi extends AzureResourcesApiBase {
+
+    applicationResourceTreeDataProvider: vscode.TreeDataProvider<unknown>;
+    workspaceResourceTreeDataProvider: vscode.TreeDataProvider<unknown>;
+
     /**
      * Reveals an item in the application/workspace resource tree
      * @param resourceId The ID of the resource to reveal.

src/api/v2/v2AzureResourcesApiImplementation.ts

@@ -5,7 +5,9 @@
 
 import * as vscode from 'vscode';
 import { ApplicationResourceBranchDataProviderManager } from '../../tree/v2/application/ApplicationResourceBranchDataProviderManager';
+import { ApplicationResourceTreeDataProvider } from '../../tree/v2/application/ApplicationResourceTreeDataProvider';
 import { WorkspaceResourceBranchDataProviderManager } from '../../tree/v2/workspace/WorkspaceResourceBranchDataProviderManager';
+import { WorkspaceResourceTreeDataProvider } from '../../tree/v2/workspace/WorkspaceResourceTreeDataProvider';
 import { ApplicationResourceProviderManager, WorkspaceResourceProviderManager } from './ResourceProviderManagers';
 import { ApplicationResource, ApplicationResourceProvider, BranchDataProvider, ResourceModelBase, V2AzureResourcesApi, WorkspaceResource, WorkspaceResourceProvider } from './v2AzureResourcesApi';
 
@@ -16,8 +18,10 @@ export class V2AzureResourcesApiImplementation implements V2AzureResourcesApi {
         private readonly applicationResourceProviderManager: ApplicationResourceProviderManager,
         private readonly applicationResourceBranchDataProviderManager: ApplicationResourceBranchDataProviderManager,
         private readonly workspaceResourceProviderManager: WorkspaceResourceProviderManager,
-        private readonly workspaceResourceBranchDataProviderManager: WorkspaceResourceBranchDataProviderManager) {
-    }
+        private readonly workspaceResourceBranchDataProviderManager: WorkspaceResourceBranchDataProviderManager,
+        public readonly applicationResourceTreeDataProvider: ApplicationResourceTreeDataProvider,
+        public readonly workspaceResourceTreeDataProvider: WorkspaceResourceTreeDataProvider,
+    ) { }
 
     get apiVersion(): string {
         return V2AzureResourcesApiImplementation.apiVersion;

src/api/v2/v2AzureResourcesApiWrapper.ts

@@ -17,6 +17,14 @@ export class V2AzureResourcesApiWrapper implements V2AzureResourcesApi {
         return this.api.apiVersion;
     }
 
+    get applicationResourceTreeDataProvider(): vscode.TreeDataProvider<unknown> {
+        return this.callWithTelemetryAndErrorHandlingSync('v2.getApplicationResourceTreeDataProvider', () => this.api.applicationResourceTreeDataProvider);
+    }
+
+    get workspaceResourceTreeDataProvider(): vscode.TreeDataProvider<unknown> {
+        return this.callWithTelemetryAndErrorHandlingSync('v2.getWorkspaceResourceTreeDataProvider', () => this.api.workspaceResourceTreeDataProvider);
+    }
+
     revealResource(resourceId: string): Promise<void> {
         return this.callWithTelemetryAndErrorHandling('v2.revealResource', async () => await this.api.revealResource(resourceId));
     }

src/extension.ts

@@ -33,8 +33,8 @@ import { GroupTreeItemBase } from './tree/GroupTreeItemBase';
 import { HelpTreeItem } from './tree/HelpTreeItem';
 import { ApplicationResourceBranchDataProviderManager } from './tree/v2/application/ApplicationResourceBranchDataProviderManager';
 import { DefaultApplicationResourceBranchDataProvider } from './tree/v2/application/DefaultApplicationResourceBranchDataProvider';
-import { registerResourceGroupsTreeV2 } from './tree/v2/application/registerResourceGroupsTreeV2';
-import { registerWorkspaceTreeV2 } from './tree/v2/workspace/registerWorkspaceTreeV2';
+import { registerApplicationTree } from './tree/v2/application/registerResourceGroupsTreeV2';
+import { registerWorkspaceTree } from './tree/v2/workspace/registerWorkspaceTreeV2';
 import { WorkspaceDefaultBranchDataProvider } from './tree/v2/workspace/WorkspaceDefaultBranchDataProvider';
 import { WorkspaceResourceBranchDataProviderManager } from './tree/v2/workspace/WorkspaceResourceBranchDataProviderManager';
 import { WorkspaceTreeItem } from './tree/WorkspaceTreeItem';
@@ -122,25 +122,28 @@ export async function activateInternal(context: vscode.ExtensionContext, perfSta
         type => void extensionManager.activateWorkspaceResourceBranchDataProvider(type));
     const workspaceResourceProviderManager = new WorkspaceResourceProviderManager(() => extensionManager.activateWorkspaceResourceProviders());
 
-    registerResourceGroupsTreeV2(
-        context,
+    const { applicationResourceTreeDataProvider } = registerApplicationTree(context, {
         branchDataProviderManager,
-        refreshEventEmitter.event,
-        resourceProviderManager);
+        resourceProviderManager,
+        refreshEvent: refreshEventEmitter.event,
+    });
 
-    registerWorkspaceTreeV2(
-        workspaceResourceBranchDataProviderManager,
-        context,
-        refreshWorkspaceEmitter.event,
-        workspaceResourceProviderManager);
+    const { workspaceResourceTreeDataProvider } = registerWorkspaceTree(context, {
+        branchDataProviderManager: workspaceResourceBranchDataProviderManager,
+        workspaceResourceProviderManager,
+        refreshEvent: refreshWorkspaceEmitter.event,
+    });
 
     const v2ApiFactory = () => {
         if (v2Api === undefined) {
             v2Api = new V2AzureResourcesApiImplementation(
                 resourceProviderManager,
                 branchDataProviderManager,
                 workspaceResourceProviderManager,
-                workspaceResourceBranchDataProviderManager);
+                workspaceResourceBranchDataProviderManager,
+                applicationResourceTreeDataProvider,
+                workspaceResourceTreeDataProvider
+            );
 
             context.subscriptions.push(v2Api.registerApplicationResourceProvider('TODO: is ID useful?', new DefaultApplicationResourceProvider()));
         }

src/extensionVariables.ts

@@ -51,6 +51,6 @@ export namespace ext {
 
     export namespace v2 {
         export let api: V2AzureResourcesApi;
-        export let resourceGroupsTreeDataProvider: TreeDataProvider<ResourceGroupsItem>;
+        export let applicationResourceTreeDataProvider: TreeDataProvider<ResourceGroupsItem>;
     }
 }

src/tree/v2/application/registerResourceGroupsTreeV2.ts

@@ -14,32 +14,44 @@ import { ApplicationResourceGroupingManager } from './ApplicationResourceGroupin
 import { ApplicationResourceTreeDataProvider } from './ApplicationResourceTreeDataProvider';
 import { createGroupingItemFactory } from './GroupingItem';
 
-export function registerResourceGroupsTreeV2(
-    context: vscode.ExtensionContext,
+interface RegisterApplicationTreeOptions {
     branchDataProviderManager: ApplicationResourceBranchDataProviderManager,
     refreshEvent: vscode.Event<void>,
-    resourceProviderManager: ApplicationResourceProviderManager): void {
+    resourceProviderManager: ApplicationResourceProviderManager
+}
+
+interface RegisterApplicationTreeResult {
+    applicationResourceTreeDataProvider: ApplicationResourceTreeDataProvider;
+}
+
+export function registerApplicationTree(context: vscode.ExtensionContext, options: RegisterApplicationTreeOptions): RegisterApplicationTreeResult {
+    const { branchDataProviderManager, resourceProviderManager, refreshEvent } = options;
+
     const itemCache = new ResourceGroupsItemCache();
     const branchDataItemFactory = createApplicationResourceBranchDataItemFactory(itemCache);
     const groupingItemFactory = createGroupingItemFactory(branchDataItemFactory, resource => branchDataProviderManager.getProvider(resource.azExtResourceType ?? resource.type.type));
     const resourceGroupingManager = new ApplicationResourceGroupingManager(groupingItemFactory);
 
     context.subscriptions.push(resourceGroupingManager);
 
-    const treeDataProvider = new ApplicationResourceTreeDataProvider(branchDataProviderManager.onDidChangeTreeData, itemCache, refreshEvent, resourceGroupingManager, resourceProviderManager);
-    ext.v2.resourceGroupsTreeDataProvider = treeDataProvider;
+    const applicationResourceTreeDataProvider = new ApplicationResourceTreeDataProvider(branchDataProviderManager.onDidChangeTreeData, itemCache, refreshEvent, resourceGroupingManager, resourceProviderManager);
+    ext.v2.applicationResourceTreeDataProvider = applicationResourceTreeDataProvider;
 
-    context.subscriptions.push(treeDataProvider);
+    context.subscriptions.push(applicationResourceTreeDataProvider);
 
     const treeView = vscode.window.createTreeView(
         'azureResourceGroupsV2',
         {
             canSelectMany: true,
             showCollapseAll: true,
-            treeDataProvider
+            treeDataProvider: applicationResourceTreeDataProvider
         });
 
     treeView.description = localize('remote', 'Remote');
 
     context.subscriptions.push(treeView);
+
+    return {
+        applicationResourceTreeDataProvider
+    }
 }

src/tree/v2/workspace/registerWorkspaceTreeV2.ts

@@ -9,27 +9,39 @@ import { localize } from './../../../utils/localize';
 import { WorkspaceResourceBranchDataProviderManager } from './WorkspaceResourceBranchDataProviderManager';
 import { WorkspaceResourceTreeDataProvider } from './WorkspaceResourceTreeDataProvider';
 
-export function registerWorkspaceTreeV2(
+interface RegisterWorkspaceTreeOptions {
     branchDataProviderManager: WorkspaceResourceBranchDataProviderManager,
-    context: vscode.ExtensionContext,
     refreshEvent: vscode.Event<void>,
-    workspaceResourceProviderManager: WorkspaceResourceProviderManager): void {
-    const treeDataProvider = new WorkspaceResourceTreeDataProvider(
+    workspaceResourceProviderManager: WorkspaceResourceProviderManager
+}
+
+interface RegisterWorkspaceTreeResult {
+    workspaceResourceTreeDataProvider: WorkspaceResourceTreeDataProvider;
+}
+
+export function registerWorkspaceTree(context: vscode.ExtensionContext, options: RegisterWorkspaceTreeOptions): RegisterWorkspaceTreeResult {
+    const { branchDataProviderManager, refreshEvent, workspaceResourceProviderManager } = options;
+
+    const workspaceResourceTreeDataProvider = new WorkspaceResourceTreeDataProvider(
         branchDataProviderManager,
         refreshEvent,
         workspaceResourceProviderManager);
 
-    context.subscriptions.push(treeDataProvider);
+    context.subscriptions.push(workspaceResourceTreeDataProvider);
 
     const treeView = vscode.window.createTreeView(
         'azureWorkspaceV2',
         {
             canSelectMany: true,
             showCollapseAll: true,
-            treeDataProvider
+            treeDataProvider: workspaceResourceTreeDataProvider
         });
 
     treeView.description = localize('local', 'Local');
 
     context.subscriptions.push(treeView);
+
+    return {
+        workspaceResourceTreeDataProvider
+    }
 }