Fix NPE when filtering tree results with no children

jshiell · Aug 18, 2024 · 649932d · 649932d
1 parent b9e8f5d
commit 649932d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 
 # CheckStyle-IDEA Changelog
 
+* **5.93.1** Fixed: NPE when filtering tree results with no children.
 * **5.93.0** New: Files in results are now hidden when all of their children aren't visible in the current filtering state (#644).
 * **5.92.0** New: Added CheckStyle 10.17.0.
 * **5.91.0** New: Added CheckStyle 10.16.0.

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
     id("org.infernus.idea.checkstyle.build")
 }
 
-version = "5.93.0"
+version = "5.93.1"
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/org/infernus/idea/checkstyle/toolwindow/ToggleableTreeNode.java b/src/main/java/org/infernus/idea/checkstyle/toolwindow/ToggleableTreeNode.java
@@ -1,8 +1,11 @@
 package org.infernus.idea.checkstyle.toolwindow;
 
+import org.jetbrains.annotations.NotNull;
+
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeNode;
 import java.io.Serial;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -30,14 +33,22 @@ public void setVisible(final boolean visible) {
         this.visible = visible;
     }
 
+    @NotNull
     List<ToggleableTreeNode> getAllChildren() {
-        return children.stream()
-                .map(child -> (ToggleableTreeNode) child)
-                .collect(Collectors.toList());
+        if (children != null) {
+            return children.stream()
+                    .map(child -> (ToggleableTreeNode) child)
+                    .collect(Collectors.toList());
+        }
+        return Collections.emptyList();
     }
 
     @Override
     public TreeNode getChildAt(final int index) {
+        if (children == null) {
+            throw new ArrayIndexOutOfBoundsException("Invalid index: " + index + " (no children)");
+        }
+
         int realIndex = -1;
         int visibleIndex = -1;
 

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -25,6 +25,7 @@
     <change-notes>
         <![CDATA[
 <ul>
+    <li>5.93.1: Fixed: NPE when filtering tree results with no children.</li>
     <li>5.93.0: New: Files in results are now hidden when all of their children aren't visible in the current filtering state (#644).</li>
     <li>5.92.0: New: Added CheckStyle 10.17.0.</li>
     <li>5.91.0: New: Added CheckStyle 10.16.0.</li>