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

revert

Browse Source
This commit is contained in:
anna
2013-03-27 19:49:33 +01:00
parent 7e4b7124e3
commit 59db69ca97
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
View File

@@ -708,7 +708,7 @@ public class TypeConversionUtil {
}
if (left instanceof PsiCapturedWildcardType) {
return left.equals(right) || isAssignable(((PsiCapturedWildcardType)left).getLowerBound(), right, false);
return left.equals(right) || isAssignable(((PsiCapturedWildcardType)left).getLowerBound(), right, allowUncheckedConversion);
}
if (right instanceof PsiCapturedWildcardType) {
return isAssignable(left, ((PsiCapturedWildcardType)right).getUpperBound(), allowUncheckedConversion);
@@ -897,7 +897,7 @@ public class TypeConversionUtil {
if (!leftClass.getManager().areElementsEquivalent(leftClass, rightClass)) {
if (!allowUncheckedConversion && PsiUtil.isRawSubstitutor(leftClass, leftSubstitutor) && !rightClass.hasTypeParameters() && !(rightClass instanceof PsiTypeParameter)) {
return PsiUtil.isRawSubstitutor(rightClass, rightSubstitutor);
return false;
}
rightSubstitutor = getSuperClassSubstitutor(leftClass, rightClass, rightSubstitutor);
rightClass = leftClass;