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

[Gradle, JS] Refactor with remove copypaste

Browse Source
This commit is contained in:
Ilya Goncharov
2020-02-14 12:37:08 +03:00
parent 397ff26e20
commit 185f7419d5
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/JsCompilerType.kt
+4 -1
View File
@@ -28,4 +28,7 @@ enum class JsCompilerType : Named, Serializable {
JsCompilerType
.values().firstOrNull { it.name.equals(argument, ignoreCase = true) }
}
}
}
fun String.removeCapitalizedJsCompilerSuffix(compilerType: JsCompilerType): String =
removeSuffix(compilerType.name.capitalize())
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt
+2 -1
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions
import org.jetbrains.kotlin.gradle.plugin.JsCompilerType
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationWithResources
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.removeCapitalizedJsCompilerSuffix
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
@@ -37,7 +38,7 @@ open class KotlinJsCompilation(
override val defaultSourceSetName: String
get() = lowerCamelCaseName(
(target as KotlinJsTarget).irTarget?.let {
target.disambiguationClassifier?.removeSuffix(JsCompilerType.legacy.name.capitalize())
target.disambiguationClassifier?.removeCapitalizedJsCompilerSuffix(JsCompilerType.legacy)
} ?: target.disambiguationClassifier,
compilationName
)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt
+2 -1
View File
@@ -11,6 +11,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.plugin.JsCompilerType
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.removeCapitalizedJsCompilerSuffix
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTargetConfigurator
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrSingleTargetPreset
@@ -35,7 +36,7 @@ open class KotlinJsTargetPreset(
platformType
).apply {
this.irTarget = irPreset?.createTarget(
lowerCamelCaseName(name.removeSuffix(JsCompilerType.legacy.name.capitalize()), JsCompilerType.ir.name)
lowerCamelCaseName(name.removeCapitalizedJsCompilerSuffix(JsCompilerType.legacy), JsCompilerType.ir.name)
)
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt
+2 -5
View File
@@ -7,10 +7,7 @@ package org.jetbrains.kotlin.gradle.targets.js.ir
import org.gradle.api.file.SourceDirectorySet
import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.plugin.JsCompilerType
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrType.DEVELOPMENT
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrType.PRODUCTION
@@ -51,7 +48,7 @@ class KotlinJsIrCompilation(
return lowerCamelCaseName(
if ((target as KotlinJsIrTarget).mixedMode)
target.disambiguationClassifier
?.removeSuffix(JsCompilerType.ir.name.capitalize())
?.removeCapitalizedJsCompilerSuffix(JsCompilerType.ir)
else
target.disambiguationClassifier,
compilationName