Fix threading violation in project open processors

Author: jwren

CHANGELOG.md

@@ -11,7 +11,7 @@
 ### Fixed
 
 - Fixed crash when using 3rd party loggers that don't implement `setLevel`. (#8631)
-- Fixed "Slow operations are prohibited on EDT" by migrating `FlutterProjectOpenProcessor` to Kotlin and using `openProjectAsync`. (#8629)
+- Fixed `IllegalStateException` and "Slow operations are prohibited on EDT" when opening projects by migrating `FlutterProjectOpenProcessor` to Kotlin and using `openProjectAsync`. (#8629)
 
 ## 88.1.0
 

src/io/flutter/editor/FlutterStudioProjectOpenProcessor.kt

@@ -28,10 +28,8 @@ class FlutterStudioProjectOpenProcessor : FlutterProjectOpenProcessor() {
   override val name: String
     get() = "Flutter Studio"
 
-  override fun canOpenProject(file: VirtualFile): Boolean {
-    val root = PubRoot.forDirectory(file)
-    return root != null && root.declaresFlutter()
-  }
+  override fun canOpenProject(file: VirtualFile): Boolean =
+    PubRoot.forDirectory(file)?.declaresFlutter() == true
 
   /**
    * Replaces the deprecated `doOpenProject`.
@@ -57,16 +55,16 @@ class FlutterStudioProjectOpenProcessor : FlutterProjectOpenProcessor() {
       return newProject
     }
 
-    writeAction {
-      for (module in FlutterModuleUtils.getModules(newProject)) {
-        if (FlutterModuleUtils.declaresFlutter(module) && !FlutterModuleUtils.isFlutterModule(module)) {
+    for (module in FlutterModuleUtils.getModules(newProject)) {
+      if (FlutterModuleUtils.declaresFlutter(module) && !FlutterModuleUtils.isFlutterModule(module)) {
+        writeAction {
           FlutterModuleUtils.setFlutterModuleType(module)
-          FlutterModuleUtils.enableDartSDK(module)
         }
+        FlutterModuleUtils.enableDartSDK(module)
       }
-      newProject.save()
-      EditorNotifications.getInstance(newProject).updateAllNotifications()
     }
+    newProject.save()
+    EditorNotifications.getInstance(newProject).updateAllNotifications()
 
     return newProject
   }

src/io/flutter/project/FlutterProjectOpenProcessor.kt

@@ -67,9 +67,7 @@ open class FlutterProjectOpenProcessor : ProjectOpenProcessor() {
     if (project == null || project.isDisposed) return project
 
     // Convert any modules that use Flutter but don't have IntelliJ Flutter metadata.
-    writeAction {
-      convertToFlutterProject(project)
-    }
+    convertToFlutterProject(project)
 
     return project
   }

src/io/flutter/utils/FlutterModuleUtils.java

@@ -375,13 +375,14 @@ public static void setFlutterModuleType(@NotNull Module module) {
 
   public static void setFlutterModuleAndReload(@NotNull Module module, @NotNull Project project) {
     if (project.isDisposed()) return;
+    ApplicationManager.getApplication().invokeLater(() -> {
+      ApplicationManager.getApplication().runWriteAction(() -> setFlutterModuleType(module));
+      enableDartSDK(module);
+      project.save();
 
-    setFlutterModuleType(module);
-    enableDartSDK(module);
-    project.save();
-
-    EditorNotifications.getInstance(project).updateAllNotifications();
-    ProjectManager.getInstance().reloadProject(project);
+      EditorNotifications.getInstance(project).updateAllNotifications();
+      ProjectManager.getInstance().reloadProject(project);
+    });
   }
 
   public static void enableDartSDK(final @NotNull Module module) {