JS: support callable references on suspend functions (KT-30987 fixed)

compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bound/emptyLHS.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: NATIVE
-// IGNORE_BACKEND: JS
 // IGNORE_BACKEND: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES

compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/longArgs.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: NATIVE
-// IGNORE_BACKEND: JS
 // IGNORE_BACKEND: JVM_IR
 // WITH_COROUTINES
 // WITH_RUNTIME

compiler/testData/codegen/box/coroutines/simpleSuspendCallableReference.kt

@@ -0,0 +1,53 @@
+// !LANGUAGE: +ReleaseCoroutines
+// IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
+// WITH_COROUTINES
+import helpers.*
+import kotlin.coroutines.*
+import kotlin.coroutines.intrinsics.*
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(EmptyContinuation)
+}
+
+suspend fun id(s: String) = s
+
+suspend fun String.idExt() = this
+
+class A {
+    suspend fun id(s: String) = s
+}
+
+suspend fun run(block: suspend () -> String) = block()
+
+inline suspend fun runInline(block: suspend () -> String) = block()
+
+suspend fun O(block: suspend (String) -> String) = block("O")
+
+inline suspend fun K(block: suspend (String) -> String) = block("K")
+
+suspend fun ok(o: String): String {
+    return o + run {
+        if (o != "K") {
+            (::ok)("K")
+        } else ""
+    }
+}
+
+fun box(): String {
+    var result = ""
+
+    builder {
+        result = O(::id) + K(::id)
+        result += run("O"::idExt) + runInline("K"::idExt)
+
+        val a = A()
+        result += O(a::id) + K(a::id)
+
+        result += ok("O")
+    }
+
+    if (result != "OKOKOKOK") return "fail: $result"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/suspend/callableReference/simple.kt

@@ -1,6 +1,5 @@
 // !LANGUAGE: +ReleaseCoroutines
 // IGNORE_BACKEND: NATIVE
-// IGNORE_BACKEND: JS
 // IGNORE_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: test.kt

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java

@@ -6267,6 +6267,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("simpleSuspendCallableReference.kt")
+        public void testSimpleSuspendCallableReference() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/simpleSuspendCallableReference.kt");
+        }
+
         @TestMetadata("simpleWithHandleResult.kt")
         public void testSimpleWithHandleResult_1_2() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines.experimental");

compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -6267,6 +6267,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("simpleSuspendCallableReference.kt")
+        public void testSimpleSuspendCallableReference() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/simpleSuspendCallableReference.kt");
+        }
+
         @TestMetadata("simpleWithHandleResult.kt")
         public void testSimpleWithHandleResult_1_2() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines.experimental");

compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java

@@ -6267,6 +6267,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("simpleSuspendCallableReference.kt")
+        public void testSimpleSuspendCallableReference() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/simpleSuspendCallableReference.kt");
+        }
+
         @TestMetadata("simpleWithHandleResult.kt")
         public void testSimpleWithHandleResult_1_2() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines.experimental");

js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt

@@ -44,17 +44,14 @@ class CoroutineTransformer : JsVisitorWithContextImpl() {
         return super.visit(x, ctx)
     }
 
-    override fun visit(x: JsFunction, ctx: JsContext<*>): Boolean {
+    override fun endVisit(x: JsFunction, ctx: JsContext<*>) {
         if (x.isInlineableCoroutineBody) {
             x.body = transformCoroutineMetadataToSpecialFunctions(x.body)
-            return false
         }
         if (x.coroutineMetadata != null) {
             lastStatementLevelContext.addPrevious(CoroutineFunctionTransformer(x, functionName[x]).transform())
             x.coroutineMetadata = null
-            return false
         }
-        return super.visit(x, ctx)
     }
 
     override fun visit(x: JsVars.JsVar, ctx: JsContext<*>): Boolean {

js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java

@@ -5072,6 +5072,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("simpleSuspendCallableReference.kt")
+        public void testSimpleSuspendCallableReference() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/simpleSuspendCallableReference.kt");
+        }
+
         @TestMetadata("simpleWithHandleResult.kt")
         public void testSimpleWithHandleResult_1_3() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines");

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java

@@ -5397,6 +5397,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines");
         }
 
+        @TestMetadata("simpleSuspendCallableReference.kt")
+        public void testSimpleSuspendCallableReference() throws Exception {
+            runTest("compiler/testData/codegen/box/coroutines/simpleSuspendCallableReference.kt");
+        }
+
         @TestMetadata("simpleWithHandleResult.kt")
         public void testSimpleWithHandleResult_1_2() throws Exception {
             runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines.experimental");

js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java

@@ -540,9 +540,11 @@ public class TranslationContext {
 
     @Nullable
     public JsExpression getAliasForDescriptor(@NotNull DeclarationDescriptor descriptor) {
-        JsExpression nameRef = captureIfNeedAndGetCapturedName(descriptor);
+        if (continuationParameterDescriptor != descriptor) {
-        if (nameRef != null) {
+            JsExpression nameRef = captureIfNeedAndGetCapturedName(descriptor);
-            return nameRef;
+            if (nameRef != null) {
+                return nameRef;
+            }
         }
 
         JsExpression alias = aliasingContext.getAliasForDescriptor(descriptor);

js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt

@@ -24,9 +24,7 @@ import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator
 import org.jetbrains.kotlin.js.translate.context.Namer
 import org.jetbrains.kotlin.js.translate.context.TranslationContext
 import org.jetbrains.kotlin.js.translate.general.Translation
-import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils
+import org.jetbrains.kotlin.js.translate.utils.*
-import org.jetbrains.kotlin.js.translate.utils.TranslationUtils
-import org.jetbrains.kotlin.js.translate.utils.finalElement
 import org.jetbrains.kotlin.psi.KtCallableReferenceExpression
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.resolve.calls.callUtil.getFunctionResolvedCallWithAssert
@@ -127,7 +125,18 @@ object CallableReferenceTranslator {
             val type = functionDescriptor.valueParameters[index].type
             aliases[valueArg.getArgumentExpression()!!] = TranslationUtils.coerce(context, paramRef, type)
         }
-        val functionContext = context.innerBlock(function.body).innerContextWithAliasesForExpressions(aliases)
+
+        var functionContext = context.innerBlock(function.body).innerContextWithAliasesForExpressions(aliases).inner(functionDescriptor)
+
+        functionContext.continuationParameterDescriptor?.let { continuationDescriptor ->
+            function.parameters += JsParameter(context.getNameForDescriptor(continuationDescriptor))
+            functionContext = functionContext.innerContextWithDescriptorsAliased(mapOf(continuationDescriptor to JsAstUtils.stateMachineReceiver()))
+        }
+
+        if (functionDescriptor.isSuspend) {
+            function.fillCoroutineMetadata(functionContext, descriptor, hasController = false)
+        }
+
         val invocation = CallTranslator.translate(functionContext, fakeResolvedCall, receiverParam)
         function.body.statements += JsReturn(TranslationUtils.coerce(context, invocation, context.currentModule.builtIns.anyType))