From 4caae243a1dbb9172bbb75531fed5bab53a34f5d Mon Sep 17 00:00:00 2001
From: Konstantin Nisht <konstantin.nisht@jetbrains.com>
Date: Fri, 31 Jan 2025 10:31:26 +0100
Subject: [PATCH] [threading] IJPL-155995: Run write action on EDT

(cherry picked from commit 691220608482abe5c7c96740fb2c481482817911)

IJ-CR-154083

GitOrigin-RevId: 984a65dc7d423087fbe942f6725389c4a41a972c
---
 plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
index 0e5afdd616b9..e6ab6aedf7f8 100644
--- a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
+++ b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
@@ -259,7 +259,9 @@ public final class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
       }
     }
 
-    ApplicationManager.getApplication().runWriteAction(() -> sdkModificator.commitChanges());
+    ApplicationManager.getApplication().invokeAndWait(() -> {
+      ApplicationManager.getApplication().runWriteAction(() -> sdkModificator.commitChanges());
+    });
     return result;
   }