add null checks for constructor body

nnym · Feb 12, 2022 · 6c60c75 · 6c60c75
1 parent e866b9e
commit 6c60c75
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/idea/build.gradle b/idea/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id("org.jetbrains.intellij").version("latest.integration")
 }
 
-version("0.2.0")
+version("0.2.1")
 javaVersion(11)
 
 sourceSets {

diff --git a/idea/source/net/auoeke/uncheck/intellij/HighlightFilter.java b/idea/source/net/auoeke/uncheck/intellij/HighlightFilter.java
@@ -81,17 +81,16 @@ private static boolean matches(HighlightInfo info, String key, String... argumen
     }
 
     private static boolean initialized(PsiMethod constructor, PsiField field) {
-        return HighlightControlFlowUtil.variableDefinitelyAssignedIn(field, constructor.getBody()) || Stream.of(constructor.getBody().getChildren()).anyMatch(child -> {
-            if (child instanceof PsiExpressionStatement) {
-                var expression = ((PsiExpressionStatement) child).getExpression();
-
-                if (expression instanceof PsiMethodCallExpression) {
-                    return initialized(((PsiMethodCallExpression) expression).resolveMethod(), field);
-                }
-            }
+        var body = constructor.getBody();
 
+        if (body == null) {
             return false;
-        });
+        }
 
+        return HighlightControlFlowUtil.variableDefinitelyAssignedIn(field, body)
+               || Stream.of(body.getChildren())
+                   .filter(PsiExpressionStatement.class::isInstance)
+                   .map(statement -> ((PsiExpressionStatement) statement).getExpression())
+                   .anyMatch(expression -> expression instanceof PsiMethodCallExpression && initialized(((PsiMethodCallExpression) expression).resolveMethod(), field));
     }
 }