Support another one coroutine convention in front-end

- There will be no `coroutine` keyword for builders
- They accept a special suspend function type instead
  (it's return type is straightforward, not Continuation<Unit>)
- Instances of these types may be run with special built-in functions
- These built-ins functions are parametrized
  with handleResult/handleException/interceptResume, so these operators
  become unnecessary (and controllers too)

NB: `@Suspend` annotation is subject to replace with the `suspend` modifier
on types

compiler/testData/diagnostics/tests/coroutines/coroutineApplicability.kt

@@ -1,45 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -NOTHING_TO_INLINE
-class Controller
-
-class A(coroutine c: Controller.() -> Continuation<Unit>, y: Int) {
-    var x: String = ""
-        set(<!INAPPLICABLE_MODIFIER!>coroutine<!> x) {
-
-        }
-
-    constructor(coroutine c: Controller.() -> Continuation<Unit>) : this(c, 1)
-    constructor(<!INAPPLICABLE_MODIFIER!>coroutine<!> c: Controller.() -> Continuation<Nothing>, y: String) : <!NONE_APPLICABLE!>this<!>(c, 2)
-}
-
-fun valid(coroutine c: Controller.() -> Continuation<Unit>) {
-
-}
-
-fun noFunctionType(<!INAPPLICABLE_MODIFIER!>coroutine<!> c: Unit) {
-
-}
-
-fun noExtensionFunction(<!INAPPLICABLE_MODIFIER!>coroutine<!> c: (Controller) -> Continuation<Unit>) {
-
-}
-
-fun nullableReturnType(<!INAPPLICABLE_MODIFIER!>coroutine<!> c: Controller.() -> Continuation<Unit>?) {
-
-}
-
-fun wrongReturnType(<!INAPPLICABLE_MODIFIER!>coroutine<!> c: Controller.() -> Collection<Unit>) {
-
-}
-
-fun notUnitContinuation(<!INAPPLICABLE_MODIFIER!>coroutine<!> c: Controller.() -> Continuation<Int>) {
-
-}
-
-inline fun inlineBuilder(<!INAPPLICABLE_MODIFIER!>coroutine<!> c: Controller.() -> Continuation<Unit>) {
-
-}
-
-inline fun inlineBuilderNoInlineCoroutine(coroutine noinline c: Controller.() -> Continuation<Unit>) {
-
-}
-

compiler/testData/diagnostics/tests/coroutines/coroutineApplicability.txt

@@ -1,27 +0,0 @@
-package
-
-public inline fun inlineBuilder(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
-public inline fun inlineBuilderNoInlineCoroutine(/*0*/ noinline coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
-public fun noExtensionFunction(/*0*/ coroutine c: (Controller) -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
-public fun noFunctionType(/*0*/ coroutine c: kotlin.Unit): kotlin.Unit
-public fun notUnitContinuation(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Int>): kotlin.Unit
-public fun nullableReturnType(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>?): kotlin.Unit
-public fun valid(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
-public fun wrongReturnType(/*0*/ coroutine c: Controller.() -> kotlin.collections.Collection<kotlin.Unit>): kotlin.Unit
-
-public final class A {
-    public constructor A(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Nothing>, /*1*/ y: kotlin.String)
-    public constructor A(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>)
-    public constructor A(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>, /*1*/ y: kotlin.Int)
-    public final var x: kotlin.String
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Controller {
-    public constructor Controller()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}

compiler/testData/diagnostics/tests/coroutines/interceptResume.kt

@@ -1,38 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-class A1 {
-    operator fun interceptResume(x: () -> Unit) {}
-}
-
-<!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun A1.interceptResume(x: () -> Unit) {}
-
-class A2 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun interceptResume(x: () -> Unit, w: Int) {}
-}
-
-class A3 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun interceptResume(x: String.() -> Unit) = 1
-}
-
-class A4 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun interceptResume(x: (String) -> Unit) {}
-}
-
-class A5 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun interceptResume(x: () -> Int) {}
-}
-
-class A6 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun <T> interceptResume(x: () -> Unit) {}
-}
-
-class A7 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun interceptResume(x: () -> Unit = {}) {}
-}
-
-class A8 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun interceptResume(vararg x: () -> Unit) {}
-}
-
-class A9 {
-    inline operator fun interceptResume(x: () -> Unit) {}
-}

