restore annotations on type alias

(cherry picked from commit 024b17a)
google · Jan 18, 2024 · 57bb735 · 57bb735
1 parent e7b4b2f
commit 57bb735
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeImpl.kt
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.builtins.isKFunctionType
 import org.jetbrains.kotlin.builtins.isKSuspendFunctionType
 import org.jetbrains.kotlin.builtins.isSuspendFunctionType
 import org.jetbrains.kotlin.descriptors.NotFoundClasses
-import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.types.typeUtil.TypeNullability
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
@@ -145,8 +144,7 @@ fun getKSTypeCached(
         KSTypeImpl.getCached(
             kotlinType,
             ksTypeArguments,
-            annotations + kotlinType.annotations
-                .filter { it.source == SourceElement.NO_SOURCE }
+            kotlinType.annotations
                 .map { KSAnnotationDescriptorImpl.getCached(it, null) }
                 .asSequence()
         )

diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/TypeAnnotationProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/TypeAnnotationProcessor.kt
@@ -13,9 +13,15 @@ class TypeAnnotationProcessor : AbstractTestProcessor() {
     }
 
     override fun process(resolver: Resolver): List<KSAnnotated> {
-        val myList = resolver.getClassDeclarationByName("MyClass")!!.getDeclaredProperties().single()
+        val myList = resolver.getClassDeclarationByName("MyClass")!!.getDeclaredProperties().single {
+            it.simpleName.asString() == "myList"
+        }
+        val myAlias = resolver.getClassDeclarationByName("MyClass")!!.getDeclaredProperties().single {
+            it.simpleName.asString() == "myAlias"
+        }
         val myStringClass = resolver.getClassDeclarationByName("MyStringClass")!!.asStarProjectedType()
         result.add(myList.type.resolve().annotations.joinToString())
+        result.add(myAlias.type.resolve().annotations.joinToString())
         result.add(myList.asMemberOf(myStringClass).annotations.joinToString())
         result.add(myList.type.resolve().let { it.replace(it.arguments) }.annotations.joinToString())
         result.add(myList.type.resolve().starProjection().annotations.joinToString())

diff --git a/test-utils/testData/api/typeAnnotation.kt b/test-utils/testData/api/typeAnnotation.kt
@@ -20,13 +20,16 @@
 // TEST PROCESSOR: TypeAnnotationProcessor
 // EXPECTED:
 // @JvmSuppressWildcards
+// @JvmWildcard
 // @JvmSuppressWildcards
 // @JvmSuppressWildcards
 // @JvmSuppressWildcards
 // END
-
+interface MyType
+typealias MyAlias = @JvmWildcard MyType
 class MyClass<T> {
     var myList: @JvmSuppressWildcards List<Foo> = TODO()
+    var myAlias: MyAlias = TODO()
 }
 
 class MyStringClass: MyClass<String> {}