From 3b7fdf7f458ace0e49cd5bbd6798650627f18e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Tue, 4 Jun 2024 11:40:46 +0200
Subject: [PATCH] [devkit] IJPL-155995 DevKit plugin fails to add IntelliJ
 Platform SDK

GitOrigin-RevId: f935cd7784d238140cad8175fb57a2f3a704272f
---
 .../devkit-core/src/projectRoots/IdeaJdk.java     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
index 75ad25c98b4e..5bd2e6565b5f 100644
--- a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
+++ b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
@@ -227,12 +227,15 @@ public final class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
       }
 
       @NlsSafe String firstSdkName = javaSdks.get(0);
-      int choice = Messages.showChooseDialog(
-        DevKitBundle.message("sdk.select.java.sdk"),
-        DevKitBundle.message("sdk.select.java.sdk.title"),
-        ArrayUtilRt.toStringArray(javaSdks), firstSdkName, Messages.getQuestionIcon());
-      if (choice != -1) {
-        String name = javaSdks.get(choice);
+      Ref<Integer> choice = Ref.create();
+      ApplicationManager.getApplication().invokeAndWait(() -> {
+        choice.set(Messages.showChooseDialog(
+          DevKitBundle.message("sdk.select.java.sdk"),
+          DevKitBundle.message("sdk.select.java.sdk.title"),
+          ArrayUtilRt.toStringArray(javaSdks), firstSdkName, Messages.getQuestionIcon()));
+      });
+      if (choice.get() != -1) {
+        String name = javaSdks.get(choice.get());
         Sdk internalJava = Objects.requireNonNull(sdkModel.findSdk(name));
         //roots from internal jre
         setInternalJdk(sdk, sdkModificator, internalJava);