Simplify concatElements resolution for size=0 and size=1 cases

^KT-40689 fixed

Simplify concatElements resolution for size=0 and size=1 cases
^KT-40689 fixed
1dbe7d12 · Shagen Ogandzhanian · TeamCityServer · bcfc0c21 · 1dbe7d12
隐藏空白更改
内联并排

Showing with 6 addition and 3 deletion

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/jsAstUtils.kt ...ns/kotlin/ir/backend/js/transformers/irToJs/jsAstUtils.kt +6 -3

未找到文件。
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/jsAstUtils.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/jsAstUtils.kt
@@ -240,15 +240,18 @@ fun argumentsWithVarargAsSingleArray(
            }
        }
-    if (arraysForConcat.isNotEmpty() || concatElements.isEmpty()) {
+    if (arraysForConcat.isNotEmpty()) {
        concatElements.add(JsArrayLiteral(arraysForConcat))
    }
-    return concatElements.singleOrNull()
+    return when (concatElements.size) {
-        ?: JsInvocation(
+        0 -> JsArrayLiteral()
+        1 -> concatElements[0]
+        else -> JsInvocation(
            JsNameRef("concat", concatElements.first()),
            concatElements.drop(1)
        )
+    }
 }
 fun IrFunction.varargParameterIndex() = valueParameters.indexOfFirst { it.varargElementType != null }