FIR IDE: fix kotlin origin of annotation call

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
@@ -27,7 +27,7 @@ internal class KtFirAnnotationCall(
override val token: ValidityToken get() = containingDeclaration.token override val token: ValidityToken get() = containingDeclaration.token
override val psi: KtCallElement? by containingDeclaration.withFirAndCache { fir -> 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 { override val classId: ClassId? by cached {
@@ -84,7 +84,7 @@ KtFirFunctionSymbol:
] ]
annotations: [ annotations: [
Anno(param1 = funparam, param2 = 3) Anno(param1 = funparam, param2 = 3)
psi: null psi: KtAnnotationEntry
] ]
callableIdIfNonLocal: /X.x callableIdIfNonLocal: /X.x
dispatchType: X dispatchType: X
@@ -112,7 +112,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
Anno(param1 = param, param2 = 2) Anno(param1 = param, param2 = 2)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: X classIdIfNonLocal: X
classKind: CLASS classKind: CLASS
@@ -72,7 +72,7 @@ KtFirFunctionSymbol:
] ]
annotations: [ annotations: [
Anno(param1 = funparam, param2 = 3) Anno(param1 = funparam, param2 = 3)
psi: null psi: KtAnnotationEntry
] ]
callableIdIfNonLocal: /X.x callableIdIfNonLocal: /X.x
dispatchType: X dispatchType: X
@@ -100,7 +100,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
Anno(param1 = param, param2 = 2) Anno(param1 = param, param2 = 2)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: X classIdIfNonLocal: X
classKind: CLASS classKind: CLASS
@@ -22,7 +22,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue) kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: Anno1 classIdIfNonLocal: Anno1
classKind: ANNOTATION_CLASS classKind: ANNOTATION_CLASS
@@ -48,7 +48,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue) kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: Anno2 classIdIfNonLocal: Anno2
classKind: ANNOTATION_CLASS classKind: ANNOTATION_CLASS
@@ -74,7 +74,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue) kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: Anno3 classIdIfNonLocal: Anno3
classKind: ANNOTATION_CLASS classKind: ANNOTATION_CLASS
@@ -100,7 +100,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue) kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: Anno4 classIdIfNonLocal: Anno4
classKind: ANNOTATION_CLASS classKind: ANNOTATION_CLASS
@@ -144,7 +144,7 @@ KtFirNamedClassOrObjectSymbol:
KtFirValueParameterSymbol: KtFirValueParameterSymbol:
annotatedType: [ annotatedType: [
Anno2() Anno2()
psi: null psi: KtAnnotationEntry
] @R|Anno2|() I ] @R|Anno2|() I
annotationClassIds: [] annotationClassIds: []
annotations: [] annotations: []
@@ -231,7 +231,7 @@ KtFirNamedClassOrObjectSymbol:
superTypes: [ superTypes: [
[ [
Anno1() Anno1()
psi: null psi: KtAnnotationEntry
] @R|Anno2|() I ] @R|Anno2|() I
] ]
symbolKind: TOP_LEVEL symbolKind: TOP_LEVEL
@@ -4,7 +4,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue) kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: Anno1 classIdIfNonLocal: Anno1
classKind: ANNOTATION_CLASS classKind: ANNOTATION_CLASS
@@ -30,7 +30,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue) kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: Anno2 classIdIfNonLocal: Anno2
classKind: ANNOTATION_CLASS classKind: ANNOTATION_CLASS
@@ -56,7 +56,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue) kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: Anno3 classIdIfNonLocal: Anno3
classKind: ANNOTATION_CLASS classKind: ANNOTATION_CLASS
@@ -82,7 +82,7 @@ KtFirNamedClassOrObjectSymbol:
] ]
annotations: [ annotations: [
kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue) kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)
psi: null psi: KtAnnotationEntry
] ]
classIdIfNonLocal: Anno4 classIdIfNonLocal: Anno4
classKind: ANNOTATION_CLASS classKind: ANNOTATION_CLASS
@@ -126,7 +126,7 @@ KtFirNamedClassOrObjectSymbol:
KtFirValueParameterSymbol: KtFirValueParameterSymbol:
annotatedType: [ annotatedType: [
Anno2() Anno2()
psi: null psi: KtAnnotationEntry
] @R|Anno2|() I ] @R|Anno2|() I
annotationClassIds: [] annotationClassIds: []
annotations: [] annotations: []
@@ -142,7 +142,7 @@ KtFirValueParameterSymbol:
KtFirFunctionSymbol: KtFirFunctionSymbol:
annotatedType: [ annotatedType: [
Anno3() Anno3()
psi: null psi: KtAnnotationEntry
] @R|Anno2|() I ] @R|Anno2|() I
annotationClassIds: [] annotationClassIds: []
annotations: [] annotations: []
@@ -171,7 +171,7 @@ KtFirFunctionSymbol:
KtFirKotlinPropertySymbol: KtFirKotlinPropertySymbol:
annotatedType: [ annotatedType: [
Anno4() Anno4()
psi: null psi: KtAnnotationEntry
] @R|Anno2|() I ] @R|Anno2|() I
annotationClassIds: [] annotationClassIds: []
annotations: [] annotations: []
@@ -213,7 +213,7 @@ KtFirNamedClassOrObjectSymbol:
superTypes: [ superTypes: [
[ [
Anno1() Anno1()
psi: null psi: KtAnnotationEntry
] @R|Anno2|() I ] @R|Anno2|() I
] ]
symbolKind: TOP_LEVEL symbolKind: TOP_LEVEL