frontend bugs fixed:

fun f(): Int = "s" //was ok
  fun g(): Int { if (1 < 2) {} else {} }//was ok
  fun h(): Int { val a = 1 } //was ok

idea/testData/checker/FunctionReturnTypes.jet

@@ -23,8 +23,8 @@ fun foo(expr: StringBuilder): Int {
 
 
 fun unitShort() : Unit = ()
-fun unitShortConv() : Unit = 1
-fun unitShortNull() : Unit = null
+fun unitShortConv() : Unit = <error>1</error>
+fun unitShortNull() : Unit = <error>null</error>
 
 fun intEmpty() : Int <error>{}</error>
 fun intShortInfer() = 1
@@ -33,6 +33,9 @@ fun intShort() : Int = 1
 fun intBlock() : Int {return 1}
 fun intBlock() : Int {<error>1</error>}
 
+fun intString(): Int = <error>"s"</error>
+fun intFunctionLiteral(): Int = <error>{ 10 }</error>
+
 fun blockReturnUnitMismatch() : Int {<error>return</error>}
 fun blockReturnValueTypeMismatch() : Int {return <error>3.4</error>}
 fun blockReturnValueTypeMatch() : Int {return 1}
@@ -109,6 +112,22 @@ fun blockReturnValueTypeMatch() : Int {
     return 1
   else return <error>1.0</error>
 }
+fun blockNoReturnIfValDeclaration(): Int {
+  <error>val x = 1</error>
+}
+fun blockNoReturnIfEmptyIf(): Int {
+  if (1 < 2) <error>{}</error> else <error>{}</error>
+}
+fun blockNoReturnIfUnitInOneBranch(): Int {
+  if (1 < 2) {
+    return 1
+  } else {
+    if (3 < 4) <error>{
+    }</error> else {
+      return 2
+    }
+  }
+}
 
 val a = <error>return 1</error>
 

idea/testData/checker/regression/Jet121.jet

@@ -1,8 +1,8 @@
 namespace jet121 {
   fun box() : String {
     val answer = apply("OK") { String.() : Int =>
-      length
       get(0)
+      length
     }
 
     return if (answer == 2) "OK" else "FAIL"

idea/testData/checker/regression/Jet183.jet

@@ -17,6 +17,6 @@ enum class Foo<T> {
 
 
 
-fun box(): String {
+fun box() {
    val x: ProtocolState = ProtocolState.WAITING
 }