JS: fix translation of call to suspend function with optional parameters

Alexey Andreev · Alexey Andreev · commit 050a1e782e40 · 2016-11-16T19:29:33.000+03:00
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt
@@ -21,6 +21,7 @@ import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind
 import com.google.dart.compiler.backend.js.ast.metadata.sideEffects
 import com.intellij.util.SmartList
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.js.translate.context.Namer
@@ -157,7 +158,11 @@ class CallArgumentTranslator private constructor(
             }
         }
 
-        removeLastUndefinedArguments(result)
+        val callableDescriptor = resolvedCall.resultingDescriptor
+        if (callableDescriptor !is FunctionDescriptor || !callableDescriptor.isSuspend) {
+            removeLastUndefinedArguments(result)
+        }
+
         return ArgumentsInfo(result, hasSpreadOperator, cachedReceiver)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind`
`21`	`21`	`import com.google.dart.compiler.backend.js.ast.metadata.sideEffects`
`22`	`22`	`import com.intellij.util.SmartList`
`23`	`23`	`import org.jetbrains.kotlin.descriptors.ClassDescriptor`
	`24`	`+import org.jetbrains.kotlin.descriptors.FunctionDescriptor`
`24`	`25`	`import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor`
`25`	`26`	`import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor`
`26`	`27`	`import org.jetbrains.kotlin.js.translate.context.Namer`
`@@ -157,7 +158,11 @@ class CallArgumentTranslator private constructor(`
`157`	`158`	`}`
`158`	`159`	`}`
`159`	`160`
`160`		`- removeLastUndefinedArguments(result)`
	`161`	`+ val callableDescriptor = resolvedCall.resultingDescriptor`
	`162`	`+ if (callableDescriptor !is FunctionDescriptor \|\| !callableDescriptor.isSuspend) {`
	`163`	`+ removeLastUndefinedArguments(result)`
	`164`	`+ }`
	`165`	`+`
`161`	`166`	`return ArgumentsInfo(result, hasSpreadOperator, cachedReceiver)`
`162`	`167`	`}`
`163`	`168`