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("}")
libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode.kt
+1
View File
@@ -11,6 +11,7 @@ enum class JsDiagnosticMode(val mode: String) {
;
companion object {
@JvmStatic
fun fromMode(mode: String): JsDiagnosticMode =
JsDiagnosticMode.values().firstOrNull { it.mode == mode }
?: throw IllegalArgumentException("Unknown JS diagnostic mode: $mode")
libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode.kt
+1
View File
@@ -11,6 +11,7 @@ enum class JsMainFunctionExecutionMode(val mode: String) {
;
companion object {
@JvmStatic
fun fromMode(mode: String): JsMainFunctionExecutionMode =
JsMainFunctionExecutionMode.values().firstOrNull { it.mode == mode }
?: throw IllegalArgumentException("Unknown main function execution mode: $mode")
libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsModuleKind.kt
+1
View File
@@ -14,6 +14,7 @@ enum class JsModuleKind(val kind: String) {
;
companion object {
@JvmStatic
fun fromKind(kind: String): JsModuleKind =
JsModuleKind.values().firstOrNull { it.kind == kind }
?: throw IllegalArgumentException("Unknown JS module kind: $kind")
libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode.kt
+1
View File
@@ -12,6 +12,7 @@ enum class JsSourceMapEmbedMode(val mode: String) {
;
companion object {
@JvmStatic
fun fromMode(mode: String): JsSourceMapEmbedMode =
JsSourceMapEmbedMode.values().firstOrNull { it.mode == mode }
?: throw IllegalArgumentException("Unknown JS source map embed mode: $mode")
libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsSourceMapNamesPolicy.kt
+1
View File
@@ -12,6 +12,7 @@ enum class JsSourceMapNamesPolicy(val policy: String) {
;
companion object {
@JvmStatic
fun fromPolicy(policy: String): JsSourceMapNamesPolicy =
JsSourceMapNamesPolicy.values().firstOrNull { it.policy == policy }
?: throw IllegalArgumentException("Unknown JS source map names policy: $policy")
libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JvmTarget.kt
+2
View File
@@ -23,10 +23,12 @@ enum class JvmTarget(val target: String) {
;
companion object {
@JvmStatic
fun fromTarget(target: String): JvmTarget =
JvmTarget.values().firstOrNull { it.target == target }
?: throw IllegalArgumentException("Unknown Kotlin JVM target: $target")
@JvmStatic
val DEFAULT = JVM_1_8
}
}
libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt
+2
View File
@@ -21,10 +21,12 @@ enum class KotlinVersion(val version: String) {
;
companion object {
@JvmStatic
fun fromVersion(version: String): KotlinVersion =
KotlinVersion.values().firstOrNull { it.version == version }
?: throw IllegalArgumentException("Unknown Kotlin version: $version")
@JvmStatic
val DEFAULT = KOTLIN_2_0
}
}
libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
+9
View File
@@ -12,6 +12,7 @@ public final class org/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode : java/lang/
public static final field Companion Lorg/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode$Companion;
public static final field RUNTIME_DIAGNOSTIC_EXCEPTION Lorg/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode;
public static final field RUNTIME_DIAGNOSTIC_LOG Lorg/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode;
public static final fun fromMode (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode;
public final fun getMode ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode;
public static fun values ()[Lorg/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode;
@@ -25,6 +26,7 @@ public final class org/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode :
public static final field CALL Lorg/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode;
public static final field Companion Lorg/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode$Companion;
public static final field NO_CALL Lorg/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode;
public static final fun fromMode (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode;
public final fun getMode ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode;
public static fun values ()[Lorg/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode;
@@ -41,6 +43,7 @@ public final class org/jetbrains/kotlin/gradle/dsl/JsModuleKind : java/lang/Enum
public static final field MODULE_ES Lorg/jetbrains/kotlin/gradle/dsl/JsModuleKind;
public static final field MODULE_PLAIN Lorg/jetbrains/kotlin/gradle/dsl/JsModuleKind;
public static final field MODULE_UMD Lorg/jetbrains/kotlin/gradle/dsl/JsModuleKind;
public static final fun fromKind (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsModuleKind;
public final fun getKind ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsModuleKind;
public static fun values ()[Lorg/jetbrains/kotlin/gradle/dsl/JsModuleKind;
@@ -55,6 +58,7 @@ public final class org/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode : java/l
public static final field SOURCE_MAP_SOURCE_CONTENT_ALWAYS Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode;
public static final field SOURCE_MAP_SOURCE_CONTENT_INLINING Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode;
public static final field SOURCE_MAP_SOURCE_CONTENT_NEVER Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode;
public static final fun fromMode (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode;
public final fun getMode ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode;
public static fun values ()[Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode;
@@ -69,6 +73,7 @@ public final class org/jetbrains/kotlin/gradle/dsl/JsSourceMapNamesPolicy : java
public static final field SOURCE_MAP_NAMES_POLICY_FQ_NAMES Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapNamesPolicy;
public static final field SOURCE_MAP_NAMES_POLICY_NO Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapNamesPolicy;
public static final field SOURCE_MAP_NAMES_POLICY_SIMPLE_NAMES Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapNamesPolicy;
public static final fun fromPolicy (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapNamesPolicy;
public final fun getPolicy ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapNamesPolicy;
public static fun values ()[Lorg/jetbrains/kotlin/gradle/dsl/JsSourceMapNamesPolicy;
@@ -94,6 +99,8 @@ public final class org/jetbrains/kotlin/gradle/dsl/JvmTarget : java/lang/Enum {
public static final field JVM_20 Lorg/jetbrains/kotlin/gradle/dsl/JvmTarget;
public static final field JVM_21 Lorg/jetbrains/kotlin/gradle/dsl/JvmTarget;
public static final field JVM_9 Lorg/jetbrains/kotlin/gradle/dsl/JvmTarget;
public static final fun fromTarget (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JvmTarget;
public static final fun getDEFAULT ()Lorg/jetbrains/kotlin/gradle/dsl/JvmTarget;
public final fun getTarget ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/JvmTarget;
public static fun values ()[Lorg/jetbrains/kotlin/gradle/dsl/JvmTarget;
@@ -560,6 +567,8 @@ public final class org/jetbrains/kotlin/gradle/dsl/KotlinVersion : java/lang/Enu
public static final field KOTLIN_1_9 Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
public static final field KOTLIN_2_0 Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
public static final field KOTLIN_2_1 Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
public static final fun fromVersion (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
public static final fun getDEFAULT ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
public final fun getVersion ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
public static fun values ()[Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;