diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-04-09 16:41:58 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-05-05 00:17:08 +0200 |
| commit | 72044baeff7da702a66b99afa084f3fe9ab7bbc2 (patch) | |
| tree | 8fbcaac0a4bad53d6677279283a4592bc721336e /symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt | |
| parent | 0abfc0068ccf6c1efae91c97ce09a8809eb5da51 (diff) | |
| download | Firmament-72044baeff7da702a66b99afa084f3fe9ab7bbc2.tar.gz Firmament-72044baeff7da702a66b99afa084f3fe9ab7bbc2.tar.bz2 Firmament-72044baeff7da702a66b99afa084f3fe9ab7bbc2.zip | |
fix: Fix (some) parts of custom block rendering.
Diffstat (limited to 'symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt')
| -rw-r--r-- | symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt b/symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt index fe1518f..62fc4b6 100644 --- a/symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt +++ b/symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt @@ -25,7 +25,7 @@ class SubscribeAnnotationProcessor( override fun finish() { subscriptions.sort() if (subscriptions.isEmpty()) return - val subscriptionSet = subscriptions.mapTo(mutableSetOf()) { it.parent.containingFile!! } + val subscriptionSet = subscriptions.mapTo(mutableSetOf()) { it.cf } val dependencies = Dependencies( aggregating = true, *subscriptionSet.toTypedArray()) @@ -38,7 +38,7 @@ class SubscribeAnnotationProcessor( appendLine("// This file is @generated by SubscribeAnnotationProcessor") appendLine("// Do not edit") for (file in subscriptionSet) { - appendLine("// Dependency: ${file.filePath}") + appendLine("// Dependency: ${"TODO"?:file.filePath}") } appendLine("package moe.nea.firmament.annotations.generated.$sourceSetName") appendLine() @@ -48,7 +48,7 @@ class SubscribeAnnotationProcessor( appendLine("class $generatedFileName : SubscriptionList {") appendLine(" override fun provideSubscriptions(addSubscription: (Subscription<*>) -> Unit) {") for (subscription in subscriptions) { - val owner = subscription.parent.qualifiedName!!.asString() + val owner = subscription.pQName.asString() val method = subscription.child.simpleName.asString() val type = subscription.type.declaration.qualifiedName!!.asString() appendLine(" addSubscription(Subscription<$type>(") @@ -75,13 +75,15 @@ class SubscribeAnnotationProcessor( val child: KSFunctionDeclaration, val type: KSType, ) : Comparable<Subscription> { + val cf = parent.containingFile!! + val pQName = parent.qualifiedName!! + val tName = type.declaration.qualifiedName!! override fun compareTo(other: Subscription): Int { - var compare = parent.qualifiedName!!.asString().compareTo(other.parent.qualifiedName!!.asString()) + var compare = pQName.asString().compareTo(other.pQName.asString()) if (compare != 0) return compare compare = other.child.simpleName.asString().compareTo(child.simpleName.asString()) if (compare != 0) return compare - compare = other.type.declaration.qualifiedName!!.asString() - .compareTo(type.declaration.qualifiedName!!.asString()) + compare = other.tName.asString().compareTo(tName.asString()) if (compare != 0) return compare return 0 } |