Fix exception when opening modal dialogues

jshiell · Feb 4, 2024 · 410e13e · 410e13e
1 parent 246f39e
commit 410e13e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 
-# CheckStyle-IDEA Changel
+# CheckStyle-IDEA Changelog
+
+* **5.87.0** Fixed: Exceptions when opening modal dialogues (#628).
 * **5.87.0** New: Now built against IDEA 2023.1.5 (was 2022.1.4).
 * **5.86.0** New: Added Checkstyle 10.13.0, 10.12.7.
 * **5.85.1** Fixed: EDT access error in commit dialogue (#626).

diff --git a/src/main/java/org/infernus/idea/checkstyle/ui/LocationDialogue.java b/src/main/java/org/infernus/idea/checkstyle/ui/LocationDialogue.java
@@ -24,6 +24,8 @@
 
 /**
  * Allows selection of the location of the CheckStyle file.
+ *
+ * TODO: migrate to DialogWrapper - https://plugins.jetbrains.com/docs/intellij/dialog-wrapper.html?from=jetbrains.org#input-validation
  */
 public class LocationDialogue extends JDialog {
 
@@ -166,7 +168,9 @@ public void setVisible(final boolean visible) {
         if (visible) {
             this.committed = false;
         }
-        super.setVisible(visible);
+        try (var token = com.intellij.concurrency.ThreadContext.resetThreadContext()) {
+            super.setVisible(visible);
+        }
     }
 
     /**

diff --git a/src/main/java/org/infernus/idea/checkstyle/ui/PropertiesDialogue.java b/src/main/java/org/infernus/idea/checkstyle/ui/PropertiesDialogue.java
@@ -16,6 +16,8 @@
 
 /**
  * Allows setting of file properties.
+ *
+ * TODO: migrate to DialogWrapper - https://plugins.jetbrains.com/docs/intellij/dialog-wrapper.html?from=jetbrains.org#input-validation
  */
 public class PropertiesDialogue extends JDialog {
     private final PropertiesPanel propertiesPanel;
@@ -83,7 +85,9 @@ public void setVisible(final boolean visible) {
         if (visible) {
             this.committed = false;
         }
-        super.setVisible(visible);
+        try (var token = com.intellij.concurrency.ThreadContext.resetThreadContext()) {
+            super.setVisible(visible);
+        }
     }
 
     /**

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -24,6 +24,7 @@
     <change-notes>
         <![CDATA[
 <ul>
+    <li>5.87.0: Fixed: Exceptions when opening modal dialogues (#628).</li>
     <li>5.87.0: New: Now built against IDEA 2023.1.5 (was 2022.1.4).</li>
     <li>5.86.0: New: Added Checkstyle 10.13.0, 10.12.7.</li>
     <li>5.85.1: Fixed: EDT access error in commit dialogue (#626).</li>