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

new inference: provide diagnostics on failed inference (type compatibility constraints)

Browse Source
This commit is contained in:
Anna Kozlova
2015-11-23 16:08:53 +01:00
parent 061c17f976
commit 24bfcbcd27
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java
View File

@@ -39,7 +39,11 @@ public class TypeCompatibilityConstraint implements ConstraintFormula {
@Override
public boolean reduce(InferenceSession session, List<ConstraintFormula> constraints) {
if (session.isProperType(myT) && session.isProperType(myS)) {
return TypeConversionUtil.isAssignable(myT, myS);
final boolean assignable = TypeConversionUtil.isAssignable(myT, myS);
if (!assignable) {
session.registerIncompatibleErrorMessage("Incompatible types: " + myS.getPresentableText() + " is not convertible to " + myS.getPresentableText());
}
return assignable;
}
if (myS instanceof PsiPrimitiveType) {
final PsiClassType boxedType = ((PsiPrimitiveType)myS).getBoxedType(session.getManager(), session.getScope());

7
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java
View File

@@ -68,13 +68,18 @@ public class TypeEqualityConstraint implements ConstraintFormula {
}
if (myT instanceof PsiWildcardType || myS instanceof PsiWildcardType) {
session.registerIncompatibleErrorMessage("Incompatible equality constraint: " + myT.getPresentableText() + " and " + myS.getPresentableText());
return false;
}
if (session.isProperType(myT) && session.isProperType(myS)) {
if (myT == null || myT == PsiType.NULL) return myS == null || myS == PsiType.NULL || myS.equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
if (myS == null || myS == PsiType.NULL) return true;
return Comparing.equal(myT, myS);
final boolean equal = Comparing.equal(myT, myS);
if (!equal) {
session.registerIncompatibleErrorMessage("Incompatible equality constraint: " + myT.getPresentableText() + " and " + myS.getPresentableText());
}
return equal;
}
InferenceVariable inferenceVariable = session.getInferenceVariable(myS);
if (inferenceVariable != null) {