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

java mad testing: avoid some invalid completion expectations

Browse Source
This commit is contained in:
peter
2017-09-18 10:35:07 +02:00
parent 1d75021c74
commit 7aa6fb5e22
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/java/propertyBased/JavaCompletionPolicy.java
+9 -1
View File
@@ -15,12 +15,14 @@
*/
package com.intellij.java.propertyBased;
import com.intellij.lang.ASTNode;
import com.intellij.lang.jvm.JvmModifier;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.testFramework.propertyBased.CompletionPolicy;
import com.siyeh.ig.psiutils.ExpressionUtils;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
@@ -56,7 +58,8 @@ class JavaCompletionPolicy extends CompletionPolicy {
private static boolean isAdoptedOrphanPsiAfterClassEnd(PsiElement element) {
PsiClass topmostClass = PsiTreeUtil.getTopmostParentOfType(element, PsiClass.class);
if (topmostClass != null) {
PsiElement rBrace = topmostClass.getRBrace();
ASTNode rBrace = topmostClass.getNode().findChildByType(JavaTokenType.RBRACE);
// not PsiClass#getRBrace, because we need the first one, and invalid classes can contain several '}'
if (rBrace != null && rBrace.getTextRange().getStartOffset() < element.getTextRange().getStartOffset()) return true;
}
return false;
@@ -77,6 +80,11 @@ class JavaCompletionPolicy extends CompletionPolicy {
// https://youtrack.jetbrains.com/issue/IDEA-174744 on red code
return false;
}
if (PsiTreeUtil.getParentOfType(ref, PsiAnnotation.class) != null) {
if (target instanceof PsiMethod || target instanceof PsiField && !ExpressionUtils.isConstant((PsiField)target)) {
return false; // red code;
}
}
if (isStaticWithInstanceQualifier(ref, target)) {
return false;
}