Skip to content

Commit e26dfa3

Browse files
feat: pop-up on disabled extension
1 parent 9e8954b commit e26dfa3

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/upgrade/upgradeManager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Commands } from "../commands";
1111
import notificationManager from "./display/notificationManager";
1212
import { Settings } from "../settings";
1313
import assessmentManager from "./assessmentManager";
14-
import { checkOrInstallAppModExtension, checkOrPopupToInstallAppModExtension } from "./utility";
14+
import { checkOrInstallAppModExtensionForUpgrade, checkOrPopupToInstallAppModExtensionForModernization } from "./utility";
1515

1616
const DEFAULT_UPGRADE_PROMPT = "Upgrade Java project dependency to latest version.";
1717

@@ -26,14 +26,14 @@ class UpgradeManager {
2626

2727
// Upgrade project
2828
context.subscriptions.push(instrumentOperationAsVsCodeCommand(Commands.JAVA_UPGRADE_WITH_COPILOT, async (promptText?: string) => {
29-
await checkOrInstallAppModExtension(ExtensionName.APP_MODERNIZATION_UPGRADE_FOR_JAVA);
29+
await checkOrInstallAppModExtensionForUpgrade(ExtensionName.APP_MODERNIZATION_UPGRADE_FOR_JAVA);
3030
const promptToUse = promptText ?? DEFAULT_UPGRADE_PROMPT;
3131
await commands.executeCommand(Commands.GOTO_AGENT_MODE, { prompt: promptToUse });
3232
}));
3333

3434
// Show modernization view
3535
context.subscriptions.push(instrumentOperationAsVsCodeCommand(Commands.VIEW_MODERNIZE_JAVA_PROJECT, async () => {
36-
await checkOrPopupToInstallAppModExtension(
36+
await checkOrPopupToInstallAppModExtensionForModernization(
3737
ExtensionName.APP_MODERNIZATION_FOR_JAVA,
3838
`${ExtensionName.APP_MODERNIZATION_EXTENSION_NAME} extension is required to modernize Java projects. Would you like to install it and modernize this project?`,
3939
"Install Extension and Modernize");

src/upgrade/utility.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export function normalizePath(path: string): string {
7474
return Uri.parse(path).toString();
7575
}
7676

77-
async function checkOrPromptToEnableAppModExtension() {
77+
async function checkOrPromptToEnableAppModExtension(keyword: string) {
7878
if (extensions.getExtension(ExtensionName.APP_MODERNIZATION_FOR_JAVA)) {
7979
return;
8080
}
@@ -83,15 +83,16 @@ async function checkOrPromptToEnableAppModExtension() {
8383
await commands.executeCommand("workbench.extensions.search", ExtensionName.APP_MODERNIZATION_FOR_JAVA);
8484
const BTN_TEXT = "Show extension in sidebar";
8585
const choice2 = await window.showInformationMessage(
86-
`${ExtensionName.APP_MODERNIZATION_EXTENSION_NAME} extension is required for the feature but seems disabled. Please enable it manually and try again.`,
86+
`${ExtensionName.APP_MODERNIZATION_EXTENSION_NAME} extension is required to ${keyword} Java projects but it seems disabled. Please enable it manually and try again.`,
87+
{ modal: true },
8788
BTN_TEXT
8889
);
8990
if (choice2 === BTN_TEXT) {
9091
await commands.executeCommand("workbench.extensions.search", ExtensionName.APP_MODERNIZATION_FOR_JAVA);
9192
}
9293
}
9394

94-
export async function checkOrPopupToInstallAppModExtension(
95+
export async function checkOrPopupToInstallAppModExtensionForModernization(
9596
extensionIdToCheck: string,
9697
notificationText: string,
9798
buttonText: string): Promise<void> {
@@ -106,15 +107,15 @@ export async function checkOrPopupToInstallAppModExtension(
106107
return;
107108
}
108109

109-
await checkOrPromptToEnableAppModExtension();
110+
await checkOrPromptToEnableAppModExtension("modernize");
110111
}
111112

112-
export async function checkOrInstallAppModExtension(
113+
export async function checkOrInstallAppModExtensionForUpgrade(
113114
extensionIdToCheck: string): Promise<void> {
114115
if (extensions.getExtension(extensionIdToCheck)) {
115116
return;
116117
}
117118

118119
await commands.executeCommand("workbench.extensions.installExtension", ExtensionName.APP_MODERNIZATION_FOR_JAVA);
119-
await checkOrPromptToEnableAppModExtension();
120+
await checkOrPromptToEnableAppModExtension("upgrade");
120121
}

0 commit comments

Comments
 (0)