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

new inference: strict subtyping constraint: null processing

Browse Source
This commit is contained in:
Anna Kozlova
2014-02-11 09:40:01 +01:00
parent 4889751ded
commit cb5a0b729b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java
+3 -4
View File
@@ -46,19 +46,18 @@ public class StrictSubtypingConstraint implements ConstraintFormula {
public boolean reduce(InferenceSession session, List<ConstraintFormula> constraints) {
if (session.isProperType(myS) && session.isProperType(myT)) {
if (myT == null) return myS == null || myS.equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
if (myS == null) return myT.equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
if (myS == null) return true;
return TypeConversionUtil.isAssignable(myT, myS);
}
if (PsiType.NULL.equals(myS)) return true;
if (PsiType.NULL.equals(myT)) return false;
if (PsiType.NULL.equals(myS) || myS == null) return true;
if (PsiType.NULL.equals(myT) || myT == null) return false;
InferenceVariable inferenceVariable = session.getInferenceVariable(myS);
if (inferenceVariable != null) {
inferenceVariable.addBound(myT, InferenceBound.UPPER);
return true;
}
if (PsiType.NULL.equals(myS) || myS == null) return true;
inferenceVariable = session.getInferenceVariable(myT);
if (inferenceVariable != null) {
inferenceVariable.addBound(myS, InferenceBound.LOWER);