Release 1.5.1

CHANGELOG.md

@@ -1,4 +1,6 @@
 # Changelog
+## 1.5.1
+* Fixed: Issue setting up Haxe SDK in intelliJ 2024.1
 ## 1.5.0
 * Improvement: Better type inferences
 * Improvement: Better resolve of TypeParameters (generics)

gradle.properties

@@ -7,7 +7,7 @@ pluginName = Haxe Toolkit Support
 pluginRepositoryUrl = https://github.com/HaxeFoundation/intellij-haxe
 
 # SemVer format -> https://semver.org
-pluginVersion = 1.5.0
+pluginVersion = 1.5.1
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 #platformType = IU

src/main/java/com/intellij/plugins/haxe/config/sdk/HaxeSdkType.java

@@ -85,18 +85,27 @@ public boolean isRootTypeApplicable(OrderRootType type) {
 
   @Override
   public void setupSdkPaths(Sdk sdk) {
-    final SdkModificator modificator = sdk.getSdkModificator();
+
+
 
     SdkAdditionalData data = sdk.getSdkAdditionalData();
     if (data == null) {
       data = HaxeSdkUtil.testHaxeSdk(sdk.getHomePath());
-      modificator.setSdkAdditionalData(data);
-    }
-
-    HaxeSdkUtil.setupSdkPaths(sdk.getHomeDirectory(), modificator);
 
-    modificator.commitChanges();
+    }
     super.setupSdkPaths(sdk);
+    writeSdkData(sdk, data);
+  }
+
+  private static void writeSdkData(Sdk sdk, SdkAdditionalData data) {
+      ApplicationManager.getApplication().runWriteAction(() -> {
+        if (data != null) {
+          final SdkModificator modificator = sdk.getSdkModificator();
+          modificator.setSdkAdditionalData(data);
+          HaxeSdkUtil.setupSdkPaths(sdk.getHomeDirectory(), modificator);
+          modificator.commitChanges();
+        }
+      });
   }
 
   @Override

src/main/java/com/intellij/plugins/haxe/haxelib/HaxelibSdkUtils.java

@@ -18,6 +18,7 @@
  */
 package com.intellij.plugins.haxe.haxelib;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
@@ -52,7 +53,9 @@ private static void tryToSetDefaultSdk() {
                                       sdkType,
                                       sdkType.suggestHomePath(),
                                       sdkType.getVersionString(sdkType.suggestHomePath()));
-      sdkType.setupSdkPaths(defaultSDK);
+      ApplicationManager.getApplication().invokeLaterOnWriteThread(() -> {
+        sdkType.setupSdkPaths(defaultSDK);
+      });
     }
   }
   static boolean myDefaultSdkErrorHasBeenLogged = false;

src/main/java/com/intellij/plugins/haxe/ide/actions/haxelib/SyncProjectLibraryListAction.java

@@ -89,4 +89,8 @@ private static Project getProject(AnActionEvent e) {
     return CommonDataKeys.PROJECT.getData(context);
   }
 
+  @Override
+  public @NotNull ActionUpdateThread getActionUpdateThread() {
+    return ActionUpdateThread.BGT;
+  }
 }

src/main/java/com/intellij/plugins/haxe/ide/actions/haxelib/loadproject/LoadProjectActionBase.java

@@ -57,4 +57,9 @@ private Project getProject(AnActionEvent e) {
     DataContext context = e.getDataContext();
     return CommonDataKeys.PROJECT.getData(context);
   }
+
+  @Override
+  public @NotNull ActionUpdateThread getActionUpdateThread() {
+    return ActionUpdateThread.BGT;
+  }
 }