Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.

- [Change Log](#change-log)
- [3.97.3](#3973)
- [3.97.2](#3972)
- [3.97.1](#3971)
- [3.97.0](#3970)
Expand Down Expand Up @@ -122,6 +123,9 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
- [3.0.7](#307)
- [3.0.6](#306)

## 3.97.3
- Rename GitHub Copilot app modernization to GitHub Copilot modernization.

## 3.97.2
### Fixed
- Fixed a known issue.
Expand Down
4 changes: 2 additions & 2 deletions PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>com.microsoft.azuretools</groupId>
<artifactId>utils</artifactId>
<version>3.97.2</version>
<version>3.97.3</version>
</parent>
<groupId>com.microsoft.azuretools</groupId>
<artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
Expand All @@ -39,7 +39,7 @@
</organization>

<properties>
<azuretool.version>3.97.2</azuretool.version>
<azuretool.version>3.97.3</azuretool.version>
<azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
<azure.toolkit-lib.version>0.52.2</azure.toolkit-lib.version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.PluginsAdvertiser;
import com.microsoft.azure.toolkit.intellij.appmod.utils.AppModUtils;
import com.microsoft.azure.toolkit.intellij.appmod.utils.Constants;
import lombok.extern.slf4j.Slf4j;

import javax.annotation.Nonnull;
Expand All @@ -28,7 +29,7 @@
public class AppModPluginInstaller {
private static final String PLUGIN_ID = "com.github.copilot.appmod";
private static final String COPILOT_PLUGIN_ID = "com.github.copilot";
public static final String TO_INSTALL_APP_MODE_PLUGIN = " (Install Github Copilot app modernization)";
public static final String TO_INSTALL_APP_MODE_PLUGIN = " (Install " + Constants.APPMOD_NAME + ")";
private AppModPluginInstaller() {
// Utility class - prevent instantiation
}
Expand Down Expand Up @@ -97,9 +98,7 @@ public static void showInstallConfirmation(@Nonnull Project project, boolean for
final String action = forUpgrade ? "upgrade" : "migration";
log.debug("[AppModPluginInstaller] showInstallConfirmation - forUpgrade: {}, copilotInstalled: {}", forUpgrade, copilotInstalled);

final String title = copilotInstalled
? "Install Github Copilot app modernization"
: "Install GitHub Copilot and app modernization";
final String title = "Install " + Constants.APPMOD_NAME;

final String message;
if (copilotInstalled) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.microsoft.azure.toolkit.intellij.appmod.utils.AppModPanelHelper;
import com.microsoft.azure.toolkit.intellij.appmod.utils.AppModUtils;
import com.microsoft.azure.toolkit.intellij.appmod.common.AppModPluginInstaller;
import com.microsoft.azure.toolkit.intellij.appmod.utils.Constants;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -154,16 +155,13 @@ public void update(@NotNull AnActionEvent e) {

switch (migrationState.state) {
case NOT_INSTALLED:
final boolean copilotInstalled = AppModPluginInstaller.isCopilotInstalled();
e.getPresentation().setText(copilotInstalled
? "Migrate to Azure (Install Github Copilot app modernization)"
: "Migrate to Azure (Install GitHub Copilot and app modernization)");
e.getPresentation().setText("Migrate to Azure (Install " + Constants.APPMOD_NAME + ")");
e.getPresentation().setPerformGroup(true);
e.getPresentation().putClientProperty(ActionUtil.SUPPRESS_SUBMENU, true);
break;
case LOADING:
case NO_OPTIONS:
e.getPresentation().setText("Migrate to Azure (Open GitHub Copilot app modernization)");
e.getPresentation().setText("Migrate to Azure (Open " + Constants.APPMOD_NAME + ")");
e.getPresentation().setPerformGroup(true);
e.getPresentation().putClientProperty(ActionUtil.SUPPRESS_SUBMENU, true);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@ private void showNotInstalled() {
log.debug("[MigrateToAzureNode] showNotInstalled - copilotInstalled: {}", copilotInstalled);

// Dynamic description based on what needs to be installed
final String description = copilotInstalled
? "Install Github Copilot app modernization"
: "Install GitHub Copilot and app modernization";
final String description = "Install " + Constants.APPMOD_NAME;
withDescription(description);

onClicked(e -> {
Expand Down Expand Up @@ -145,7 +143,7 @@ private List<Node<?>> buildChildNodes() {
clearClickHandlers();
if (nodeDataList.isEmpty()) {
log.debug("[MigrateToAzureNode] buildChildNodes - no migration options, setting click to open panel");
withDescription("Open GitHub Copilot app modernization");
withDescription("Open " + Constants.APPMOD_NAME);
onClicked(e -> {
log.info("[MigrateToAzureNode] Opening AppMod panel (no options)");
AppModPanelHelper.openAppModPanel(project, "node");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static void openAppModPanel(@Nonnull Project project, @Nonnull String sou
toolWindow.show();
} else {
AppModUtils.logTelemetryEvent(source + ".open-panel-failed");
AzureMessager.getMessager().warning("App Modernization Panel is not available. Please ensure the GitHub Copilot App Modernization plugin is installed and enabled.");
AzureMessager.getMessager().warning("Modernization Panel is not available. Please ensure the " + Constants.APPMOD_NAME + " plugin is installed and enabled.");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ public class Constants {

public static final String ICON_APPMOD_PATH = "/icons/appmod.svg";

public static final String APPMOD_NAME = "GitHub Copilot modernization";

}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
the security vulnerabilities in that specific dependency.
</p>
<p>
This action is available only for Maven pom.xml files and requires GitHub Copilot and GitHub Copilot app modernization to be installed.
This action is available only for Maven pom.xml files and requires GitHub Copilot modernization to be installed.
</p>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
the security vulnerabilities.
</p>
<p>
This action is available only for Maven pom.xml files and requires GitHub Copilot and Github Copilot app modernization to be installed.
This action is available only for Maven pom.xml files and requires GitHub Copilot modernization to be installed.
</p>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pluginVersion=3.97.2
pluginVersion=3.97.3
intellijDisplayVersion=2024.2
intellij_version=IU-242-EAP-SNAPSHOT
scala_plugin=org.intellij.scala:2024.2.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude">
<id>com.microsoft.tooling.msservices.intellij.azure</id>
<name>Azure Toolkit</name>
<version>3.97.2</version>
<version>3.97.3</version>
<vendor email="java@microsoft.com" url="http://www.microsoft.com">Microsoft</vendor>

<description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<!-- Version: 3.88.0 -->
# What's new in Azure Toolkit for IntelliJ

## 3.97.3
- Rename GitHub Copilot app modernization to GitHub Copilot modernization.

## 3.97.2
### Fixed
- Fixed a known issue.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,12 @@ protected void buildView(@Nonnull PresentationData presentation) {
presentation.setIcon(IntelliJAzureIcons.getIcon(Constants.ICON_APPMOD_PATH));

if (!AppModPluginInstaller.isAppModPluginInstalled()) {
final boolean copilotInstalled = AppModPluginInstaller.isCopilotInstalled();
final String text = copilotInstalled
? "Migrate to Azure (Install Github Copilot app modernization)"
: "Migrate to Azure (Install GitHub Copilot and app modernization)";
final String text = "Migrate to Azure (Install GitHub Copilot modernization)";
presentation.addText(text, com.intellij.ui.SimpleTextAttributes.REGULAR_ATTRIBUTES);
} else if (isMigrationNodesLoaded() && !hasMigrationOptions()) {
// Only show "Open..." if we've already loaded and found no options
presentation.addText("Migrate to Azure", com.intellij.ui.SimpleTextAttributes.REGULAR_ATTRIBUTES);
presentation.setLocationString("Open GitHub Copilot app modernization");
presentation.setLocationString("Open GitHub Copilot modernization");
} else {
// Default state or has options
presentation.addText("Migrate to Azure", com.intellij.ui.SimpleTextAttributes.REGULAR_ATTRIBUTES);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pluginVersion=3.97.2
pluginVersion=3.97.3
intellijDisplayVersion=2025.2
intellij_version=IU-2025.2
platformVersion=2025.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude">
<id>com.microsoft.tooling.msservices.intellij.azure</id>
<name>Azure Toolkit for IntelliJ</name>
<version>3.97.2</version>
<version>3.97.3</version>
<vendor email="java@microsoft.com" url="http://www.microsoft.com">Microsoft</vendor>

<description><![CDATA[
Expand All @@ -28,10 +28,9 @@
<change-notes>
<![CDATA[
<html>
<h2 id="3-97-2">3.97.2</h2>
<h3 id="fixed">Fixed</h3>
<h2 id="3-97-3">3.97.3</h2>
<ul>
<li>Fixed a known issue</li>
<li>Rename GitHub Copilot app modernization to GitHub Copilot modernization.</li>
</ul>
<p>You may get the full change log <a href="https://github.com/Microsoft/azure-tools-for-java/blob/develop/CHANGELOG.md">here</a></p>
</html>
Expand Down
2 changes: 1 addition & 1 deletion Utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.microsoft.azuretools</groupId>
<artifactId>utils</artifactId>
<version>3.97.2</version>
<version>3.97.3</version>
<packaging>pom</packaging>
<name>${project.artifactId}-${project.version}</name>
<properties>
Expand Down