Skip to content
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

Fix setting retention from library settings #738

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix setting retention from library settings #738

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...odot/tests/library/flattened/FLSimple.gdj → ...cies/flattened-library-tests/FLSimple.gdj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ properties = [
]
functions = [
provide_greeting
]
]
4 changes: 3 additions & 1 deletion ...y-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/EntryGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ object EntryGenerator {
classRegistrarFromDependencyCount: Int,
logger: Logger,
sourceFiles: List<SourceFile>,
isRegistrationFileHierarchyEnabled: Boolean,
jvmTypeFqNamesProvider: (JvmType) -> Set<String>,
compilationTimeRelativeRegistrationFilePathProvider: (RegisteredClass) -> String,
classRegistrarAppendableProvider: (RegisteredClass) -> BufferedWriter,
Expand Down Expand Up @@ -67,7 +68,8 @@ object EntryGenerator {
projectName = projectName,
registeredClass = registeredClass,
registrarAppendableProvider = classRegistrarAppendableProvider,
compilationTimeRelativeRegistrationFilePath = compilationTimeRelativeRegistrationFilePathProvider(registeredClass)
compilationTimeRelativeRegistrationFilePath = compilationTimeRelativeRegistrationFilePathProvider(registeredClass),
isRegistrationFileHierarchyEnabled = isRegistrationFileHierarchyEnabled,
)
)
}
Expand Down
2 changes: 2 additions & 0 deletions ...y-generator/src/main/kotlin/godot/entrygenerator/filebuilder/ClassRegistrarFileBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class ClassRegistrarFileBuilder(
private val registeredClass: RegisteredClass,
private val compilationTimeRelativeRegistrationFilePath: String,
private val registrarAppendableProvider: (RegisteredClass) -> BufferedWriter,
isRegistrationFileHierarchyEnabled: Boolean,
) {
private val classRegistrarBuilder = TypeSpec
.classBuilder("${registeredClass.registeredName}Registrar")
Expand All @@ -41,6 +42,7 @@ class ClassRegistrarFileBuilder(
.addMember("%S", registeredClass.signals.joinToString(",") { it.fqName })
.addMember("%S", registeredClass.properties.joinToString(",") { it.fqName })
.addMember("%S", registeredClass.functions.filter { it.name != GodotFunctions.notification }.joinToString(",") { it.fqName })
.addMember("%L", isRegistrationFileHierarchyEnabled)
.build()
)
}
Expand Down
1 change: 1 addition & 0 deletions ...-generator/src/main/kotlin/godot/entrygenerator/model/RegisteredClassMetadataContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ data class RegisteredClassMetadataContainer(
val signals: String,
val properties: String,
val functions: String,
val isRegistrationFileHierarchyEnabled: Boolean,
)
1 change: 1 addition & 0 deletions ...symbol-processor/src/main/kotlin/godot/annotation/processor/GodotKotlinSymbolProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ class GodotKotlinSymbolProcessor(
?: throw IllegalStateException("No isRegistrationFileHierarchyEnabled option provided or not a boolean"),
isRegistrationFileGenerationEnabled = options["isRegistrationFileGenerationEnabled"]?.toBooleanStrictOrNull()
?: throw IllegalStateException("No isRegistrationFileGenerationEnabled option provided or not a boolean"),
registeredClassMetadataContainers = emptyList(),
)
}

Expand Down
2 changes: 2 additions & 0 deletions ...tion/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/Settings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package godot.annotation.processor

import godot.entrygenerator.model.RegisteredClassMetadataContainer
import java.io.File

