annotation call resolver: lookup scope before creating one

(cherry picked from commit 1bf0b8c)
google · Nov 16, 2023 · de324d6 · de324d6
1 parent fcf67b3
commit de324d6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.../src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt b/.../src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt
@@ -193,9 +193,10 @@ fun LazyAnnotationDescriptor.getValueArguments(): Map<Name, ConstantValue<*>> {
         override fun toString(): String = "${name.asString()} declared in LazyAnnotations.kt"
     }
 
-    val scope = (c.scope.ownerDescriptor as? PackageFragmentDescriptor)?.let {
-        LexicalScope.Base(c.scope, FileDescriptorForVisibilityChecks(source, it))
-    } ?: c.scope
+    val scope = c.trace.get(BindingContext.LEXICAL_SCOPE, annotationEntry)
+        ?: (c.scope.ownerDescriptor as? PackageFragmentDescriptor)?.let {
+            LexicalScope.Base(c.scope, FileDescriptorForVisibilityChecks(source, it))
+        } ?: c.scope
 
     val resolutionResults = c.annotationResolver.resolveAnnotationCall(annotationEntry, scope, c.trace)
     AnnotationResolverImpl.checkAnnotationType(annotationEntry, c.trace, resolutionResults)