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

method refs: ensure that qualifier type corresponds to ReferenceType for ReferenceType::Identifier

Browse Source
This commit is contained in:
Anna.Kozlova
2016-04-13 21:11:02 +02:00
parent 1a9c4c2f19
commit 3b46b4c3bf
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceUtil.java
+5 -10
View File
@@ -58,25 +58,20 @@ public class PsiMethodReferenceUtil {
@Nullable
public static PsiType getQualifierType(PsiMethodReferenceExpression expression) {
PsiType qualifierType = null;
final PsiTypeElement typeElement = expression.getQualifierType();
if (typeElement != null) {
qualifierType = typeElement.getType();
return typeElement.getType();
} else {
PsiType qualifierType = null;
final PsiElement qualifier = expression.getQualifier();
if (qualifier instanceof PsiExpression) {
qualifierType = ((PsiExpression)qualifier).getType();
}
}
if (qualifierType == null) {
final QualifierResolveResult qualifierResolveResult = getQualifierResolveResult(expression);
final PsiClass containingClass = qualifierResolveResult.getContainingClass();
if (containingClass == null) {
return null;
if (qualifierType == null && qualifier instanceof PsiReferenceExpression) {
return JavaPsiFacade.getElementFactory(expression.getProject()).createType((PsiReferenceExpression)qualifier);
}
qualifierType = JavaPsiFacade.getElementFactory(expression.getProject()).createType(containingClass);
return qualifierType;
}
return qualifierType;
}
public static boolean isReturnTypeCompatible(PsiMethodReferenceExpression expression,