From 4737b3dd7fe9eeea8dba1f8066b265b5fd760dbc Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Thu, 15 Dec 2016 10:59:31 +0300
Subject: [PATCH] Update stubBuilder/deserialization tests on coroutines

---
 .../loadJava/compiledKotlin/coroutines/Basic.kt   |  5 ++---
 .../loadJava/compiledKotlin/coroutines/Basic.txt  |  5 ++---
 .../decompiler/stubBuilder/Modifiers/Modifiers.kt |  3 ++-
 .../stubBuilder/Modifiers/Modifiers.txt           | 15 +++------------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/compiler/testData/loadJava/compiledKotlin/coroutines/Basic.kt b/compiler/testData/loadJava/compiledKotlin/coroutines/Basic.kt
index 7b6377309a6..e9b8a2837be 100644
--- a/compiler/testData/loadJava/compiledKotlin/coroutines/Basic.kt
+++ b/compiler/testData/loadJava/compiledKotlin/coroutines/Basic.kt
@@ -1,9 +1,8 @@
 package test
 class Controller {
-    suspend fun suspendFun(x: Continuation<String>) {}
-    operator fun handleResult(x: Int, y: Continuation<Nothing>) {}
+    suspend fun suspendFun() {}
 }
 
-fun builder(coroutine c: Controller.() -> Continuation<Unit>) {
+fun builder(c: suspend Controller.() -> Unit) {
 
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/coroutines/Basic.txt b/compiler/testData/loadJava/compiledKotlin/coroutines/Basic.txt
index 6d25db4408e..16398cc6219 100644
--- a/compiler/testData/loadJava/compiledKotlin/coroutines/Basic.txt
+++ b/compiler/testData/loadJava/compiledKotlin/coroutines/Basic.txt
@@ -1,9 +1,8 @@
 package test
 
-public fun builder(/*0*/ coroutine c: test.Controller.() -> kotlin.coroutines.Continuation<kotlin.Unit>): kotlin.Unit
+public fun builder(/*0*/ c: suspend test.Controller.() -> kotlin.Unit): kotlin.Unit
 
 public final class Controller {
     /*primary*/ public constructor Controller()
-    public final operator fun handleResult(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation<kotlin.Nothing>): kotlin.Unit
-    public final suspend fun suspendFun(/*0*/ x: kotlin.coroutines.Continuation<kotlin.String>): kotlin.Unit
+    public final suspend fun suspendFun(): kotlin.Unit
 }
diff --git a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt
index 9b7adf9f946..f59daea86a3 100644
--- a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt
+++ b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt
@@ -1,4 +1,5 @@
 package test
+import kotlin.coroutines.*
 
 data class Modifiers(val x: Int) {
     external fun extFun()
@@ -20,5 +21,5 @@ data class Modifiers(val x: Int) {
 
     suspend fun suspend(x: Continuation<Int>) {}
 
-    fun builder(coroutine c: Any.() -> Continuation<Unit>) {}
+    fun builder(c: suspend Any.() -> Unit) {}
 }
diff --git a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt
index 2603eb49f40..84147957663 100644
--- a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt
+++ b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt
@@ -32,8 +32,8 @@ PsiJetFileStubImpl[package=test]
         MODIFIER_LIST[public final]
         VALUE_PARAMETER_LIST
           VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c]
-            MODIFIER_LIST[coroutine]
             TYPE_REFERENCE
+              MODIFIER_LIST[suspend]
               FUNCTION_TYPE
                 FUNCTION_TYPE_RECEIVER
                   TYPE_REFERENCE
@@ -45,17 +45,8 @@ PsiJetFileStubImpl[package=test]
                 TYPE_REFERENCE
                   USER_TYPE
                     USER_TYPE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION[referencedName=kotlin]
-                      REFERENCE_EXPRESSION[referencedName=coroutines]
-                    REFERENCE_EXPRESSION[referencedName=Continuation]
-                    TYPE_ARGUMENT_LIST
-                      TYPE_PROJECTION[projectionKind=NONE]
-                        TYPE_REFERENCE
-                          USER_TYPE
-                            USER_TYPE
-                              REFERENCE_EXPRESSION[referencedName=kotlin]
-                            REFERENCE_EXPRESSION[referencedName=Unit]
+                      REFERENCE_EXPRESSION[referencedName=kotlin]
+                    REFERENCE_EXPRESSION[referencedName=Unit]
         TYPE_REFERENCE
           USER_TYPE
             USER_TYPE