message: Refactor typings to make it easier in RGs
diff: * Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
  -import * as vscode from 'vscode';
  import type { Environment } from '@azure/ms-rest-azure-env';
  +import * as vscode from 'vscode';
  +import type { AzureExtensionApi } from './api';
  import type { Activity } from './hostapi';
  import type { AzExtResourceType, QuickPickWizardContext } from './index';
  -import type { AzureExtensionApi } from './api';
  /**
  * Represents the base type for all Azure and workspace resources.
  @@ -275,15 +275,14 @@ export type WorkspaceResourceBranchDataProvider<TModel extends WorkspaceResource
  // scope down vscode.TreeDataProvider to exactly what's allowed to be used
  type ResourceGroupsTreeDataProvider = Pick<vscode.TreeDataProvider<unknown>, 'getChildren' | 'getTreeItem'>;
  -export interface AzureResourcesHostApi {
  /**
  * The current (v2) Azure Resources extension API.
  */
  - resources: {
  +export interface AzureResourcesHostApi {
  /**
  * {@link vscode.TreeDataProvider} representing the Azure tree view.
  */
  - readonly azureResourcesTreeDataProvider: ResourceGroupsTreeDataProvider;
  + readonly azureResourceTreeDataProvider: ResourceGroupsTreeDataProvider;
  /**
  * Registers an Azure resource branch data provider.
  @@ -298,7 +297,7 @@ export interface AzureResourcesHostApi {
  /**
  * {@link vscode.TreeDataProvider} representing the Workspace tree view.
  */
  - readonly workspaceResourcesTreeDataProvider: ResourceGroupsTreeDataProvider;
  + readonly workspaceResourceTreeDataProvider: ResourceGroupsTreeDataProvider;
  /**
  * Registers a provider of workspace resources.
  @@ -318,11 +317,10 @@ export interface AzureResourcesHostApi {
  * @returns A disposable that unregisters the provider.
  */
  registerWorkspaceResourceBranchDataProvider<TModel extends WorkspaceResourceModel>(type: WorkspaceResourceType, provider: WorkspaceResourceBranchDataProvider<TModel>): vscode.Disposable;
  - }
  +
  }
  export interface ActivityApi {
  - activity: {
  /**
  * Registers an activity to appear in the activity window.
  *
  @@ -330,9 +328,15 @@ export interface ActivityApi {
  */
  registerActivity(activity: Activity): Promise<void>;
  }
  +
  +export interface AzureResourcesApi extends AzureExtensionApi {
  + activity: ActivityApi;
  + /**
  + * The current (v2) Azure Resources extension API.
  + */
  + resources: AzureResourcesHostApi;
  }
  -export type AzureResourcesApi = AzureResourcesHostApi & ActivityApi & AzureExtensionApi;
  export declare interface PickSubscriptionWizardContext extends QuickPickWizardContext {
  subscription?: AzureSubscription;
  }
  