From df38a669b84d8df7a7d0e816938fc1b490dc804e Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 7 May 2020 19:07:40 +0300
Subject: [PATCH] [Gradle, JS] Fix vararg call

KT-38331
---
 .../gradle/targets/js/npm/NpmDependencyExtension.kt       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt
index 3415ad8a303..31750a9caea 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt
@@ -163,7 +163,7 @@ private abstract class AbstractNpmDependencyExtension(
                 name = arg,
                 args = *args
             )
-            else -> processNonStringFirstArgument(arg, args)
+            else -> processNonStringFirstArgument(arg, *args)
         }
     }
 
@@ -171,7 +171,7 @@ private abstract class AbstractNpmDependencyExtension(
 
     private fun withName(name: String, vararg args: Any?): NpmDependency {
         val arg1 = if (args.size > 1) args[1] else null
-        val generateKotlinExternals = secondArgOrFalse(args)
+        val generateKotlinExternals = secondArgOrFalse(*args)
 
         return when (arg1) {
             null -> invoke(
@@ -186,7 +186,7 @@ private abstract class AbstractNpmDependencyExtension(
                 name,
                 arg1,
                 generateKotlinExternals,
-                args
+                *args
             )
         }
     }
@@ -214,7 +214,7 @@ private abstract class AbstractNpmDependencyExtension(
 
     protected fun secondArgOrFalse(vararg args: Any?): Boolean {
         val arg2 = if (args.size > 2) args[2] else null
-        return (arg2 as? Boolean) ?: false
+        return (arg2 as? Boolean) ?: defaultGenerateKotlinExternals
     }
 }