From bf045ba4635640c7c9ff29b4e8da3b9e86c632dd Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 2 May 2017 18:11:04 +0200
Subject: [PATCH] EA-100814 - NPE: PreferByKindWeigher.isOnTopLevelInVoidMethod

---
 .../codeInsight/completion/PreferByKindWeigher.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java
index f088de126832..835a75501c5d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java
@@ -278,7 +278,7 @@ public class PreferByKindWeigher extends LookupElementWeigher {
     return psiElement().inside(PsiReferenceParameterList.class).accepts(position);
   }
 
-  private static boolean isOnTopLevelInVoidMethod(PsiStatement statement) {
+  private static boolean isOnTopLevelInVoidMethod(@NotNull PsiStatement statement) {
     if (!(statement.getParent() instanceof PsiCodeBlock)) return false;
 
     PsiElement parent = statement.getParent().getParent();
@@ -302,7 +302,10 @@ public class PreferByKindWeigher extends LookupElementWeigher {
   }
 
   private static boolean isLastStatement(PsiStatement statement) {
-    if (statement == null || !(statement.getParent() instanceof PsiCodeBlock)) {
+    if (statement == null) {
+      return false;
+    }
+    if (!(statement.getParent() instanceof PsiCodeBlock)) {
       return true;
     }
     PsiStatement[] siblings = ((PsiCodeBlock)statement.getParent()).getStatements();