No need to produce error types when RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED is reported

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java

@@ -522,18 +522,16 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
             SimpleFunctionDescriptor functionDescriptor = context.trace.get(FUNCTION, labelTargetElement);
             if (functionDescriptor != null) {
                 expectedType = DescriptorUtils.getFunctionExpectedReturnType(functionDescriptor, labelTargetElement);
-                boolean inLambdaWithNoExplicitType = expectedType == TypeUtils.NO_EXPECTED_TYPE;
+                if (functionDescriptor != containingFunctionDescriptor) {
-                if (inLambdaWithNoExplicitType) {
-                    // expectedType is NO_EXPECTED_TYPE iff the return type of the corresponding function descriptor is not computed yet
-                    // our temporary policy is to prohibit returns in this case. It mostly applies to local returns in lambdas
-                    context.trace.report(RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED.on(expression));
-                    resultType = ErrorUtils.createErrorType(RETURN_NOT_ALLOWED_MESSAGE);
-                }
-                else if (functionDescriptor != containingFunctionDescriptor) {
                     // Qualified, non-local
                     context.trace.report(RETURN_NOT_ALLOWED.on(expression));
                     resultType = ErrorUtils.createErrorType(RETURN_NOT_ALLOWED_MESSAGE);
                 }
+                else if (expectedType == TypeUtils.NO_EXPECTED_TYPE) {
+                    // expectedType is NO_EXPECTED_TYPE iff the return type of the corresponding function descriptor is not computed yet
+                    // our temporary policy is to prohibit returns in this case. It mostly applies to local returns in lambdas
+                    context.trace.report(RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED.on(expression));
+                }
             }
             else {
                 context.trace.report(NOT_A_RETURN_LABEL.on(expression, expression.getLabelName()));

compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.kt

@@ -1,8 +1,9 @@
 fun test2(a: Int) {
-    (run @f{
+    val x = run @f{
       if (a > 0) <!RETURN_NOT_ALLOWED!>return<!>
       <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f 1<!>
-    }): Int
+    }
+    x: Int
 }
 
 fun run<T>(f: () -> T): T { return f() }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.kt

@@ -1,5 +1,6 @@
 fun test2() {
-    (run @f{<!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f 1<!>}): Int
+    val x = run @f{<!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f 1<!>}
+    x: Int
 }
 
 fun run<T>(f: () -> T): T { return f() }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.kt

@@ -1,10 +1,12 @@
 fun test() {
-    run(@f{<!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f 1<!>}): Int
+    val x = run(@f{<!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f 1<!>})
+    x: Int
 }
 
 
 fun test1() {
-    run(@{<!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@ 1<!>}): Int
+    val x = run(@{<!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@ 1<!>})
+    x: Int
 }
 
 fun run<T>(f: () -> T): T { return f() }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.kt

@@ -1,11 +1,12 @@
 fun test() {
-    (run @f{
+    val x = run @f{
       fun local(a: Int): String {
         if (a > 0) return "2"
         return@local "3"
       }
       <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f 1<!>
-    }): Int
+    }
+    x: Int
 }
 
 fun run<T>(f: () -> T): T { return f() }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.kt

@@ -1,10 +1,11 @@
 fun test() {
-    (run @f{
+    val x = run @f{
       run @ff {
         <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@ff "2"<!>
       }
       <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f 1<!>
-    }): Int
+    }
+    x: Int
 }
 
 fun run<T>(f: () -> T): T { return f() }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.kt

@@ -1,8 +1,9 @@
 fun test(a: Int) {
-    (run @f{
+    val x = run @f{
       if (a > 0) <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f<!>
       else <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f Unit.VALUE<!>
-    }): Unit
+    }
+    x: Unit
 }
 
 fun run<T>(f: () -> T): T { return f() }

compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.kt

@@ -4,10 +4,11 @@ trait C: A
 
 
 fun test(a: C, b: B) {
-    (run @f{
+    val x = run @f{
       if (a != b) <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f a<!>
       b
-    }): A
+    }
+    x: A
 }
 
 fun run<T>(f: () -> T): T { return f() }