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

FIR: fix order of property accessor annotations

Browse Source 
#KT-57219 Fixed
This commit is contained in:
Alexander Udalov
2023-05-17 23:23:58 +02:00
committed by Space Team
parent 9c995755f0
commit 40c628d431
23 changed files with 54 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.descriptors.pretty.txt
Vendored
-3
View File
@@ -1,3 +0,0 @@
@GetAnnotation
@ExplicitGetAnnotation
get()
analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.descriptors.txt
Vendored
-28
View File
@@ -1,28 +0,0 @@
KtPropertyGetterSymbol:
annotationsList: [
GetAnnotation()
psi: KtAnnotationEntry
ExplicitGetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
hasBody: true
hasStableParameterNames: true
isDefault: false
isExtension: false
isInline: false
isOverride: false
modality: FINAL
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Int
symbolKind: ACCESSOR
typeParameters: []
valueParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.pretty.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
@ExplicitGetAnnotation
@GetAnnotation
@ExplicitGetAnnotation
get()
analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
KtPropertyGetterSymbol:
annotationsList: [
ExplicitGetAnnotation()
psi: KtAnnotationEntry
GetAnnotation()
psi: KtAnnotationEntry
ExplicitGetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.pretty.txt
Vendored
-3
View File
@@ -1,3 +0,0 @@
@GetAnnotation
@ExplicitGetAnnotation
get()
analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt
Vendored
-43
View File
@@ -1,43 +0,0 @@
KtPropertyGetterSymbol:
annotationsList: [
GetAnnotation()
psi: KtAnnotationEntry
ExplicitGetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
hasBody: true
hasStableParameterNames: true
isDefault: false
isExtension: false
isInline: false
isOverride: false
modality: FINAL
origin: SOURCE
receiverParameter: KtReceiverParameterSymbol:
annotationsList: [
ReceiverAnnotation()
psi: KtAnnotationEntry
]
origin: SOURCE
owningCallableSymbol: KtKotlinPropertySymbol(/x)
type: KtUsualClassType:
annotationsList: [
ReceiverTypeAnnotation()
psi: KtAnnotationEntry
]
ownTypeArguments: []
type: @R|ReceiverTypeAnnotation|() kotlin/Long
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Int
symbolKind: ACCESSOR
typeParameters: []
valueParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.pretty.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
@ExplicitGetAnnotation
@GetAnnotation
@ExplicitGetAnnotation
get()
analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
KtPropertyGetterSymbol:
annotationsList: [
ExplicitGetAnnotation()
psi: KtAnnotationEntry
GetAnnotation()
psi: KtAnnotationEntry
ExplicitGetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.pretty.txt
Vendored
-8
View File
@@ -1,8 +0,0 @@
@PropertyAnnotation
var x: kotlin.Int
@GetAnnotation
@ExplicitGetAnnotation
get()
@SetAnnotation
@ExplicitSetAnnotation
set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int)
analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt
Vendored
-167
View File
@@ -1,167 +0,0 @@
KtKotlinPropertySymbol:
annotationsList: [
PropertyAnnotation()
psi: KtAnnotationEntry
]
backingFieldSymbol: KtBackingFieldSymbol:
annotationsList: [
FieldAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
isExtension: false
name: field
origin: PROPERTY_BACKING_FIELD
owningProperty: KtKotlinPropertySymbol(/x)
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Int
symbolKind: LOCAL
typeParameters: []
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
callableIdIfNonLocal: /x
contextReceivers: []
getter: KtPropertyGetterSymbol:
annotationsList: [
GetAnnotation()
psi: KtAnnotationEntry
ExplicitGetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
hasBody: true
hasStableParameterNames: true
isDefault: false
isExtension: false
isInline: false
isOverride: false
modality: FINAL
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Int
symbolKind: ACCESSOR
typeParameters: []
valueParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
hasBackingField: true
hasGetter: true
hasSetter: true
initializer: KtConstantInitializerValue(0)
isConst: false
isDelegatedProperty: false
isExtension: false
isFromPrimaryConstructor: false
isLateInit: false
isOverride: false
isStatic: false
isVal: false
modality: FINAL
name: x
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Int
setter: KtPropertySetterSymbol:
annotationsList: [
SetAnnotation()
psi: KtAnnotationEntry
ExplicitSetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
hasBody: true
hasStableParameterNames: true
isDefault: false
isExtension: false
isInline: false
isOverride: false
modality: FINAL
origin: SOURCE
parameter: KtValueParameterSymbol:
annotationsList: [
ExplicitSetparamAnnotation()
psi: KtAnnotationEntry
SetparamAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
generatedPrimaryConstructorProperty: null
hasDefaultValue: false
isCrossinline: false
isExtension: false
isImplicitLambdaParameter: false
isNoinline: false
isVararg: false
name: value
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Int
symbolKind: LOCAL
typeParameters: []
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Unit
symbolKind: ACCESSOR
typeParameters: []
valueParameters: [
KtValueParameterSymbol:
annotationsList: [
ExplicitSetparamAnnotation()
psi: KtAnnotationEntry
SetparamAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
generatedPrimaryConstructorProperty: null
hasDefaultValue: false
isCrossinline: false
isExtension: false
isImplicitLambdaParameter: false
isNoinline: false
isVararg: false
name: value
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Int
symbolKind: LOCAL
typeParameters: []
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
]
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
symbolKind: TOP_LEVEL
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
getterDeprecationStatus: null
javaGetterName: getX
javaSetterName: setX
setterDeprecationStatus: null
analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
@PropertyAnnotation
var x: kotlin.Int
@ExplicitGetAnnotation
@GetAnnotation
@ExplicitGetAnnotation
get()
@ExplicitSetAnnotation
@SetAnnotation
@ExplicitSetAnnotation
set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int)
analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt
Vendored
+4 -4
View File
@@ -27,10 +27,10 @@ KtKotlinPropertySymbol:
contextReceivers: []
getter: KtPropertyGetterSymbol:
annotationsList: [
ExplicitGetAnnotation()
psi: KtAnnotationEntry
GetAnnotation()
psi: KtAnnotationEntry
ExplicitGetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
@@ -75,10 +75,10 @@ KtKotlinPropertySymbol:
type: kotlin/Int
setter: KtPropertySetterSymbol:
annotationsList: [
ExplicitSetAnnotation()
psi: KtAnnotationEntry
SetAnnotation()
psi: KtAnnotationEntry
ExplicitSetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.descriptors.pretty.txt
Vendored
-3
View File
@@ -1,3 +0,0 @@
@SetAnnotation
@ExplicitSetAnnotation
set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int)
analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.descriptors.txt
Vendored
-83
View File
@@ -1,83 +0,0 @@
KtPropertySetterSymbol:
annotationsList: [
SetAnnotation()
psi: KtAnnotationEntry
ExplicitSetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
hasBody: true
hasStableParameterNames: true
isDefault: false
isExtension: false
isInline: false
isOverride: false
modality: FINAL
origin: SOURCE
parameter: KtValueParameterSymbol:
annotationsList: [
ExplicitSetparamAnnotation()
psi: KtAnnotationEntry
SetparamAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
generatedPrimaryConstructorProperty: null
hasDefaultValue: false
isCrossinline: false
isExtension: false
isImplicitLambdaParameter: false
isNoinline: false
isVararg: false
name: value
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Int
symbolKind: LOCAL
typeParameters: []
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Unit
symbolKind: ACCESSOR
typeParameters: []
valueParameters: [
KtValueParameterSymbol:
annotationsList: [
ExplicitSetparamAnnotation()
psi: KtAnnotationEntry
SetparamAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []
generatedPrimaryConstructorProperty: null
hasDefaultValue: false
isCrossinline: false
isExtension: false
isImplicitLambdaParameter: false
isNoinline: false
isVararg: false
name: value
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
annotationsList: []
ownTypeArguments: []
type: kotlin/Int
symbolKind: LOCAL
typeParameters: []
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
]
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null
analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.pretty.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
@ExplicitSetAnnotation
@SetAnnotation
@ExplicitSetAnnotation
set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int)
analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
KtPropertySetterSymbol:
annotationsList: [
ExplicitSetAnnotation()
psi: KtAnnotationEntry
SetAnnotation()
psi: KtAnnotationEntry
ExplicitSetAnnotation()
psi: KtAnnotationEntry
]
callableIdIfNonLocal: null
contextReceivers: []