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

Minor. Apply 'Simplify if'

Browse Source
This commit is contained in:
Denis Zharkov
2016-05-18 12:27:27 +03:00
parent 88637ba336
commit 1a93c276f6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java
+3 -5
View File
@@ -607,16 +607,14 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
context.trace.report(NOT_A_RETURN_LABEL.on(expression, expression.getLabelName())); context.trace.report(NOT_A_RETURN_LABEL.on(expression, expression.getLabelName()));
} }
} }
if (returnedExpression != null) { if (returnedExpression != null) {
facade.getTypeInfo(returnedExpression, context.replaceExpectedType(expectedType).replaceScope(context.scope) facade.getTypeInfo(returnedExpression, context.replaceExpectedType(expectedType).replaceScope(context.scope)
.replaceContextDependency(INDEPENDENT)); .replaceContextDependency(INDEPENDENT));
} }
else { else {
if (expectedType != null && // for lambda with implicit return type Unit
!noExpectedType(expectedType) && if (!noExpectedType(expectedType) && !KotlinBuiltIns.isUnit(expectedType) && !isDontCarePlaceholder(expectedType)) {
!KotlinBuiltIns.isUnit(expectedType) &&
!isDontCarePlaceholder(expectedType)) // for lambda with implicit return type Unit
{
context.trace.report(RETURN_TYPE_MISMATCH.on(expression, expectedType)); context.trace.report(RETURN_TYPE_MISMATCH.on(expression, expectedType));
} }
} }