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

Fixed error reporting for special constructions (if, elvis)

Browse Source 
Track whether an error was reported for sub expressions (like 'if' branches) or it should be reported for the whole expression
 #KT-6189 Fixed
This commit is contained in:
Svetlana Isakova
2014-11-13 13:39:31 +03:00
parent 8109b1f997
commit 7f62675665
9 changed files with 201 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java
+38 -28
View File
@@ -20,6 +20,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -260,64 +261,73 @@ public class ControlStructureTypingUtils {
}
}
final JetVisitor<Void, CheckTypeContext> checkTypeVisitor = new JetVisitor<Void, CheckTypeContext>() {
private void checkExpressionType(@Nullable JetExpression expression, CheckTypeContext c) {
if (expression == null) return;
expression.accept(this, c);
final JetVisitor<Boolean, CheckTypeContext> checkTypeVisitor = new JetVisitor<Boolean, CheckTypeContext>() {
private boolean checkExpressionType(@NotNull JetExpression expression, CheckTypeContext c) {
JetTypeInfo typeInfo = BindingContextUtils.getRecordedTypeInfo(expression, c.trace.getBindingContext());
if (typeInfo == null) return false;
Ref<Boolean> hasError = Ref.create();
DataFlowUtils.checkType(typeInfo.getType(), expression, c.expectedType, typeInfo.getDataFlowInfo(), c.trace, hasError);
return hasError.get();
}
private boolean checkExpressionTypeRecursively(@Nullable JetExpression expression, CheckTypeContext c) {
if (expression == null) return false;
return expression.accept(this, c);
}
private boolean checkSubExpressions(
JetExpression firstSub, JetExpression secondSub, JetExpression expression,
CheckTypeContext firstContext, CheckTypeContext secondContext, CheckTypeContext context
) {
boolean errorWasReported = checkExpressionTypeRecursively(firstSub, firstContext);
errorWasReported |= checkExpressionTypeRecursively(secondSub, secondContext);
return errorWasReported || checkExpressionType(expression, context);
}
@Override
public Void visitIfExpression(@NotNull JetIfExpression ifExpression, CheckTypeContext c) {
public Boolean visitIfExpression(@NotNull JetIfExpression ifExpression, CheckTypeContext c) {
JetExpression thenBranch = ifExpression.getThen();
JetExpression elseBranch = ifExpression.getElse();
if (thenBranch == null || elseBranch == null) {
visitExpression(ifExpression, c);
return null;
return checkExpressionType(ifExpression, c);
}
checkExpressionType(thenBranch, c);
checkExpressionType(elseBranch, c);
return null;
return checkSubExpressions(thenBranch, elseBranch, ifExpression, c, c, c);
}
@Override
public Void visitBlockExpression(@NotNull JetBlockExpression expression, CheckTypeContext c) {
public Boolean visitBlockExpression(@NotNull JetBlockExpression expression, CheckTypeContext c) {
if (expression.getStatements().isEmpty()) {
visitExpression(expression, c);
return null;
return checkExpressionType(expression, c);
}
JetElement lastStatement = JetPsiUtil.getLastStatementInABlock(expression);
if (lastStatement instanceof JetExpression) {
checkExpressionType((JetExpression) lastStatement, c);
return checkExpressionTypeRecursively((JetExpression) lastStatement, c);
}
return null;
return false;
}
@Override
public Void visitPostfixExpression(@NotNull JetPostfixExpression expression, CheckTypeContext c) {
public Boolean visitPostfixExpression(@NotNull JetPostfixExpression expression, CheckTypeContext c) {
if (expression.getOperationReference().getReferencedNameElementType() == JetTokens.EXCLEXCL) {
checkExpressionType(expression.getBaseExpression(), c.makeTypeNullable());
return null;
return checkExpressionTypeRecursively(expression.getBaseExpression(), c.makeTypeNullable());
}
return super.visitPostfixExpression(expression, c);
}
@Override
public Void visitBinaryExpression(@NotNull JetBinaryExpression expression, CheckTypeContext c) {
public Boolean visitBinaryExpression(@NotNull JetBinaryExpression expression, CheckTypeContext c) {
if (expression.getOperationReference().getReferencedNameElementType() == JetTokens.ELVIS) {
checkExpressionType(expression.getLeft(), c.makeTypeNullable());
checkExpressionType(expression.getRight(), c);
return null;
return checkSubExpressions(expression.getLeft(), expression.getRight(), expression, c.makeTypeNullable(), c, c);
}
return super.visitBinaryExpression(expression, c);
}
@Override
public Void visitExpression(@NotNull JetExpression expression, CheckTypeContext c) {
JetTypeInfo typeInfo = BindingContextUtils.getRecordedTypeInfo(expression, c.trace.getBindingContext());
if (typeInfo != null) {
DataFlowUtils.checkType(typeInfo.getType(), expression, c.expectedType, typeInfo.getDataFlowInfo(), c.trace);
}
return null;
public Boolean visitExpression(@NotNull JetExpression expression, CheckTypeContext c) {
return checkExpressionType(expression, c);
}
};
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java
+18 -3
View File
@@ -160,9 +160,21 @@ public class DataFlowUtils {
}
@Nullable
public static JetType checkType(@Nullable final JetType expressionType, @NotNull JetExpression expressionToCheck,
@NotNull JetType expectedType, @NotNull final DataFlowInfo dataFlowInfo, @NotNull final BindingTrace trace
public static JetType checkType(
@Nullable JetType expressionType, @NotNull JetExpression expressionToCheck,
@NotNull JetType expectedType, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace
) {
return checkType(expressionType, expressionToCheck, expectedType, dataFlowInfo, trace, null);
}
@Nullable
public static JetType checkType(
@Nullable final JetType expressionType, @NotNull JetExpression expressionToCheck,
@NotNull JetType expectedType, @NotNull final DataFlowInfo dataFlowInfo, @NotNull final BindingTrace trace,
@Nullable Ref<Boolean> hasError
) {
if (hasError != null) hasError.set(false);
final JetExpression expression = JetPsiUtil.safeDeparenthesize(expressionToCheck, false);
recordExpectedType(trace, expression, expectedType);
@@ -209,7 +221,9 @@ public class DataFlowUtils {
if (value instanceof IntegerValueTypeConstant) {
value = EvaluatePackage.createCompileTimeConstantWithType((IntegerValueTypeConstant) value, expectedType);
}
new CompileTimeConstantChecker(trace, true).checkConstantExpressionType(value, (JetConstantExpression) expression, expectedType);
boolean error = new CompileTimeConstantChecker(trace, true)
.checkConstantExpressionType(value, (JetConstantExpression) expression, expectedType);
if (hasError != null) hasError.set(error);
return expressionType;
}
@@ -222,6 +236,7 @@ public class DataFlowUtils {
}
}
trace.report(TYPE_MISMATCH.on(expression, expectedType, expressionType));
if (hasError != null) hasError.set(true);
return expressionType;
}