Merge pull request #1692 from adamwojs/issue_1675

Fixed #1675: "AWT events are not allowed inside write action" exception while creating dialog window for resolving arguments ambiguity

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java

@@ -474,7 +474,7 @@ public static void fixServiceArgument(@NotNull Project project, @NotNull List<St
                 }
             }
 
-            callback.insert(items);
+            ApplicationManager.getApplication().runWriteAction(() -> callback.insert(items));
 
             return;
         }

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/ServiceArgumentGenerateAction.java

@@ -78,7 +78,7 @@ public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull Ps
 
             @Override
             public boolean startInWriteAction() {
-                return true;
+                return false;
             }
         };
     }

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/quickfix/AddServiceXmlArgumentLocalQuickFix.java

@@ -44,4 +44,8 @@ public void applyFix(final @NotNull Project project, @NotNull ProblemDescriptor
         ServiceActionUtil.fixServiceArgument(args, (XmlTag) parent);
     }
 
+    @Override
+    public boolean startInWriteAction() {
+        return false;
+    }
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java

@@ -1,5 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.action.ui;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.ui.ToolbarDecorator;
@@ -55,7 +56,7 @@ public void init() {
                 items.add(serviceParameter.getCurrentService());
             }
 
-            callback.onOk(items);
+            ApplicationManager.getApplication().runWriteAction(() -> callback.onOk(items));
 
             dispose();
         });

src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/XmlServiceArgumentIntention.java

@@ -89,4 +89,8 @@ public String getText() {
         return "Symfony: Add Arguments";
     }
 
+    @Override
+    public boolean startInWriteAction() {
+        return false;
+    }
 }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/quickfix/AddServiceXmlArgumentLocalQuickFixTest.java

@@ -0,0 +1,17 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.action.quickfix;
+
+import fr.adrienbrault.idea.symfony2plugin.action.quickfix.AddServiceXmlArgumentLocalQuickFix;
+import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
+
+import java.util.ArrayList;
+
+public class AddServiceXmlArgumentLocalQuickFixTest extends SymfonyLightCodeInsightFixtureTestCase {
+
+    public void testStartInWriteAction() {
+        var quickfix = new AddServiceXmlArgumentLocalQuickFix(new ArrayList<>());
+
+        // Prevents "AWT events are not allowed inside write action" exception
+        // while creating dialog window for resolving arguments ambiguity
+        assertFalse(quickfix.startInWriteAction());
+    }
+}

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/php/XmlServiceArgumentIntentionTest.java

@@ -0,0 +1,15 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.intentions.php;
+
+import fr.adrienbrault.idea.symfony2plugin.intentions.php.XmlServiceArgumentIntention;
+import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
+
+public class XmlServiceArgumentIntentionTest extends SymfonyLightCodeInsightFixtureTestCase {
+
+    public void testIntentionStartInReadThread() {
+        var intention = new XmlServiceArgumentIntention();
+
+        // Prevents "AWT events are not allowed inside write action" exception
+        // while creating dialog window for resolving arguments ambiguity
+        assertFalse(intention.startInWriteAction());
+    }
+}