Merge pull request #7664 from microsoft/hanli/fixes-202306

Fix thread issue when load env within before run tasks

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-facet/src/main/java/com/microsoft/azure/toolkit/intellij/facet/projectexplorer/AbstractAzureFacetNode.java

@@ -106,6 +106,10 @@ private void rerender(boolean updateStructure) { // `static` to make it availabl
             return;
         }
         final AbstractProjectViewPane pane = ProjectView.getInstance(this.getProject()).getCurrentProjectViewPane();
+        if (Objects.isNull(pane) || Objects.isNull(pane.getTree())) {
+            Disposer.dispose(this);
+            return;
+        }
         final AsyncTreeModel model = (AsyncTreeModel) pane.getTree().getModel();
         final DefaultMutableTreeNode node = TreeUtil.findNodeWithObject((DefaultMutableTreeNode) model.getRoot(), this);
         if (Objects.nonNull(node)) {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib-java/src/main/java/com/microsoft/azure/toolkit/intellij/connector/dotazure/DotEnvRunConfigurationExtension.java

@@ -6,6 +6,7 @@
 import com.intellij.execution.configurations.RunnerSettings;
 import com.microsoft.azure.toolkit.lib.common.messager.ExceptionNotification;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
+import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 
 import javax.annotation.Nonnull;
 
@@ -15,11 +16,11 @@ public class DotEnvRunConfigurationExtension extends RunConfigurationExtension {
     @ExceptionNotification
     @AzureOperation(name = "platform/connector.inject_env.config", params = {"config.getName()"})
     public <T extends RunConfigurationBase<?>> void updateJavaParameters(@Nonnull T config, @Nonnull JavaParameters params, RunnerSettings s) {
-        config.getBeforeRunTasks().stream()
-            .filter(t -> t instanceof DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask)
-            .map(t -> (DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask) t)
+        AzureTaskManager.getInstance().runLater(() -> config.getBeforeRunTasks().stream()
+                .filter(t -> t instanceof DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask)
+                .map(t -> (DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask) t)
                 .flatMap(t -> t.loadEnv().stream())
-                .forEach(p -> params.addEnv(p.getKey(), p.getValue()));
+                .forEach(p -> params.addEnv(p.getKey(), p.getValue())));
     }
 
     @Override