azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring: removed logic of rendering 'expected type mismatch' error from constraint system

Browse Source
This commit is contained in:
Svetlana Isakova
2013-09-27 17:41:53 +04:00
parent af930012d5
commit 4666b0f50c
7 changed files with 88 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java
+4 -4
View File
@@ -23,9 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; import org.jetbrains.jet.lang.resolve.calls.inference.*;
import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemStatus;
import org.jetbrains.jet.lang.resolve.calls.inference.InferenceErrorData;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace;
import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
@@ -226,7 +224,9 @@ public class TracingStrategyImpl implements TracingStrategy {
JetType declaredReturnType = data.descriptor.getReturnType(); JetType declaredReturnType = data.descriptor.getReturnType();
if (declaredReturnType == null) return; if (declaredReturnType == null) return;
JetType substitutedReturnType = constraintSystem.getResultingSubstitutor().substitute(declaredReturnType, Variance.INVARIANT); ConstraintSystem systemWithoutExpectedTypeConstraint =
((ConstraintSystemImpl) constraintSystem).filterConstraintsOut(ConstraintPosition.EXPECTED_TYPE_POSITION);
JetType substitutedReturnType = systemWithoutExpectedTypeConstraint.getResultingSubstitutor().substitute(declaredReturnType, Variance.INVARIANT);
assert substitutedReturnType != null; //todo assert substitutedReturnType != null; //todo
assert !noExpectedType(data.expectedType) : "Expected type doesn't exist, but there is an expected type mismatch error"; assert !noExpectedType(data.expectedType) : "Expected type doesn't exist, but there is an expected type mismatch error";
core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
-3
View File
@@ -486,9 +486,6 @@ public class ConstraintSystemImpl implements ConstraintSystem {
@NotNull @NotNull
@Override @Override
public TypeSubstitutor getResultingSubstitutor() { public TypeSubstitutor getResultingSubstitutor() {
if (getStatus().hasOnlyExpectedTypeMismatch()) {
return filterConstraintsOut(EXPECTED_TYPE_POSITION).getResultingSubstitutor();
}
return resultingSubstitutor; return resultingSubstitutor;
} }
idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt
+11
View File
@@ -0,0 +1,11 @@
package s
fun <T> id(t: T): T = t
fun test(set: Set<Int>) {
val s: String = id(1)
val l: List<Int> = id(set)
val ss: Set<String> = id(set)
}
idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch1.html
+23
View File
@@ -0,0 +1,23 @@
<!-- typeInferenceExpectedTypeMismatch1 -->
<html>
Type inference failed. Expected type mismatch: <table>
<tr>
<td>
required: </td>
<td>
<b>
jet.String</b>
</td>
</tr>
<tr>
<td>
found: </td>
<td>
<font color=red>
<b>
jet.Int</b>
</font>
</td>
</tr>
</table>
</html>
idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html
+23
View File
@@ -0,0 +1,23 @@
<!-- typeInferenceExpectedTypeMismatch2 -->
<html>
Type inference failed. Expected type mismatch: <table>
<tr>
<td>
required: </td>
<td>
<b>
jet.List&lt;jet.Int&gt;</b>
</td>
</tr>
<tr>
<td>
found: </td>
<td>
<font color=red>
<b>
jet.Set&lt;jet.Int&gt;</b>
</font>
</td>
</tr>
</table>
</html>
idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html
+23
View File
@@ -0,0 +1,23 @@
<!-- typeInferenceExpectedTypeMismatch3 -->
<html>
Type inference failed. Expected type mismatch: <table>
<tr>
<td>
required: </td>
<td>
<b>
jet.Set&lt;jet.String&gt;</b>
</td>
</tr>
<tr>
<td>
found: </td>
<td>
<font color=red>
<b>
jet.Set&lt;jet.Int&gt;</b>
</font>
</td>
</tr>
</table>
</html>
idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTest.java
+4
View File
@@ -118,4 +118,8 @@ public class DiagnosticMessageTest extends JetLiteFixture {
doTest("numberValueTypes", 4, Errors.TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, Errors.TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH, doTest("numberValueTypes", 4, Errors.TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, Errors.TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH,
Errors.TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS); Errors.TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS);
} }
public void testTypeInferenceExpectedTypeMismatch() throws Exception {
doTest("typeInferenceExpectedTypeMismatch", 3, Errors.TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH);
}
} }