Minor. Apply 'Simplify if'

2016-05-18 12:27:27 +03:00
parent 88637ba336
commit 1a93c276f6
1 changed files with 3 additions and 5 deletions
@@ -607,16 +607,14 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
                context.trace.report(NOT_A_RETURN_LABEL.on(expression, expression.getLabelName()));
            }
        }
+
        if (returnedExpression != null) {
            facade.getTypeInfo(returnedExpression, context.replaceExpectedType(expectedType).replaceScope(context.scope)
                    .replaceContextDependency(INDEPENDENT));
        }
        else {
-            if (expectedType != null &&
-                !noExpectedType(expectedType) &&
-                !KotlinBuiltIns.isUnit(expectedType) &&
-                !isDontCarePlaceholder(expectedType)) // for lambda with implicit return type Unit
-            {
+            // for lambda with implicit return type Unit
+            if (!noExpectedType(expectedType) && !KotlinBuiltIns.isUnit(expectedType) && !isDontCarePlaceholder(expectedType)) {
                context.trace.report(RETURN_TYPE_MISMATCH.on(expression, expectedType));
            }
        }