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

[Gradle, JS] Fix vararg call

Browse Source 
KT-38331
This commit is contained in:
Ilya Goncharov
2020-05-07 19:07:40 +03:00
parent dcb961af19
commit df38a669b8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt
+4 -4
View File
@@ -163,7 +163,7 @@ private abstract class AbstractNpmDependencyExtension(
name = arg, name = arg,
args = *args 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 { private fun withName(name: String, vararg args: Any?): NpmDependency {
val arg1 = if (args.size > 1) args[1] else null val arg1 = if (args.size > 1) args[1] else null
val generateKotlinExternals = secondArgOrFalse(args) val generateKotlinExternals = secondArgOrFalse(*args)
return when (arg1) { return when (arg1) {
null -> invoke( null -> invoke(
@@ -186,7 +186,7 @@ private abstract class AbstractNpmDependencyExtension(
name, name,
arg1, arg1,
generateKotlinExternals, generateKotlinExternals,
args *args
) )
} }
} }
@@ -214,7 +214,7 @@ private abstract class AbstractNpmDependencyExtension(
protected fun secondArgOrFalse(vararg args: Any?): Boolean { protected fun secondArgOrFalse(vararg args: Any?): Boolean {
val arg2 = if (args.size > 2) args[2] else null val arg2 = if (args.size > 2) args[2] else null
return (arg2 as? Boolean) ?: false return (arg2 as? Boolean) ?: defaultGenerateKotlinExternals
} }
} }