Do not drop use of SAM-constructor when it's required for labeled return

2015-10-27 18:07:43 +03:00
parent 34298190b3
commit 2b3694a77e
6 changed files with 57 additions and 1 deletions
@@ -2,11 +2,21 @@ package redundantSamConstructor

 import a.*

-fun testNonApplicableAmbiguity() {
+fun testNonApplicableAmbiguity(p: Int) {
    GenericClassCantBeReplaced.staticFun1(JFunction0 { "" })
    GenericClassCantBeReplaced.staticFun2(JFunction0 { "" }, JFunction0 { "" })

    val klass = GenericClassCantBeReplaced()
    klass.memberFun1(JFunction0 { "" })
    klass.memberFun2(JFunction0 { "" }, JFunction0 { "" })
+
+    MyJavaClass.staticFun1(Runnable {
+        if (p > 0) return@Runnable
+        print(1)
+    })
+
+    MyJavaClass.staticFun2(Runnable { }, Runnable {
+        if (p > 0) return@Runnable
+        print(1)
+    })
 }