azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify signatures for arrays in argumentsWithVarargAsSingleArray

Browse Source 
^KT-40689 fixed
This commit is contained in:
Shagen Ogandzhanian
2021-01-08 00:27:13 +01:00
committed by TeamCityServer
parent 85fe636d60
commit 997d23eb43
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/jsAstUtils.kt
+5 -4
View File
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
import org.jetbrains.kotlin.ir.visitors.acceptVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid
import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.util.OperatorNameConventions import org.jetbrains.kotlin.util.OperatorNameConventions
import org.jetbrains.kotlin.utils.addIfNotNull
fun jsVar(name: JsName, initializer: IrExpression?, context: JsGenerationContext): JsVars { fun jsVar(name: JsName, initializer: IrExpression?, context: JsGenerationContext): JsVars {
val jsInitializer = initializer?.accept(IrElementToJsExpressionTransformer(), context) val jsInitializer = initializer?.accept(IrElementToJsExpressionTransformer(), context)
@@ -208,10 +209,10 @@ fun argumentsWithVarargAsSingleArray(
// External vararg arguments should be represented in JS as multiple "plain" arguments (opposed to arrays in Kotlin) // External vararg arguments should be represented in JS as multiple "plain" arguments (opposed to arrays in Kotlin)
// We are using `Function.prototype.apply` function to pass all arguments as a single array. // We are using `Function.prototype.apply` function to pass all arguments as a single array.
// For this purpose are concatenating non-vararg arguments with vararg. // For this purpose are concatenating non-vararg arguments with vararg.
var arraysForConcat: MutableList<JsExpression> = mutableListOf<JsExpression>().apply { var arraysForConcat = mutableListOf<JsExpression>()
additionalReceiver?.let { add(it) } arraysForConcat.addIfNotNull(additionalReceiver)
}
val concatElements: MutableList<JsExpression> = mutableListOf() val concatElements = mutableListOf<JsExpression>()
arguments arguments
.forEachIndexed { index, argument -> .forEachIndexed { index, argument ->