Added message when a file is disabled due to a FileNotFoundException (#…

…240).
jshiell · Jun 29, 2016 · 9de6eb7 · 9de6eb7
1 parent dd994fa
commit 9de6eb7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -165,6 +165,7 @@ This code is released under a BSD licence, as specified in the accompanying LICE
 
 ## Version History
 
+* **4.29.2** Fixed: If the rules file for a configuration is deleted, we continue to show errors. It will now be deactivated (#240). Thanks to Victor Alenkov.
 * **4.29.1** Fixed: Default property values should now be applied (#237).
 * **4.29.0** New: Updated to CheckStyle 6.19.
 * **4.29.0** Fixed: Optional suppression files should no longer generate errors (#231).

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ intellij {
 }
 
 sourceCompatibility = 1.8
-version = '4.29.1'
+version = '4.29.2'
 
 task wrapper(type: Wrapper) {
     gradleVersion = '2.13'

diff --git a/src/main/java/org/infernus/idea/checkstyle/CheckStyleInspection.java b/src/main/java/org/infernus/idea/checkstyle/CheckStyleInspection.java
@@ -29,7 +29,9 @@
 
 import static java.util.Collections.singletonList;
 import static java.util.Optional.ofNullable;
+import static org.infernus.idea.checkstyle.CheckStyleBundle.message;
 import static org.infernus.idea.checkstyle.util.Async.asyncResultOf;
+import static org.infernus.idea.checkstyle.util.Notifications.showWarning;
 
 public class CheckStyleInspection extends LocalInspectionTool {
 
@@ -97,10 +99,11 @@ public List<Problem> inspectFile(@NotNull final PsiFile psiFile,
             return NO_PROBLEMS_FOUND;
 
         } catch (CheckStylePluginException e) {
-            blacklist(configurationLocation);
             LOG.error("CheckStyle threw an exception when scanning: " + psiFile.getName(), e);
-            if (e.getCause() instanceof FileNotFoundException){
-                plugin.getConfiguration().setActiveConfiguration(null);
+            if (e.getCause() != null && e.getCause() instanceof FileNotFoundException) {
+                disableActiveConfiguration(plugin, manager.getProject());
+            } else {
+                blacklist(configurationLocation);
             }
             return NO_PROBLEMS_FOUND;
 
@@ -113,6 +116,11 @@ public List<Problem> inspectFile(@NotNull final PsiFile psiFile,
         }
     }
 
+    private void disableActiveConfiguration(final CheckStylePlugin plugin, final Project project) {
+        plugin.getConfiguration().setActiveConfiguration(null);
+        showWarning(project, message("checkstyle.configuration-disabled.error"));
+    }
+
     private void blacklist(final ConfigurationLocation configurationLocation) {
         if (configurationLocation != null) {
             configurationLocation.blacklist();

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -10,7 +10,7 @@
 </p>
         ]]>
     </description>
-    <version>4.29.1</version>
+    <version>4.29.2</version>
     <idea-version since-build="141.178"/>
     <vendor url="https://infernus.org/" email="james@infernus.org">James Shiell</vendor>
 
@@ -19,6 +19,7 @@
     <change-notes>
         <![CDATA[
 <ul>
+    <li>4.29.2: Fixed: If the rules file for a configuration is deleted, we continue to show errors. It will now be deactivated (#240). Thanks to Victor Alenkov.</li>
     <li>4.29.1: Fixed: Default property values should now be applied (#237).</li>
     <li>4.29.0: New: Updated to CheckStyle 6.19.</li>
     <li>4.29.0: Fixed: Optional suppression files should no longer generate errors (#231).</li>

diff --git a/src/main/resources/org/infernus/idea/checkstyle/CheckStyleBundle.properties b/src/main/resources/org/infernus/idea/checkstyle/CheckStyleBundle.properties
@@ -39,6 +39,7 @@ checkstyle.not-found.RegexpHeader=<html>The Checkstyle regexp header file<br>was
 checkstyle.not-found.ImportControl=<html>The Checkstyle import control file<br>was not found and will be ignored</html>
 checkstyle.not-found.Header=<html>The Checkstyle header file<br>was not found and will be ignored</html>
 checkstyle.file-not-found=<html>The Checkstyle rules file could not be read</html>
+checkstyle.configuration-disabled.error=<html>The current Checkstyle configuration has been disabled due to an error.</html>
 checkstyle.checker-failed=<html><b>The Checkstyle rules file could not be loaded.</b><br>{0}<br>The file has been blacklisted for 60s.</html>
 checkstyle.could-not-read-properties=<html>Properties could not be read from the Checkstyle configuration file</html>
 checkstyle.double-checked-locking=<html>The Checkstyle configuration file is not compatible with Checkstyle 5.6 or above.<br>Please remove the DoubleCheckingLocking check.</html>