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

[Gradle] Add '@JvmStatic' annotation to companion methods in Kotlin types

Browse Source 
This should improve usability in groovy scripts.

^KT-63601 Fixed
This commit is contained in:
Yahor Berdnikau
2023-11-22 17:42:16 +01:00
committed by Space Team
parent 21de05e5ac
commit e50f6e6bca
11 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/tests/org/jetbrains/kotlin/generators/arguments/jsTypesGenerators.kt
+5
View File
@@ -30,6 +30,7 @@ internal fun generateJsMainFunctionExecutionMode(
println()
println("companion object {")
withIndent {
println("@JvmStatic")
println("fun fromMode(mode: String): JsMainFunctionExecutionMode =")
println(" JsMainFunctionExecutionMode.values().firstOrNull { it.mode == mode }")
println(" ?: throw IllegalArgumentException(\"Unknown main function execution mode: ${'$'}mode\")")
@@ -62,6 +63,7 @@ internal fun generateJsModuleKind(
println()
println("companion object {")
withIndent {
println("@JvmStatic")
println("fun fromKind(kind: String): JsModuleKind =")
println(" JsModuleKind.values().firstOrNull { it.kind == kind }")
println(" ?: throw IllegalArgumentException(\"Unknown JS module kind: ${'$'}kind\")")
@@ -92,6 +94,7 @@ internal fun generateJsSourceMapEmbedMode(
println()
println("companion object {")
withIndent {
println("@JvmStatic")
println("fun fromMode(mode: String): JsSourceMapEmbedMode =")
println(" JsSourceMapEmbedMode.values().firstOrNull { it.mode == mode }")
println(" ?: throw IllegalArgumentException(\"Unknown JS source map embed mode: ${'$'}mode\")")
@@ -122,6 +125,7 @@ internal fun generateJsSourceMapNamesPolicy(
println()
println("companion object {")
withIndent {
println("@JvmStatic")
println("fun fromPolicy(policy: String): JsSourceMapNamesPolicy =")
println(" JsSourceMapNamesPolicy.values().firstOrNull { it.policy == policy }")
println(" ?: throw IllegalArgumentException(\"Unknown JS source map names policy: ${'$'}policy\")")
@@ -151,6 +155,7 @@ internal fun generateJsDiagnosticMode(
println()
println("companion object {")
withIndent {
println("@JvmStatic")
println("fun fromMode(mode: String): JsDiagnosticMode =")
println(" JsDiagnosticMode.values().firstOrNull { it.mode == mode }")
println(" ?: throw IllegalArgumentException(\"Unknown JS diagnostic mode: ${'$'}mode\")")
generators/tests/org/jetbrains/kotlin/generators/arguments/jvmTargetGenerator.kt
+2
View File
@@ -25,10 +25,12 @@ internal fun generateJvmTarget(
println()
println("companion object {")
withIndent {
println("@JvmStatic")
println("fun fromTarget(target: String): JvmTarget =")
println(" JvmTarget.values().firstOrNull { it.target == target }")
println(" ?: throw IllegalArgumentException(\"Unknown Kotlin JVM target: ${'$'}target\")")
println()
println("@JvmStatic")
println("val DEFAULT = ${JvmTarget.DEFAULT.name}")
}
println("}")
generators/tests/org/jetbrains/kotlin/generators/arguments/kotlinVersionGenerator.kt
+2
View File
@@ -35,10 +35,12 @@ internal fun generateKotlinVersion(
println()
println("companion object {")
withIndent {
println("@JvmStatic")
println("fun fromVersion(version: String): KotlinVersion =")
println(" KotlinVersion.values().firstOrNull { it.version == version }")
println(" ?: throw IllegalArgumentException(\"Unknown Kotlin version: ${'$'}version\")")
println()
println("@JvmStatic")
println("val DEFAULT = KOTLIN_${LanguageVersion.LATEST_STABLE.major}_${LanguageVersion.LATEST_STABLE.minor}")
}
println("}")