Merge pull request #10958 from srnagar/fix-cancel

Fix azd install cancel button

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/TerminalUtils.java

@@ -49,6 +49,16 @@ public static void executeInTerminal(@Nonnull Project project, @Nonnull String c
         }, AzureTask.Modality.ANY);
     }
 
+    public static void executeInTerminal(TerminalWidget terminalWidget, String command) {
+        AzureTaskManager.getInstance().runLater(() -> {
+            AzureTaskManager.getInstance().runInBackground(OperationBundle.description("boundary/common.execute_in_terminal.command", command), () -> {
+                terminalWidget.getTtyConnectorAccessor().executeWithTtyConnector((connector) -> {
+                    terminalWidget.sendCommandToExecute(command);
+                });
+            });
+        }, AzureTask.Modality.ANY);
+    }
+
     @Nonnull
     public static TerminalWidget createTerminalWidget(@Nonnull Project project, @Nullable Path workingDir, String terminalTabTitle) {
         final TerminalToolWindowManager manager = TerminalToolWindowManager.getInstance(project);
@@ -57,7 +67,7 @@ public static TerminalWidget createTerminalWidget(@Nonnull Project project, @Nul
     }
 
     @Nonnull
-    private static TerminalWidget getOrCreateTerminalWidget(@Nonnull Project project, @Nullable Path workingDir, String terminalTabTitle) {
+    public static TerminalWidget getOrCreateTerminalWidget(@Nonnull Project project, @Nullable Path workingDir, String terminalTabTitle) {
         final TerminalToolWindowManager manager = TerminalToolWindowManager.getInstance(project);
         final String workingDirectory = Optional.ofNullable(workingDir).map(Path::toString).orElse(null);
         return manager.getTerminalWidgets().stream()

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-service-explorer/src/main/java/com/microsoft/azure/toolkit/intellij/explorer/azd/AzdNode.java

@@ -55,13 +55,10 @@ public void addChildren() {
                 final String command;
                 if (System.getProperties().getProperty("os.name").toLowerCase().contains("windows")) {
                     command = "winget install microsoft.azd";
-                    TerminalUtils.executeInTerminal(project, "winget install microsoft.azd", "azd");
                 } else if (System.getProperties().getProperty("os.name").toLowerCase().contains("linux")) {
                     command = "curl -fsSL https://aka.ms/install-azd.sh | bash";
-                    TerminalUtils.executeInTerminal(project, "curl -fsSL https://aka.ms/install-azd.sh | bash", "azd");
                 } else {
                     command = "brew tap azure/azd && brew install azd";
-                    TerminalUtils.executeInTerminal(project, "brew tap azure/azd && brew install azd", "azd");
                 }
                 final ConfirmAndRunDialog installDialog = new ConfirmAndRunDialog(project, "Install azd", "Do you want to install Azure Developer CLI (azd)?", command);
                 installDialog.setOkButtonText("Install");

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-service-explorer/src/main/java/com/microsoft/azure/toolkit/intellij/explorer/azd/ConfirmAndRunDialog.java

@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.terminal.ui.TerminalWidget;
 import com.microsoft.azure.toolkit.intellij.common.TerminalUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -53,7 +54,8 @@ public void setOkButtonText(String okButtonText) {
     protected void doOKAction() {
         AzdUtils.logTelemetryEvent("azd-" + eventName + "-ok");
         super.doOKAction();
-        TerminalUtils.executeInTerminal(project, command, "azd");
+        final TerminalWidget azdTerminal = TerminalUtils.getOrCreateTerminalWidget(project, null, "azd");
+        TerminalUtils.executeInTerminal(azdTerminal, command);
     }
 
     @Override