MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-100814 - NPE: PreferByKindWeigher.isOnTopLevelInVoidMethod

Browse Source
This commit is contained in:
peter
2017-05-02 20:30:58 +02:00
parent 51fb8f3443
commit bf045ba463
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java
+5 -2
View File
@@ -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();