compiler/testData/diagnostics/tests/coroutines/interceptResume.txt

@@ -1,75 +0,0 @@
-package
-
-public operator fun A1.interceptResume(/*0*/ x: () -> kotlin.Unit): kotlin.Unit
-
-public final class A1 {
-    public constructor A1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun interceptResume(/*0*/ x: () -> kotlin.Unit): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A2 {
-    public constructor A2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun interceptResume(/*0*/ x: () -> kotlin.Unit, /*1*/ w: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A3 {
-    public constructor A3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun interceptResume(/*0*/ x: kotlin.String.() -> kotlin.Unit): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A4 {
-    public constructor A4()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun interceptResume(/*0*/ x: (kotlin.String) -> kotlin.Unit): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A5 {
-    public constructor A5()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun interceptResume(/*0*/ x: () -> kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A6 {
-    public constructor A6()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun </*0*/ T> interceptResume(/*0*/ x: () -> kotlin.Unit): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A7 {
-    public constructor A7()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun interceptResume(/*0*/ x: () -> kotlin.Unit = ...): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A8 {
-    public constructor A8()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun interceptResume(/*0*/ vararg x: () -> kotlin.Unit /*kotlin.Array<out () -> kotlin.Unit>*/): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A9 {
-    public constructor A9()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator inline fun interceptResume(/*0*/ x: () -> kotlin.Unit): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}

compiler/testData/diagnostics/tests/coroutines/irrelevantSuspendDeclarations.kt

@@ -8,7 +8,7 @@ class A {
     suspend fun suspendHere(a: Int) = 1
 }
 
-fun builder(coroutine c: Controller.() -> Continuation<Unit>) {}
+fun builder(c: @Suspend() (Controller.() -> Unit)) {}
 
 fun test() {
     builder {

compiler/testData/diagnostics/tests/coroutines/irrelevantSuspendDeclarations.txt

@@ -1,6 +1,6 @@
 package
 
-public fun builder(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
+public fun builder(/*0*/ c: @kotlin.coroutines.Suspend() (Controller.() -> kotlin.Unit)): kotlin.Unit
 public fun test(): kotlin.Unit
 
 public final class A {

compiler/testData/diagnostics/tests/coroutines/lambdaExpectedType.kt

@@ -1,56 +1,43 @@
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_VARIABLE
-class IntController {
-    operator fun handleResult(x: Int, c: Continuation<Nothing>) { }
-}
 
-class GenericController<T> {
-    operator fun handleResult(x: T, c: Continuation<Nothing>) { }
-}
-
-class UnitController {
-    operator fun handleResult(x: Unit, c: Continuation<Nothing>) { }
-}
-
-class EmptyController
-
-fun builder(coroutine c: IntController.() -> Continuation<Unit>) = 1
-fun <T> genericBuilder(coroutine c: GenericController<T>.() -> Continuation<Unit>): T = null!!
-fun unitBuilder(coroutine c: UnitController.() -> Continuation<Unit>) = 1
-fun emptyBuilder(coroutine c: EmptyController.() -> Continuation<Unit>) = 1
+fun builder(c: @Suspend() (() -> Int)) = 1
+fun <T> genericBuilder(c: @Suspend() (() -> T)): T = null!!
+fun unitBuilder(c: @Suspend() (() -> Unit)) = 1
+fun emptyBuilder(c: @Suspend() (() -> Unit)) = 1
 
 fun <T> manyArgumentsBuilder(
-        coroutine c1: UnitController.() -> Continuation<Unit>,
-        coroutine c2: GenericController<T>.() -> Continuation<Unit>,
-        coroutine c3: IntController.() -> Continuation<Unit>
+        c1: @Suspend() (() -> Unit),
+        c2: @Suspend() (() -> T),
+        c3: @Suspend() (() -> Int)
 ):T = null!!
 
-fun severalParamsInLambda(coroutine c: UnitController.(String, Int) -> Continuation<Unit>) {}
+fun severalParamsInLambda(c: @Suspend() ((String, Int) -> Unit)) {}
 
 fun foo() {
     builder({ 1 })
     builder { 1 }
 
     val x = { 1 }
-    builder(<!TYPE_MISMATCH!>x<!>)
-    builder(<!UNCHECKED_CAST!>{1} as (IntController.() -> Continuation<Unit>)<!>)
+    builder(x)
+    builder({1} <!USELESS_CAST!>as (@Suspend() (() -> Int))<!>)
 
     var i: Int = 1
     i = genericBuilder({ 1 })
     i = genericBuilder { 1 }
-    <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>genericBuilder<!> { 1 }
+    genericBuilder { 1 }
     genericBuilder<Int> { 1 }
     genericBuilder<Int> { <!TYPE_MISMATCH!>""<!> }
 
     val y = { 1 }
-    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>genericBuilder<!>(<!TYPE_MISMATCH!>y<!>)
+    genericBuilder(y)
 
     unitBuilder {}
     unitBuilder { <!UNUSED_EXPRESSION!>1<!> }
     unitBuilder({})
     unitBuilder({ <!UNUSED_EXPRESSION!>1<!> })
 
-    <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>manyArgumentsBuilder<!>({}, { "" }) { 1 }
+    manyArgumentsBuilder({}, { "" }) { 1 }
 
     val s: String = manyArgumentsBuilder({}, { "" }) { 1 }
 

compiler/testData/diagnostics/tests/coroutines/lambdaExpectedType.txt

@@ -1,40 +1,9 @@
 package
 
-public fun builder(/*0*/ coroutine c: IntController.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Int
-public fun emptyBuilder(/*0*/ coroutine c: EmptyController.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Int
+public fun builder(/*0*/ c: @kotlin.coroutines.Suspend () -> kotlin.Int): kotlin.Int
+public fun emptyBuilder(/*0*/ c: @kotlin.coroutines.Suspend () -> kotlin.Unit): kotlin.Int
 public fun foo(): kotlin.Unit
-public fun </*0*/ T> genericBuilder(/*0*/ coroutine c: GenericController<T>.() -> kotlin.coroutines.Continuation<kotlin.Unit>): T
-public fun </*0*/ T> manyArgumentsBuilder(/*0*/ coroutine c1: UnitController.() -> kotlin.coroutines.Continuation<kotlin.Unit>, /*1*/ coroutine c2: GenericController<T>.() -> kotlin.coroutines.Continuation<kotlin.Unit>, /*2*/ coroutine c3: IntController.() -> kotlin.coroutines.Continuation<kotlin.Unit>): T
-public fun severalParamsInLambda(/*0*/ coroutine c: UnitController.(kotlin.String, kotlin.Int) -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
-public fun unitBuilder(/*0*/ coroutine c: UnitController.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Int
-
-public final class EmptyController {
-    public constructor EmptyController()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class GenericController</*0*/ T> {
-    public constructor GenericController</*0*/ T>()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: T, /*1*/ c: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class IntController {
-    public constructor IntController()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: kotlin.Int, /*1*/ c: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class UnitController {
-    public constructor UnitController()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: kotlin.Unit, /*1*/ c: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
+public fun </*0*/ T> genericBuilder(/*0*/ c: @kotlin.coroutines.Suspend () -> T): T
+public fun </*0*/ T> manyArgumentsBuilder(/*0*/ c1: @kotlin.coroutines.Suspend () -> kotlin.Unit, /*1*/ c2: @kotlin.coroutines.Suspend () -> T, /*2*/ c3: @kotlin.coroutines.Suspend () -> kotlin.Int): T
+public fun severalParamsInLambda(/*0*/ c: @kotlin.coroutines.Suspend (kotlin.String, kotlin.Int) -> kotlin.Unit): kotlin.Unit
+public fun unitBuilder(/*0*/ c: @kotlin.coroutines.Suspend () -> kotlin.Unit): kotlin.Int

compiler/testData/diagnostics/tests/coroutines/manyHandleResults.kt

@@ -1,16 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-interface A {
-    operator fun handleResult(x: Int, y: Continuation<Nothing>) {}
-}
-
-interface B {
-    operator fun handleResult(x: String, y: Continuation<Nothing>) {}
-}
-
-class C : A, B {
-    // multiple handleResults
-}
-
-fun builder1(coroutine c: A.() -> Continuation<Unit>) {}
-fun builder2(coroutine c: B.() -> Continuation<Unit>) {}
-fun builder3(<!INAPPLICABLE_MODIFIER!>coroutine<!> c: C.() -> Continuation<Unit>) {}

compiler/testData/diagnostics/tests/coroutines/manyHandleResults.txt

@@ -1,28 +0,0 @@
-package
-
-public fun builder1(/*0*/ coroutine c: A.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
-public fun builder2(/*0*/ coroutine c: B.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
-public fun builder3(/*0*/ coroutine c: C.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
-
-public interface A {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open operator fun handleResult(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface B {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open operator fun handleResult(/*0*/ x: kotlin.String, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class C : A, B {
-    public constructor C()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun handleResult(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun handleResult(/*0*/ x: kotlin.String, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}

compiler/testData/diagnostics/tests/coroutines/nonLocalSuspension.kt

@@ -1,12 +1,9 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-class Controller<T> {
-    suspend fun suspendHere() = 1
+suspend fun suspendHere() = 1
+suspend fun <T> another(a: T) = 1
 
-    suspend fun another(a: T) = 1
-}
-
-fun <T> builder(coroutine c: Controller<T>.() -> Continuation<Unit>) { }
+fun <T> builder(c: @Suspend() (() -> Unit)) { }
 
 inline fun run(x: () -> Unit) {}
 
@@ -19,7 +16,7 @@ fun foo() {
     builder<String> {
         suspendHere()
         another("")
-        another(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
+        another(1)
 
         result += suspendHere()
 

compiler/testData/diagnostics/tests/coroutines/nonLocalSuspension.txt

@@ -1,16 +1,9 @@
 package
 
-public fun </*0*/ T> builder(/*0*/ coroutine c: Controller<T>.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
+public suspend fun </*0*/ T> another(/*0*/ a: T): kotlin.Int
+public fun </*0*/ T> builder(/*0*/ c: @kotlin.coroutines.Suspend () -> kotlin.Unit): kotlin.Unit
 public fun foo(): kotlin.Unit
 public fun noinline(/*0*/ x: () -> kotlin.Unit): kotlin.Unit
 public inline fun run(/*0*/ x: () -> kotlin.Unit): kotlin.Unit
 public inline fun runCross(/*0*/ crossinline x: () -> kotlin.Unit): kotlin.Unit
-
-public final class Controller</*0*/ T> {
-    public constructor Controller</*0*/ T>()
-    public final suspend fun another(/*0*/ a: T): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final suspend fun suspendHere(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
+public suspend fun suspendHere(): kotlin.Int

compiler/testData/diagnostics/tests/coroutines/suspendExternalFunctions.kt

@@ -1,24 +1,21 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-class Controller
-
 suspend fun noParams() {
-
 }
 
 suspend fun yieldString(value: String) {}
 
 suspend fun <V> await(f: () -> V) = f()
 
-suspend fun <V> Controller.await(f: Int): V = null!!
+suspend fun <V> await(f: Int): V = null!!
 
-suspend fun Controller.severalParams(x: String, y: Int) = 1.0
+suspend fun severalParams(x: String, y: Int) = 1.0
 
 suspend fun String.stringReceiver(y: Int) = 1.0
 
 suspend fun Any.anyReceiver(y: Int) = 1.0
 
-fun builder(coroutine c: Controller.() -> Continuation<Unit>) {}
+fun builder(c: @Suspend() (() -> Unit)) {}
 
 fun test() {
     builder {
@@ -39,15 +36,12 @@ fun test() {
         severalParams("", 89) checkType { _<Double>() }
         // TODO: should we allow somehow to call with passing continuation explicitly?
         severalParams("", 89, <!TOO_MANY_ARGUMENTS!>6.9<!>) checkType { <!TYPE_MISMATCH!>_<!><Unit>() }
-        severalParams("", 89, <!TOO_MANY_ARGUMENTS!>this <!CAST_NEVER_SUCCEEDS!>as<!> Continuation<Double><!>) checkType { <!TYPE_MISMATCH!>_<!><Unit>() }
 
-        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>stringReceiver<!>(1)
+        "".stringReceiver(1)
+        Any().anyReceiver(1)
 
         with("") {
             stringReceiver(2)
         }
-
-        // Though such calls are allowed declarations with not-annotated receiver should be prohibited
-        anyReceiver(3)
     }
 }

compiler/testData/diagnostics/tests/coroutines/suspendExternalFunctions.txt

@@ -1,18 +1,11 @@
 package
 
 public suspend fun </*0*/ V> await(/*0*/ f: () -> V): V
-public fun builder(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
+public suspend fun </*0*/ V> await(/*0*/ f: kotlin.Int): V
+public fun builder(/*0*/ c: @kotlin.coroutines.Suspend () -> kotlin.Unit): kotlin.Unit
 public suspend fun noParams(): kotlin.Unit
+public suspend fun severalParams(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Int): kotlin.Double
 public fun test(): kotlin.Unit
 public suspend fun yieldString(/*0*/ value: kotlin.String): kotlin.Unit
 public suspend fun kotlin.Any.anyReceiver(/*0*/ y: kotlin.Int): kotlin.Double
-public suspend fun </*0*/ V> Controller.await(/*0*/ f: kotlin.Int): V
-public suspend fun Controller.severalParams(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Int): kotlin.Double
 public suspend fun kotlin.String.stringReceiver(/*0*/ y: kotlin.Int): kotlin.Double
-
-public final class Controller {
-    public constructor Controller()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}

compiler/testData/diagnostics/tests/coroutines/suspendFunctions.kt

@@ -13,7 +13,7 @@ class Controller {
     suspend fun severalParams(x: String, y: Int) = 1.0
 }
 
-fun builder(coroutine c: Controller.() -> Continuation<Unit>) {}
+fun builder(c: @Suspend() (Controller.() -> Unit)) {}
 
 fun test() {
     builder {

compiler/testData/diagnostics/tests/coroutines/suspendFunctions.txt

@@ -1,6 +1,6 @@
 package
 
-public fun builder(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
+public fun builder(/*0*/ c: @kotlin.coroutines.Suspend() (Controller.() -> kotlin.Unit)): kotlin.Unit
 public fun test(): kotlin.Unit
 
 public final class Controller {

compiler/testData/diagnostics/tests/coroutines/suspendWithCurrentContinuation.kt

@@ -2,7 +2,7 @@
 // !CHECK_TYPE
 class Controller {
     suspend fun noParams(): Unit = suspendWithCurrentContinuation {
-        if (hashCode() % 2 == 0) {
+        if (hashCode() <!DEPRECATED_BINARY_MOD_AS_REM!>%<!> 2 == 0) {
             it.resume(Unit)
             Suspend
         }
@@ -21,7 +21,7 @@ class Controller {
     }
 }
 
-fun builder(coroutine c: Controller.() -> Continuation<Unit>) {}
+fun builder(c: @Suspend() (Controller.() -> Unit)) {}
 
 fun test() {
     builder {

compiler/testData/diagnostics/tests/coroutines/suspendWithCurrentContinuation.txt

@@ -1,6 +1,6 @@
 package
 
-public fun builder(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
+public fun builder(/*0*/ c: @kotlin.coroutines.Suspend() (Controller.() -> kotlin.Unit)): kotlin.Unit
 public fun test(): kotlin.Unit
 
 public final class Controller {

compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.kt

@@ -1,5 +1,5 @@
 // Tail calls are not allowed to be Nothing typed. See KT-15051
 suspend fun suspendLogAndThrow(exception: Throwable): Nothing = <!SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE!>suspendWithCurrentContinuation { c ->
     c.resumeWithException(exception)
-    Suspend
+    SUSPENDED
 }<!>

compiler/testData/diagnostics/tests/coroutines/tryCatchLambda.kt

@@ -1,10 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_VARIABLE
-class GenericController<T> {
-    operator fun handleResult(x: T, c: Continuation<Nothing>) { }
-    suspend fun <V> await(f: V): V = f
-}
+suspend fun <V> await(f: V): V = f
 
-fun <T> genericBuilder(coroutine c: GenericController<T>.() -> Continuation<Unit>): T = null!!
+fun <T> genericBuilder(c: @Suspend() (() -> T)): T = null!!
 
 fun foo() {
     var result = ""

compiler/testData/diagnostics/tests/coroutines/tryCatchLambda.txt

@@ -1,13 +1,5 @@
 package
 
+public suspend fun </*0*/ V> await(/*0*/ f: V): V
 public fun foo(): kotlin.Unit
-public fun </*0*/ T> genericBuilder(/*0*/ coroutine c: GenericController<T>.() -> kotlin.coroutines.Continuation<kotlin.Unit>): T
-
-public final class GenericController</*0*/ T> {
-    public constructor GenericController</*0*/ T>()
-    public final suspend fun </*0*/ V> await(/*0*/ f: V): V
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: T, /*1*/ c: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
+public fun </*0*/ T> genericBuilder(/*0*/ c: @kotlin.coroutines.Suspend () -> T): T

compiler/testData/diagnostics/tests/coroutines/unsupported.kt

@@ -1,20 +1,10 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !LANGUAGE: -Coroutines
 
-class Controller {
-    <!UNSUPPORTED_FEATURE!>suspend<!> fun suspendHere(): String = "OK"
+<!UNSUPPORTED_FEATURE!>suspend<!> fun suspendHere(): String = "OK"
 
-    <!UNSUPPORTED_FEATURE!>operator<!> fun handleResult(x: String, y: Continuation<Nothing>) {}
+fun builder(c: @Suspend() (() -> Unit)) {
 
-    <!UNSUPPORTED_FEATURE!>operator<!> fun handleException(x: Throwable, y: Continuation<Nothing>) {
-    }
-
-    <!UNSUPPORTED_FEATURE!>operator<!> fun interceptResume(x: () -> Unit) {
-    }
-}
-
-fun builder(<!UNSUPPORTED_FEATURE!>coroutine<!> c: Controller.() -> Continuation<Unit>) {
-    c(Controller()).resume(Unit)
 }
 
 fun box(): String {

compiler/testData/diagnostics/tests/coroutines/unsupported.txt

@@ -1,15 +1,5 @@
 package
 
 public fun box(): kotlin.String
-public fun builder(/*0*/ coroutine c: Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
-
-public final class Controller {
-    public constructor Controller()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleException(/*0*/ x: kotlin.Throwable, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public final operator fun handleResult(/*0*/ x: kotlin.String, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun interceptResume(/*0*/ x: () -> kotlin.Unit): kotlin.Unit
-    public final suspend fun suspendHere(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
+public fun builder(/*0*/ c: @kotlin.coroutines.Suspend () -> kotlin.Unit): kotlin.Unit
+public suspend fun suspendHere(): kotlin.String

compiler/testData/diagnostics/tests/coroutines/wrongHandleException.kt

@@ -1,35 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-class A1 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleException(x: Throwable) {
-    }
-}
-
-class A2 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleException(x: Throwable, y: Int) {
-    }
-}
-
-class A3 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleException(x: Throwable, y: Continuation<Any>) {
-    }
-}
-
-class A4 {
-    operator fun handleException(x: Throwable, y: Continuation<Nothing>) {
-    }
-}
-
-class A5 {
-    // TODO: Allow?
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleException(x: Throwable, y: Continuation<Nothing>): Int = 1
-}
-
-class A6 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleException(x: Throwable = Exception(), y: Continuation<Nothing>) {}
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleException(x: Throwable, vararg y: Continuation<Nothing>) {}
-}
-
-class A7 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun <T> handleException(x: Throwable, y: Continuation<Nothing>) {
-    }
-}

compiler/testData/diagnostics/tests/coroutines/wrongHandleException.txt

@@ -1,58 +0,0 @@
-package
-
-public final class A1 {
-    public constructor A1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleException(/*0*/ x: kotlin.Throwable): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A2 {
-    public constructor A2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleException(/*0*/ x: kotlin.Throwable, /*1*/ y: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A3 {
-    public constructor A3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleException(/*0*/ x: kotlin.Throwable, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Any>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A4 {
-    public constructor A4()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleException(/*0*/ x: kotlin.Throwable, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A5 {
-    public constructor A5()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleException(/*0*/ x: kotlin.Throwable, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A6 {
-    public constructor A6()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleException(/*0*/ x: kotlin.Throwable, /*1*/ vararg y: kotlin.coroutines.Continuation<kotlin.Nothing> /*kotlin.Array<out kotlin.coroutines.Continuation<kotlin.Nothing>>*/): kotlin.Unit
-    public final operator fun handleException(/*0*/ x: kotlin.Throwable = ..., /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A7 {
-    public constructor A7()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun </*0*/ T> handleException(/*0*/ x: kotlin.Throwable, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}

compiler/testData/diagnostics/tests/coroutines/wrongHandleResult.kt

@@ -1,34 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-class A1 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleResult(x: Int) {
-    }
-}
-
-class A2 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleResult(x: Int, y: Int) {
-    }
-}
-
-class A3 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleResult(x: Int, y: Continuation<Any>) {
-    }
-}
-
-class A4 {
-    operator fun handleResult(x: Int, y: Continuation<Nothing>) {
-    }
-}
-
-class A5 {
-    // TODO: Allow?
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleResult(x: Int, y: Continuation<Nothing>): Int = 1
-}
-
-class A6 {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun <T> handleResult(x: Int, y: Continuation<Nothing>) {
-    }
-
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleResult(x: String = "", y: Continuation<Nothing>) {}
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleResult(x: Double = 1.0, vararg y: Continuation<Nothing>) {}
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun handleResult(x: Double = 1.0, z: Int, y: Continuation<Nothing>) {}
-}

compiler/testData/diagnostics/tests/coroutines/wrongHandleResult.txt

@@ -1,52 +0,0 @@
-package
-
-public final class A1 {
-    public constructor A1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A2 {
-    public constructor A2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A3 {
-    public constructor A3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Any>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A4 {
-    public constructor A4()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A5 {
-    public constructor A5()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class A6 {
-    public constructor A6()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator fun handleResult(/*0*/ x: kotlin.Double = ..., /*1*/ vararg y: kotlin.coroutines.Continuation<kotlin.Nothing> /*kotlin.Array<out kotlin.coroutines.Continuation<kotlin.Nothing>>*/): kotlin.Unit
-    public final operator fun handleResult(/*0*/ x: kotlin.Double = ..., /*1*/ z: kotlin.Int, /*2*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public final operator fun </*0*/ T> handleResult(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public final operator fun handleResult(/*0*/ x: kotlin.String = ..., /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}