MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

ApproximateResolver: fixed superclass substitutor handling (IDEA-CR-44055)

Browse Source
This commit is contained in:
Tagir Valeev
2019-02-27 10:38:46 +07:00
parent 145a513d7b
commit 1586b90ba9
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-indexing-impl/src/com/intellij/psi/impl/java/FunExprOccurrence.java
View File

@@ -112,7 +112,7 @@ public class FunExprOccurrence {
if (i == referenceContext.size() - 1) {
return ContainerUtil.exists(candidates, m -> isCompatible(link, m, samClasses));
}
qualifiers = ApproximateResolver.getDefiniteSymbolTypes(candidates, Collections.emptySet());
qualifiers = ApproximateResolver.getDefiniteSymbolTypes(candidates, qualifiers != null ? qualifiers : Collections.emptySet());
if (qualifiers == null) return true;
}

21
java/java-indexing-impl/src/com/intellij/psi/impl/search/ApproximateResolver.java
View File

@@ -134,7 +134,7 @@ public class ApproximateResolver {
}
@Nullable
public static Set<PsiClass> getDefiniteSymbolTypes(@NotNull List<? extends PsiMember> candidates, Set<PsiClass> qualifierType) {
public static Set<PsiClass> getDefiniteSymbolTypes(@NotNull List<? extends PsiMember> candidates, @NotNull Set<PsiClass> qualifierType) {
Set<PsiClass> possibleTypes = new HashSet<>();
for (PsiMember candidate : candidates) {
if (candidate instanceof PsiClass) {
@@ -152,19 +152,26 @@ public class ApproximateResolver {
}
PsiClass typeClass = PsiUtil.resolveClassInClassTypeOnly(type);
if (typeClass == null || typeClass instanceof PsiTypeParameter) {
PsiClass qualifierClass = ContainerUtil.getOnlyItem(qualifierType);
if (typeClass == null) return null;
if (typeClass instanceof PsiTypeParameter) {
PsiClass containingClass = candidate.getContainingClass();
if (containingClass == null) return null;
typeClass = null;
// Sometimes we have Child extends Parent<Bar> and Parent<T> { T foo(); }
// In this case it's still desired to resolve that child.foo() returns Bar
if (qualifierClass != null && containingClass != null && containingClass != qualifierClass) {
// In this case it's still desired to resolve that child.foo() returns Bar
for (PsiClass qualifierClass : qualifierType) {
PsiSubstitutor substitutor =
TypeConversionUtil.getMaybeSuperClassSubstitutor(containingClass, qualifierClass, PsiSubstitutor.EMPTY);
if (substitutor != null) {
typeClass = PsiUtil.resolveClassInClassTypeOnly(type);
PsiClass substitutedTypeClass = PsiUtil.resolveClassInClassTypeOnly(substitutor.substitute(type));
if (substitutedTypeClass instanceof PsiTypeParameter || substitutedTypeClass == null ||
(typeClass != null && substitutedTypeClass != typeClass)) {
return null;
}
typeClass = substitutedTypeClass;
}
}
if (typeClass == null || typeClass instanceof PsiTypeParameter) {
if (typeClass == null) {
return null;
}
}