Skip to content

fix(common): JavaAnnotationRefCollectable's invalid call #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ForteScarlet merged 1 commit into from
Jan 31, 2026
Merged

fix(common): JavaAnnotationRefCollectable's invalid call #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ...java/src/commonMain/kotlin/love/forte/codegentle/java/ref/JavaAnnotationRefCollectable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/
package love.forte.codegentle.java.ref

import love.forte.codegentle.common.code.CodePart.Companion.literal
import love.forte.codegentle.common.code.CodePart.Companion.string
import love.forte.codegentle.common.code.emitLiteral
import love.forte.codegentle.common.code.emitString
import love.forte.codegentle.common.code.emitType
import love.forte.codegentle.common.naming.ClassName
Expand Down Expand Up @@ -47,7 +46,7 @@ public fun <B : AnnotationRefCollector<B>> AnnotationRefCollectorOps<B>.addDepre
return collector.addAnnotation(JavaAnnotationNames.Deprecated) {
since?.also { since ->
addMember("since", "%V") {
string(since)
emitString(since)
}
}
forRemoval?.also { forRemoval ->
Expand All @@ -65,7 +64,7 @@ public fun <B : AnnotationRefCollector<B>> AnnotationRefCollectorOps<B>.addSuppr
return collector.addAnnotation(JavaAnnotationNames.SuppressWarnings) {
if (values.isNotEmpty()) {
for (value in values) {
addMember("value", "%V") { string(value) }
addMember("value", "%V") { emitString(value) }
}
}
}
Expand Down Expand Up @@ -102,7 +101,7 @@ public fun <B : AnnotationRefCollector<B>> AnnotationRefCollectorOps<B>.addReten
javaRetentionName?.also { retentionName ->
addMember("value", "%V.%V") {
emitType(ClassName("java.lang.annotation", "Retention"))
literal(retentionName)
emitLiteral(retentionName)
}
}
}
Expand All @@ -123,10 +122,10 @@ public fun <B : AnnotationRefCollector<B>> AnnotationRefCollectorOps<B>.addTarge
if (values.isNotEmpty()) {
for (value in values) {
val elementName = value.uppercase()
require(elementName.all { it in 'A'..'Z' || it == '_' })
require(elementName.all { it in 'A'..'Z' || it == '_' }) { "Invalid element name: $value" }
addMember("value", "%V.%V") {
emitType(ClassName("java.lang.annotation", "ElementType"))
literal(elementName)
emitLiteral(elementName)
}
}
}
Expand Down