internal data class Settings(
Expand All @@ -10,4 +11,5 @@ internal data class Settings(
val isFqNameRegistrationEnabled: Boolean,
val isRegistrationFileHierarchyEnabled: Boolean,
val isRegistrationFileGenerationEnabled: Boolean,
var registeredClassMetadataContainers: List<RegisteredClassMetadataContainer>,
)
9 changes: 8 additions & 1 deletion ...sor/src/main/kotlin/godot/annotation/processor/ext/RegisteredClassMetadataContainerExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
package godot.annotation.processor.ext

import godot.annotation.processor.Settings
import godot.tools.common.constants.FileExtensions
import org.jetbrains.kotlin.konan.properties.suffix

internal fun provideRegistrationFilePathForInitialGenerationWithoutExtension(
isRegistrationFileHierarchyEnabled: Boolean,
settings: Settings,
fqName: String,
registeredName: String,
compilationProjectName: String,
classProjectName: String,
registrationFileOutDir: String
): String {
val registrationMetadata = settings.registeredClassMetadataContainers.firstOrNull { it.fqName == fqName }
val isRegistrationFileHierarchyEnabled = if (registrationMetadata != null) {
registrationMetadata.isRegistrationFileHierarchyEnabled
} else {
settings.isRegistrationFileHierarchyEnabled
}
val registrationFileRelativePath = if (isRegistrationFileHierarchyEnabled && fqName.contains(".")) {
fqName.substringBeforeLast(".").replace(".", "/")
} else ""
Expand Down
66 changes: 36 additions & 30 deletions ...lin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksTypeReferenceExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,42 +56,48 @@ internal fun KSType.provideRegisteredClassName(
internal fun KSDeclaration.provideRegisteredClassName(
settings: Settings,
): String? {
val registerClassAnnotation = annotations
.firstOrNull { it.fqNameUnsafe == RegisterClass::class.qualifiedName }
return settings
.registeredClassMetadataContainers
.firstOrNull { it.fqName == this.qualifiedName?.asString() }
?.registeredName
?: run {
val registerClassAnnotation = annotations
.firstOrNull { it.fqNameUnsafe == RegisterClass::class.qualifiedName }

val customName = registerClassAnnotation
?.arguments
?.first()
?.value as? String
val customName = registerClassAnnotation
?.arguments
?.first()
?.value as? String

val fqName = this.qualifiedName?.asString() ?: return null
val fqName = this.qualifiedName?.asString() ?: return null

val registeredName = if (customName.isNullOrEmpty()) {
if (settings.isFqNameRegistrationEnabled) {
fqName.replace(".", "_")
} else {
if (fqName.contains(".")) {
fqName.substringAfterLast(".")
val registeredName = if (customName.isNullOrEmpty()) {
if (settings.isFqNameRegistrationEnabled) {
fqName.replace(".", "_")
} else {
if (fqName.contains(".")) {
fqName.substringAfterLast(".")
} else {
fqName
}
}
} else {
fqName
customName
}
}
} else {
customName
}

return if (settings.classPrefix != null) {
if (registeredName.contains("_")) {
val packageName = registeredName.substringBeforeLast("_")
val classNameWithPrefix = registeredName
.substringAfterLast("_")
.let { className -> "${settings.classPrefix.uppercase()}$className" }
if (settings.classPrefix != null) {
if (registeredName.contains("_")) {
val packageName = registeredName.substringBeforeLast("_")
val classNameWithPrefix = registeredName
.substringAfterLast("_")
.let { className -> "${settings.classPrefix.uppercase()}$className" }

"${packageName}_$classNameWithPrefix"
} else {
"${settings.classPrefix.uppercase()}$registeredName"
"${packageName}_$classNameWithPrefix"
} else {
"${settings.classPrefix.uppercase()}$registeredName"
}
} else {
registeredName
}
}
} else {
registeredName
}
}
16 changes: 9 additions & 7 deletions ...ssor/processing/RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistrationFiles.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ internal class RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistration
private val settings: Settings,
) : BaseRound() {
override fun executeInternal(): List<KSAnnotated> {
val metadataAnnotationVisitor = MetadataAnnotationVisitor()
resolver.getDeclarationsFromPackage(godotEntryBasePackage).forEach { declaration ->
declaration.accept(metadataAnnotationVisitor, Unit)
}
settings.registeredClassMetadataContainers = metadataAnnotationVisitor.registeredClassMetadataContainers

val registerAnnotationVisitor = RegistrationAnnotationVisitor(
settings = settings,
)
Expand All @@ -37,11 +43,6 @@ internal class RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistration
it.accept(registerAnnotationVisitor, Unit)
}

val metadataAnnotationVisitor = MetadataAnnotationVisitor()
resolver.getDeclarationsFromPackage(godotEntryBasePackage).forEach { declaration ->
declaration.accept(metadataAnnotationVisitor, Unit)
}


// generate entry files for this compilation
EntryGenerator.generateEntryFiles(
Expand All @@ -51,14 +52,15 @@ internal class RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistration
classRegistrarFromDependencyCount = metadataAnnotationVisitor.registeredClassMetadataContainers.size,
logger = LoggerWrapper(logger),
sourceFiles = registerAnnotationVisitor.sourceFilesContainingRegisteredClasses,
isRegistrationFileHierarchyEnabled = settings.isRegistrationFileHierarchyEnabled,
jvmTypeFqNamesProvider = JvmTypeProvider(),
compilationTimeRelativeRegistrationFilePathProvider = { registeredClass ->
val registrationFile = blackboard
.existingRegistrationFilesMap["${registeredClass.registeredName}.${FileExtensions.GodotKotlinJvm.registrationFile}"]
?.relativeTo(settings.projectBaseDir)
?: File(
provideRegistrationFilePathForInitialGenerationWithoutExtension(
isRegistrationFileHierarchyEnabled = settings.isRegistrationFileHierarchyEnabled,
settings = settings,
fqName = registeredClass.fqName,
registeredName = registeredClass.registeredName,
compilationProjectName = settings.projectName,
Expand Down Expand Up @@ -100,7 +102,7 @@ internal class RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistration
blackboard.alreadyGeneratedRegistrationFiles.add(metadata.fqName)

val registrationFile = provideRegistrationFilePathForInitialGenerationWithoutExtension(
isRegistrationFileHierarchyEnabled = settings.isRegistrationFileHierarchyEnabled,
settings = settings,
fqName = metadata.fqName,
registeredName = metadata.registeredName,
compilationProjectName = settings.projectName,
Expand Down
2 changes: 1 addition & 1 deletion ...ot/annotation/processor/processing/RoundGenerateRegistrationFilesForCurrentCompilation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ internal class RoundGenerateRegistrationFilesForCurrentCompilation(
blackboard.alreadyGeneratedRegistrationFiles.add(metadata.fqName)

val resourcePathFromProjectRoot = provideRegistrationFilePathForInitialGenerationWithoutExtension(
isRegistrationFileHierarchyEnabled = settings.isRegistrationFileHierarchyEnabled,
settings = settings,
fqName = metadata.fqName,
registeredName = metadata.registeredName,
compilationProjectName = settings.projectName,
Expand Down
1 change: 1 addition & 0 deletions ...processor/src/main/kotlin/godot/annotation/processor/visitor/MetadataAnnotationVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ internal class MetadataAnnotationVisitor: KSVisitorVoid() {
signals = annotation.signals,
properties = annotation.properties,
functions = annotation.functions,
isRegistrationFileHierarchyEnabled = annotation.isRegistrationFileHierarchyEnabled
)
)
}
Expand Down
1 change: 1 addition & 0 deletions kt/godot-library/src/main/kotlin/godot/annotation/RegisteredClassMetadata.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ annotation class RegisteredClassMetadata(
val signals: String,
val properties: String,
val functions: String,
val isRegistrationFileHierarchyEnabled: Boolean
)
Loading