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

Refactoring: noTypeCheckingErrorsInExpression introduced

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-01-28 16:45:39 +03:00
parent ed8ccdc15a
commit 0f1e6ba8be
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java
+9 -1
View File
@@ -448,7 +448,7 @@ public class ControlStructureTypingUtils {
KtExpression expression = (KtExpression) call.getCallElement(); KtExpression expression = (KtExpression) call.getCallElement();
if (status.hasOnlyErrorsDerivedFrom(EXPECTED_TYPE_POSITION) || status.hasConflictingConstraints() if (status.hasOnlyErrorsDerivedFrom(EXPECTED_TYPE_POSITION) || status.hasConflictingConstraints()
|| status.hasTypeInferenceIncorporationError()) { // todo after KT-... remove this line || status.hasTypeInferenceIncorporationError()) { // todo after KT-... remove this line
if (Boolean.TRUE != expression.accept(checkTypeVisitor, new CheckTypeContext(context.trace, data.expectedType))) { if (noTypeCheckingErrorsInExpression(expression, context.trace, data.expectedType)) {
KtExpression calleeExpression = call.getCalleeExpression(); KtExpression calleeExpression = call.getCalleeExpression();
if (calleeExpression instanceof KtWhenExpression || calleeExpression instanceof KtIfExpression) { if (calleeExpression instanceof KtWhenExpression || calleeExpression instanceof KtIfExpression) {
if (status.hasConflictingConstraints() || status.hasTypeInferenceIncorporationError()) { if (status.hasConflictingConstraints() || status.hasTypeInferenceIncorporationError()) {
@@ -463,6 +463,14 @@ public class ControlStructureTypingUtils {
logError("Expression: " + (parentDeclaration != null ? parentDeclaration.getText() : expression.getText()) + logError("Expression: " + (parentDeclaration != null ? parentDeclaration.getText() : expression.getText()) +
"\nConstraint system status: \n" + ConstraintsUtil.getDebugMessageForStatus(status)); "\nConstraint system status: \n" + ConstraintsUtil.getDebugMessageForStatus(status));
} }
private boolean noTypeCheckingErrorsInExpression(
KtExpression expression,
@NotNull BindingTrace trace,
@NotNull KotlinType expectedType
) {
return Boolean.TRUE != expression.accept(checkTypeVisitor, new CheckTypeContext(trace, expectedType));
}
}; };
} }