Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new getExtensionExports util #772

Merged
merged 2 commits into from
Dec 7, 2022
Merged

Use new getExtensionExports util #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd8a4ae
Update utils
alexweininger Dec 6, 2022
317ef21
Use new `getExtensionExports` util
alexweininger Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@
"@azure/ms-rest-js": "^2.2.1",
"@microsoft/vscode-azext-azureappservice": "^0.6.4",
"@microsoft/vscode-azext-azureutils": "^0.3.4",
"@microsoft/vscode-azext-utils": "^0.3.9",
"@microsoft/vscode-azext-utils": "^0.3.17",
"@octokit/rest": "^18.5.2",
"dayjs": "^1.11.0",
"git-url-parse": "^13.1.0",
Expand Down
5 changes: 2 additions & 3 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { registerAppServiceExtensionVariables } from '@microsoft/vscode-azext-azureappservice';
import { registerAzureUtilsExtensionVariables } from '@microsoft/vscode-azext-azureutils';
import { callWithTelemetryAndErrorHandling, createApiProvider, createAzExtOutputChannel, createExperimentationService, IActionContext, registerUIExtensionVariables } from '@microsoft/vscode-azext-utils';
import { callWithTelemetryAndErrorHandling, createApiProvider, createAzExtOutputChannel, createExperimentationService, getExtensionExports, IActionContext, registerUIExtensionVariables } from '@microsoft/vscode-azext-utils';
import { AzureExtensionApi, AzureExtensionApiProvider } from '@microsoft/vscode-azext-utils/api';
import { AzureHostExtensionApi } from '@microsoft/vscode-azext-utils/hostapi';
import * as vscode from 'vscode';
Expand All @@ -21,7 +21,6 @@ import { registerCommands } from './commands/registerCommands';
import { githubAuthProviderId, githubScopes, pwaChrome, shell, swa } from './constants';
import { StaticWebAppDebugProvider } from './debug/StaticWebAppDebugProvider';
import { ext } from './extensionVariables';
import { getApiExport } from './getExtensionApi';
import { StaticWebAppResolver } from './StaticWebAppResolver';

export async function activateInternal(context: vscode.ExtensionContext, perfStats: { loadStartTime: number; loadEndTime: number }, ignoreBundle?: boolean): Promise<AzureExtensionApiProvider> {
Expand Down Expand Up @@ -52,7 +51,7 @@ export async function activateInternal(context: vscode.ExtensionContext, perfSta
context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider(swa, new StaticWebAppDebugProvider(), vscode.DebugConfigurationProviderTriggerKind.Initial));
context.subscriptions.push(vscode.tasks.registerTaskProvider(shell, new SwaTaskProvider()));

const rgApiProvider = await getApiExport<AzureExtensionApiProvider>('ms-azuretools.vscode-azureresourcegroups');
const rgApiProvider = await getExtensionExports<AzureExtensionApiProvider>('ms-azuretools.vscode-azureresourcegroups');
if (rgApiProvider) {
const api = rgApiProvider.getApi<AzureHostExtensionApi>('0.0.1');
ext.rgApi = api;
Expand Down
21 changes: 4 additions & 17 deletions src/getExtensionApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { IActionContext, UserCancelledError } from "@microsoft/vscode-azext-utils";
import { getExtensionExports, IActionContext, UserCancelledError } from "@microsoft/vscode-azext-utils";
import { AzureExtensionApiProvider } from "@microsoft/vscode-azext-utils/api";
import { commands, Extension, extensions } from "vscode";
import { commands } from "vscode";
import { API, GitExtension } from "./git";
import { localize } from "./utils/localize";
import { getWorkspaceSetting } from "./utils/settingsUtils";
Expand All @@ -16,7 +16,7 @@ import { AzureFunctionsExtensionApi } from "./vscode-azurefunctions.api";
*/
export async function getFunctionsApi(context: IActionContext, installMessage?: string): Promise<AzureFunctionsExtensionApi> {
const funcExtensionId: string = 'ms-azuretools.vscode-azurefunctions';
const funcExtension: AzureExtensionApiProvider | undefined = await getApiExport(funcExtensionId);
const funcExtension: AzureExtensionApiProvider | undefined = await getExtensionExports(funcExtensionId);

if (funcExtension) {
return funcExtension.getApi<AzureFunctionsExtensionApi>('^1.7.0');
Expand All @@ -32,7 +32,7 @@ export async function getFunctionsApi(context: IActionContext, installMessage?:

export async function getGitApi(): Promise<API> {
try {
const gitExtension: GitExtension | undefined = await getApiExport('vscode.git');
const gitExtension: GitExtension | undefined = await getExtensionExports('vscode.git');
if (gitExtension) {
return gitExtension.getAPI(1);
} else {
Expand All @@ -47,16 +47,3 @@ export async function getGitApi(): Promise<API> {
}
}
}

export async function getApiExport<T>(extensionId: string): Promise<T | undefined> {
const extension: Extension<T> | undefined = extensions.getExtension(extensionId);
if (extension) {
if (!extension.isActive) {
await extension.activate();
}

return extension.exports;
}

return undefined;
}