MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

new inference: don't add primitive equals bounds

Browse Source
This commit is contained in:
Anna Kozlova
2015-11-24 17:59:57 +01:00
parent 952a9be315
commit fc288cf04d
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,21 +73,23 @@ public class TypeEqualityConstraint implements ConstraintFormula {
}
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;
final boolean equal = Comparing.equal(myT, myS);
if (!equal) {
session.registerIncompatibleErrorMessage("Incompatible equality constraint: " + myT.getPresentableText() + " and " + myS.getPresentableText());
}
return equal;
}
if (myT == null || myT == PsiType.NULL) return false;
if (myS == null || myS == PsiType.NULL) return true; //todo raw type in StrictSubtypingConstraint.myS
InferenceVariable inferenceVariable = session.getInferenceVariable(myS);
if (inferenceVariable != null) {
if (inferenceVariable != null && !(myT instanceof PsiPrimitiveType)) {
inferenceVariable.addBound(myT, InferenceBound.EQ);
return true;
}
inferenceVariable = session.getInferenceVariable(myT);
if (inferenceVariable != null) {
if (inferenceVariable != null && !(myS instanceof PsiPrimitiveType)) {
inferenceVariable.addBound(myS, InferenceBound.EQ);
return true;
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/params/FormalParams.java
View File

@@ -32,6 +32,6 @@ class ReturnTypeCompatibility {
call((String i)->{ return i;});
call(i->{ return i;});
call(i->"");
call(<error descr="no instance(s) of type variable(s) exist so that Integer conforms to int">(int i)->{ return i;}</error>);
call(<error descr="no instance(s) of type variable(s) P exist so that P conforms to int">(int i)->{ return i;}</error>);
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/wildcardParametrization/PrimitiveParameterTypes.java
View File

@@ -1,6 +1,6 @@
class IDEA100385 {
void foo(N<Double> n){
n.forEach(<error descr="Incompatible parameter types in lambda expression: expected Double but found double">(double e)</error> -> { });
n.forEach(<error descr="Cannot infer functional interface type">(double e) -> { }</error>);
}
static interface N<E> {
void forEach(Consumer<? extends E> consumer);