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

lambda: more specific check of return types should compare wildcards

Browse Source
This commit is contained in:
Anna Kozlova
2013-08-20 13:32:00 +04:00
parent dc0a552bf6
commit 40ba12739b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
+3 -3
View File
@@ -711,9 +711,9 @@ public class LambdaUtil {
}
}
final PsiClassType.ClassResolveResult r = PsiUtil.resolveGenericsClassInType(GenericsUtil.eliminateWildcards(returnType));
final PsiClassType.ClassResolveResult r = PsiUtil.resolveGenericsClassInType(returnType);
final PsiClass rClass = r.getElement();
final PsiClassType.ClassResolveResult r1 = PsiUtil.resolveGenericsClassInType(GenericsUtil.eliminateWildcards(returnType1));
final PsiClassType.ClassResolveResult r1 = PsiUtil.resolveGenericsClassInType(returnType1);
final PsiClass rClass1 = r1.getElement();
if (rClass != null && rClass1 != null) {
if (rClass == rClass1) {
@@ -761,7 +761,7 @@ public class LambdaUtil {
break;
}
typeKind = TypeKind.PRIMITIVE;
} else {
} else if (returnExprType != null) {
if (typeKind == TypeKind.PRIMITIVE) {
typeKind = TypeKind.NONE_DETERMINED;
break;