fix package name for library based symbols

google · May 7, 2024 · 6b8a9ed · 6b8a9ed
1 parent 486e131
commit 6b8a9ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/...i/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/AbstractKSDeclarationImpl.kt b/...i/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/AbstractKSDeclarationImpl.kt
@@ -79,16 +79,19 @@ abstract class AbstractKSDeclarationImpl(val ktDeclarationSymbol: KtDeclarationS
 
     override val packageName: KSName by lazy {
         // source
-        containingFile?.packageName
+        if (origin == Origin.KOTLIN || origin == Origin.JAVA) {
+            containingFile!!.packageName
+        } else {
             // top level declaration
-            ?: when (ktDeclarationSymbol) {
+            when (ktDeclarationSymbol) {
                 is KtClassLikeSymbol -> ktDeclarationSymbol.classIdIfNonLocal?.packageFqName?.asString()
                 is KtCallableSymbol -> ktDeclarationSymbol.callableIdIfNonLocal?.packageName?.asString()
                 else -> null
             }?.let { KSNameImpl.getCached(it) }
-            //  null -> non top level declaration, find in parent
-            ?: ktDeclarationSymbol.getContainingKSSymbol()?.packageName
-            ?: throw IllegalStateException("failed to find package name for $this")
+                //  null -> non top level declaration, find in parent
+                ?: ktDeclarationSymbol.getContainingKSSymbol()?.packageName
+                ?: throw IllegalStateException("failed to find package name for $this")
+        }
     }
 
     override val typeParameters: List<KSTypeParameter> by lazy {

diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/FunctionTypeProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/FunctionTypeProcessor.kt
@@ -37,7 +37,11 @@ open class FunctionTypeProcessor : AbstractTestProcessor() {
                         val type = property.type.resolve()
                         val propertyName = property.simpleName.asString()
                         val typeName = type.declaration.simpleName.asString()
-                        results.add("$propertyName: $typeName : ${type.isFunctionType}, ${type.isSuspendFunctionType}, ${type.declaration.qualifiedName!!.asString()}, ${type.declaration.packageName.asString()}")
+                        results.add(
+                            "$propertyName: $typeName : ${type.isFunctionType}, " +
+                                "${type.isSuspendFunctionType}, ${type.declaration.qualifiedName!!.asString()}, " +
+                                "${type.declaration.packageName.asString()}"
+                        )
                     }
                 },
                 Unit