azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[psi2ir] Emit source info for annotation parameters

Browse Source 
We need this in the JS IR backend for annotations like
@JsFun and @JsPolyfill
This commit is contained in:
Sergej Jaskiewicz
2022-08-01 22:55:04 +02:00
committed by Space
parent 5fc6097eb6
commit 9dc7fe24f6
5 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt
+10 -4
View File
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.resolve.AnnotationResolver
import org.jetbrains.kotlin.resolve.AnnotationResolverImpl
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.resolve.constants.ConstantValue
import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil
import org.jetbrains.kotlin.resolve.lazy.LazyEntity
import org.jetbrains.kotlin.resolve.scopes.LexicalScope
@@ -108,20 +107,27 @@ class LazyAnnotationDescriptor(
LexicalScope.Base(c.scope, FileDescriptorForVisibilityChecks(source, it))
} ?: c.scope
override val allValueArguments by c.storageManager.createLazyValue {
private val valueArgumentsWithSourceInfo by c.storageManager.createLazyValue {
val resolutionResults = c.annotationResolver.resolveAnnotationCall(annotationEntry, scope, c.trace)
AnnotationResolverImpl.checkAnnotationType(annotationEntry, c.trace, resolutionResults)
if (!resolutionResults.isSingleResult) return@createLazyValue emptyMap<Name, ConstantValue<*>>()
if (!resolutionResults.isSingleResult) return@createLazyValue emptyMap()
resolutionResults.resultingCall.valueArguments.mapNotNull { (valueParameter, resolvedArgument) ->
if (resolvedArgument == null) null
else c.annotationResolver.getAnnotationArgumentValue(c.trace, valueParameter, resolvedArgument)?.let { value ->
valueParameter.name to value
valueParameter.name to (value to resolvedArgument.arguments.firstOrNull()?.getArgumentExpression().toSourceElement())
}
}.toMap()
}
override val allValueArguments by c.storageManager.createLazyValue {
valueArgumentsWithSourceInfo.mapValues { it.value.first }
}
override fun getSourceForArgument(name: Name): SourceElement =
valueArgumentsWithSourceInfo[name]?.second ?: SourceElement.NO_SOURCE
override fun forceResolveAllContents() {
ForceResolveUtil.forceResolveAllContents(type)
allValueArguments