Process exceptions from IDEA are now correctly rethrown during config…

… deserialisation (#578)
jshiell · Jun 17, 2022 · ae482e6 · ae482e6
1 parent f442e70
commit ae482e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 
 # CheckStyle-IDEA Changelog
 
+* **5.67.4** Fix: Process exceptions from IDEA are now correctly rethrown during config deserialisation (#578).
 * **5.67.3** Fix: Bundled configurations now have constant IDs when recreated or ported from earlier versions (#569).
 * **5.67.3** Fix: Bundled configurations are restored if absent.
 * **5.67.2** Fix: NPE in active modules configurations (#576).

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ repositories {
 //   Project Metadata
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-version = '5.67.3'
+version = '5.67.4'
 
 intellij {
     version = 'IC-2021.1.3'

diff --git a/src/main/java/org/infernus/idea/checkstyle/config/ProjectConfigurationState.java b/src/main/java/org/infernus/idea/checkstyle/config/ProjectConfigurationState.java
@@ -4,6 +4,7 @@
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.diagnostic.ControlFlowException;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.search.scope.packageSet.NamedScope;
@@ -200,6 +201,9 @@ private org.infernus.idea.checkstyle.model.ConfigurationLocation deserialiseLoca
                 configurationLocation.setProperties(Objects.requireNonNullElse(location.properties, new HashMap<>()));
                 return configurationLocation;
             } catch (Exception e) {
+                if (e instanceof ControlFlowException) {
+                    throw e;
+                }
                 LOG.error("Failed to deserialise " + location, e);
                 return null;
             }

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -15,7 +15,7 @@
 </p>
         ]]>
     </description>
-    <version>5.67.3</version>
+    <version>5.67.4</version>
     <idea-version since-build="211.7628.21"/>
     <vendor url="https://infernus.org/" email="[email protected]">Jamie Shiell</vendor>
 
@@ -24,6 +24,7 @@
     <change-notes>
         <![CDATA[
 <ul>
+    <li>5.67.4: Fix: Process exceptions from IDEA are now correctly rethrown during config deserialisation (#578).</li>
     <li>5.67.3: Fix: Bundled configurations now have constant IDs when recreated or ported from earlier versions (#569).</li>
     <li>5.67.3: Fix: Bundled configurations are restored if absent.</li>
     <li>5.67.2: Fix: NPE in active modules configurations (#576).</li>