MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-21 12:14:37 +07:00
Code Issues Packages Projects Releases Wiki Activity

local variables and recursion checks are more important for relevance than expected types in basic completion

Browse Source
This commit is contained in:
Peter Gromov
2009-09-17 21:03:01 +04:00
parent 17ddda9d15
commit 4b53ed7039
6 changed files with 115 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+3 -13
View File
@@ -680,7 +680,7 @@ public class JavaCompletionUtil {
}
@Nullable
public static PsiType getPsiType(final Object o) {
private static PsiType getPsiType(final Object o) {
if (o instanceof PsiVariable) {
return ((PsiVariable)o).getType();
}
@@ -768,28 +768,18 @@ public class JavaCompletionUtil {
@Nullable
public static PsiType getLookupElementType(final LookupElement element) {
PsiType qualifierType = null;
final TypedLookupItem typed = element.as(TypedLookupItem.class);
if (typed != null) {
return typed.getType();
}
final Object o = element.getObject();
if (o instanceof PsiVariable) {
qualifierType = ((PsiVariable)o).getType();
}
else if (o instanceof PsiMethod) {
qualifierType = ((PsiMethod)o).getReturnType();
}
else if (o instanceof PsiExpression) {
qualifierType = ((PsiExpression) o).getType();
}
final PsiType qualifierType = getPsiType(element.getObject());
final LookupItem lookupItem = element.as(LookupItem.class);
if (lookupItem != null) {
final PsiSubstitutor substitutor = (PsiSubstitutor)lookupItem.getAttribute(LookupItem.SUBSTITUTOR);
if (substitutor != null) {
qualifierType = substitutor.substitute(qualifierType);
return substitutor.substitute(qualifierType);
}
}
return qualifierType;