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

FIR IDE: fix kotlin origin of annotation call

Browse Source
This commit is contained in:
Jinseong Jeon
2021-07-27 15:12:49 -07:00
committed by Ilya Kirillov
parent c559adc0fb
commit c597ee0e34
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/KtFirAnnotationCall.kt
+1 -1
View File
@@ -27,7 +27,7 @@ internal class KtFirAnnotationCall(
override val token: ValidityToken get() = containingDeclaration.token
override val psi: KtCallElement? by containingDeclaration.withFirAndCache { fir ->
fir.findPsi(fir.moduleData.session) as? KtCallElement
annotationCallRef.findPsi(fir.moduleData.session) as? KtCallElement
}
override val classId: ClassId? by cached {
idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt
Vendored
+2 -2
View File
@@ -84,7 +84,7 @@ KtFirFunctionSymbol:
]
annotations: [
Anno(param1 = funparam, param2 = 3)
psi: null
psi: KtAnnotationEntry
]
callableIdIfNonLocal: /X.x
dispatchType: X
@@ -112,7 +112,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
Anno(param1 = param, param2 = 2)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: X
classKind: CLASS
idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.txt
Vendored
+2 -2
View File
@@ -72,7 +72,7 @@ KtFirFunctionSymbol:
]
annotations: [
Anno(param1 = funparam, param2 = 3)
psi: null
psi: KtAnnotationEntry
]
callableIdIfNonLocal: /X.x
dispatchType: X
@@ -100,7 +100,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
Anno(param1 = param, param2 = 2)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: X
classKind: CLASS
idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt
Vendored
+6 -6
View File
@@ -22,7 +22,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: Anno1
classKind: ANNOTATION_CLASS
@@ -48,7 +48,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: Anno2
classKind: ANNOTATION_CLASS
@@ -74,7 +74,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: Anno3
classKind: ANNOTATION_CLASS
@@ -100,7 +100,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: Anno4
classKind: ANNOTATION_CLASS
@@ -144,7 +144,7 @@ KtFirNamedClassOrObjectSymbol:
KtFirValueParameterSymbol:
annotatedType: [
Anno2()
psi: null
psi: KtAnnotationEntry
] @R|Anno2|() I
annotationClassIds: []
annotations: []
@@ -231,7 +231,7 @@ KtFirNamedClassOrObjectSymbol:
superTypes: [
[
Anno1()
psi: null
psi: KtAnnotationEntry
] @R|Anno2|() I
]
symbolKind: TOP_LEVEL
idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.txt
Vendored
+8 -8
View File
@@ -4,7 +4,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: Anno1
classKind: ANNOTATION_CLASS
@@ -30,7 +30,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: Anno2
classKind: ANNOTATION_CLASS
@@ -56,7 +56,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: Anno3
classKind: ANNOTATION_CLASS
@@ -82,7 +82,7 @@ KtFirNamedClassOrObjectSymbol:
]
annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null
psi: KtAnnotationEntry
]
classIdIfNonLocal: Anno4
classKind: ANNOTATION_CLASS
@@ -126,7 +126,7 @@ KtFirNamedClassOrObjectSymbol:
KtFirValueParameterSymbol:
annotatedType: [
Anno2()
psi: null
psi: KtAnnotationEntry
] @R|Anno2|() I
annotationClassIds: []
annotations: []
@@ -142,7 +142,7 @@ KtFirValueParameterSymbol:
KtFirFunctionSymbol:
annotatedType: [
Anno3()
psi: null
psi: KtAnnotationEntry
] @R|Anno2|() I
annotationClassIds: []
annotations: []
@@ -171,7 +171,7 @@ KtFirFunctionSymbol:
KtFirKotlinPropertySymbol:
annotatedType: [
Anno4()
psi: null
psi: KtAnnotationEntry
] @R|Anno2|() I
annotationClassIds: []
annotations: []
@@ -213,7 +213,7 @@ KtFirNamedClassOrObjectSymbol:
superTypes: [
[
Anno1()
psi: null
psi: KtAnnotationEntry
] @R|Anno2|() I
]
symbolKind: TOP_LEVEL