From afe76056498d72cc28e9f77722c3f41a2791e936 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 10 Oct 2022 18:42:24 +0200 Subject: [PATCH] [K1 AA] fix default getter and setter ^KT-54311 --- .../KtFe10PsiDefaultPropertyGetterSymbol.kt | 24 ++- .../KtFe10PsiDefaultPropertySetterSymbol.kt | 26 +-- .../anonymousObject.descriptors.txt | 4 +- .../classInitializer.descriptors.txt | 79 --------- .../symbolByPsi/classMembes.descriptors.txt | 100 ------------ .../symbolByPsi/delegateField.descriptors.txt | 6 +- .../symbolByPsi/deprecated.descriptors.txt | 44 +++-- .../symbolByPsi/dynamic.descriptors.txt | 153 ------------------ .../enumValueMember.descriptors.txt | 2 +- .../symbolByPsi/jvmField.descriptors.txt | 12 +- .../symbolByPsi/jvmName.descriptors.txt | 16 +- .../memberProperties.descriptors.txt | 2 +- .../propertyWithAnnotations.descriptors.txt | 28 +++- .../topLevelProperties.descriptors.txt | 2 +- .../typeAnnotations.descriptors.txt | 5 +- 15 files changed, 102 insertions(+), 401 deletions(-) delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.descriptors.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.descriptors.txt diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt index c8c40e25b9a..4412654014a 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt @@ -6,8 +6,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.analysis.api.annotations.KtAnnotationsList import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade +import org.jetbrains.kotlin.analysis.api.descriptors.annotations.KtFe10AnnotationsList import org.jetbrains.kotlin.analysis.api.descriptors.symbols.base.KtFe10Symbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility @@ -18,22 +20,16 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktMod import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktSymbolOrigin import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached +import org.jetbrains.kotlin.analysis.api.impl.base.annotations.KtEmptyAnnotationsList +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol -import org.jetbrains.kotlin.analysis.api.annotations.KtAnnotationApplication -import org.jetbrains.kotlin.analysis.api.annotations.KtAnnotationsList -import org.jetbrains.kotlin.analysis.api.impl.base.annotations.KtEmptyAnnotationsList import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion -import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.CallableId -import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration import org.jetbrains.kotlin.resolve.BindingContext @@ -42,9 +38,9 @@ class KtFe10PsiDefaultPropertyGetterSymbol( private val propertyPsi: KtProperty, override val analysisContext: Fe10AnalysisContext ) : KtPropertyGetterSymbol(), KtFe10Symbol { - private val descriptor: PropertyDescriptor? by cached { + private val descriptor: PropertyGetterDescriptor? by cached { val bindingContext = analysisContext.analyze(propertyPsi, Fe10AnalysisFacade.AnalysisMode.PARTIAL) - bindingContext[BindingContext.VARIABLE, psi] as? PropertyDescriptor + (bindingContext[BindingContext.VARIABLE, propertyPsi] as? PropertyDescriptor)?.getter } override val origin: KtSymbolOrigin @@ -75,7 +71,7 @@ class KtFe10PsiDefaultPropertyGetterSymbol( get() = withValidityAssertion { null } override val returnType: KtType - get() = withValidityAssertion { descriptor?.type?.toKtType(analysisContext) ?: createErrorType() } + get() = withValidityAssertion { descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType() } override val receiverType: KtType? get() = withValidityAssertion { @@ -93,7 +89,9 @@ class KtFe10PsiDefaultPropertyGetterSymbol( get() = withValidityAssertion { propertyPsi.ktVisibility ?: descriptor?.ktVisibility ?: Visibilities.Public } override val annotationsList: KtAnnotationsList - get() = withValidityAssertion { KtEmptyAnnotationsList(token) } + get() = withValidityAssertion { + descriptor?.let { KtFe10AnnotationsList.create(it.annotations, token) } ?: KtEmptyAnnotationsList(token) + } override fun createPointer(): KtSymbolPointer = withValidityAssertion { return KtFe10NeverRestoringSymbolPointer() diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt index 8e878e465de..2e1004c69fd 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt @@ -9,6 +9,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.annotations.KtAnnotationsList import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade +import org.jetbrains.kotlin.analysis.api.descriptors.annotations.KtFe10AnnotationsList import org.jetbrains.kotlin.analysis.api.descriptors.symbols.base.KtFe10Symbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility @@ -20,16 +21,13 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktSym import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached import org.jetbrains.kotlin.analysis.api.impl.base.annotations.KtEmptyAnnotationsList +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion -import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.Name @@ -41,9 +39,9 @@ class KtFe10PsiDefaultPropertySetterSymbol( private val propertyPsi: KtProperty, override val analysisContext: Fe10AnalysisContext ) : KtPropertySetterSymbol(), KtFe10Symbol { - private val descriptor: PropertyDescriptor? by cached { + private val descriptor: PropertySetterDescriptor? by cached { val bindingContext = analysisContext.analyze(propertyPsi, Fe10AnalysisFacade.AnalysisMode.PARTIAL) - bindingContext[BindingContext.VARIABLE, psi] as? PropertyDescriptor + (bindingContext[BindingContext.VARIABLE, propertyPsi] as? PropertyDescriptor)?.setter } override val origin: KtSymbolOrigin @@ -65,7 +63,7 @@ class KtFe10PsiDefaultPropertySetterSymbol( get() = withValidityAssertion { false } override val parameter: KtValueParameterSymbol by cached { - DefaultKtValueParameterSymbol(propertyPsi, descriptor, analysisContext) + DefaultKtValueParameterSymbol(propertyPsi, descriptor?.valueParameters?.firstOrNull(), analysisContext) } override val valueParameters: List @@ -98,7 +96,9 @@ class KtFe10PsiDefaultPropertySetterSymbol( get() = withValidityAssertion { propertyPsi.ktVisibility ?: descriptor?.ktVisibility ?: Visibilities.Public } override val annotationsList: KtAnnotationsList - get() = withValidityAssertion { KtEmptyAnnotationsList(token) } + get() = withValidityAssertion { + descriptor?.let { KtFe10AnnotationsList.create(it.annotations, token) } ?: KtEmptyAnnotationsList(token) + } override fun createPointer(): KtSymbolPointer = withValidityAssertion { return KtFe10NeverRestoringSymbolPointer() @@ -106,7 +106,7 @@ class KtFe10PsiDefaultPropertySetterSymbol( private class DefaultKtValueParameterSymbol( private val propertyPsi: KtProperty, - private val descriptor: PropertyDescriptor?, + private val descriptor: ValueParameterDescriptor?, override val analysisContext: Fe10AnalysisContext ) : KtValueParameterSymbol(), KtFe10Symbol { override val hasDefaultValue: Boolean @@ -128,7 +128,7 @@ class KtFe10PsiDefaultPropertySetterSymbol( get() = withValidityAssertion { Name.identifier("value") } override val returnType: KtType - get() = withValidityAssertion { descriptor?.type?.toKtType(analysisContext) ?: createErrorType() } + get() = withValidityAssertion { descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType() } override val origin: KtSymbolOrigin get() = withValidityAssertion { propertyPsi.ktSymbolOrigin } @@ -137,7 +137,9 @@ class KtFe10PsiDefaultPropertySetterSymbol( get() = withValidityAssertion { null } override val annotationsList: KtAnnotationsList - get() = withValidityAssertion { KtEmptyAnnotationsList(token) } + get() = withValidityAssertion { + descriptor?.let { KtFe10AnnotationsList.create(it.annotations, token) } ?: KtEmptyAnnotationsList(token) + } override fun createPointer(): KtSymbolPointer = withValidityAssertion { return KtFe10NeverRestoringSymbolPointer() diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt index 26cb69b8777..79e54e19449 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt @@ -42,7 +42,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -107,7 +107,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: java/lang/Runnable symbolKind: ACCESSOR typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt deleted file mode 100644 index b47cc998a0c..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt +++ /dev/null @@ -1,79 +0,0 @@ -KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /A.i - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: ERROR_TYPE - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: i - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - getDispatchReceiver(): A - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getI - javaSetterName: null - setterDeprecationStatus: null - -KtClassInitializerSymbol: - origin: SOURCE - symbolKind: CLASS_MEMBER - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: A - classKind: CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: A - origin: SOURCE - superTypes: [ - kotlin/Any - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.descriptors.txt deleted file mode 100644 index c335c6285fc..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.descriptors.txt +++ /dev/null @@ -1,100 +0,0 @@ -KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /A.a - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: ERROR_TYPE - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtConstantInitializerValue(10) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: a - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - getDispatchReceiver(): A - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getA - javaSetterName: null - setterDeprecationStatus: null - -KtFunctionSymbol: - annotationsList: [] - callableIdIfNonLocal: /A.x - contextReceivers: [] - hasStableParameterNames: true - isBuiltinFunctionInvoke: false - isExtension: false - isExternal: false - isInfix: false - isInline: false - isOperator: false - isOverride: false - isStatic: false - isSuspend: false - modality: FINAL - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: CLASS_MEMBER - typeParameters: [] - valueParameters: [] - visibility: Public - getDispatchReceiver(): A - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: A - classKind: CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: A - origin: SOURCE - superTypes: [ - kotlin/Any - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt index 93fe5333459..a444c6afc1e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt @@ -183,7 +183,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: MyColor symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -249,7 +249,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Lazy symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -300,7 +300,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: MyColor symbolKind: ACCESSOR typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt index 5aca3e23dca..f672c4b634b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt @@ -18,7 +18,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -56,7 +56,10 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: /i2 contextReceivers: [] getter: KtPropertyGetterSymbol: - annotationsList: [] + annotationsList: [ + kotlin/Deprecated(message = "don't use getter of i2") + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] hasBody: false @@ -68,7 +71,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -118,7 +121,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -141,7 +144,10 @@ KtKotlinPropertySymbol: receiverType: null returnType: kotlin/Int setter: KtPropertySetterSymbol: - annotationsList: [] + annotationsList: [ + kotlin/Deprecated(message = "don't use getter of i3") + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] hasBody: false @@ -166,7 +172,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] receiverType: null @@ -188,7 +194,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] ] @@ -208,7 +214,10 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: /i4 contextReceivers: [] getter: KtPropertyGetterSymbol: - annotationsList: [] + annotationsList: [ + kotlin/Deprecated(message = "don't use getter of i4") + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] hasBody: false @@ -220,7 +229,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -243,7 +252,10 @@ KtKotlinPropertySymbol: receiverType: null returnType: kotlin/Int setter: KtPropertySetterSymbol: - annotationsList: [] + annotationsList: [ + kotlin/Deprecated(message = "don't use setter of i4") + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] hasBody: false @@ -268,7 +280,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] receiverType: null @@ -290,7 +302,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] ] @@ -380,7 +392,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -487,7 +499,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -540,7 +552,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -590,7 +602,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.descriptors.txt deleted file mode 100644 index 387233c57c2..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.descriptors.txt +++ /dev/null @@ -1,153 +0,0 @@ -KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /Foo.p - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: ERROR_TYPE - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtConstantInitializerValue(null) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: p - origin: SOURCE - receiverType: null - returnType: dynamic - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - getDispatchReceiver(): Foo - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getP - javaSetterName: null - setterDeprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: p - origin: SOURCE - receiverType: null - returnType: dynamic - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtAnonymousFunctionSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasStableParameterNames: true - isExtension: false - origin: SOURCE - receiverType: null - returnType: dynamic - symbolKind: LOCAL - typeParameters: [] - valueParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtFunctionSymbol: - annotationsList: [] - callableIdIfNonLocal: /Foo.f - contextReceivers: [] - hasStableParameterNames: true - isBuiltinFunctionInvoke: false - isExtension: false - isExternal: false - isInfix: false - isInline: false - isOperator: false - isOverride: false - isStatic: false - isSuspend: false - modality: FINAL - name: f - origin: SOURCE - receiverType: null - returnType: dynamic - symbolKind: CLASS_MEMBER - typeParameters: [] - valueParameters: [ - KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: p - origin: SOURCE - receiverType: null - returnType: dynamic - symbolKind: LOCAL - typeParameters: [] - ] - visibility: Public - getDispatchReceiver(): Foo - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: Foo - classKind: CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: Foo - origin: SOURCE - superTypes: [ - kotlin/Any - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt index 7ee0c1a213d..6edc5c320cb 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt @@ -159,7 +159,7 @@ KtKotlinPropertySymbol: modality: ABSTRACT origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt index 2920971323f..3d41d8ad47c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt @@ -15,7 +15,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -63,7 +63,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] receiverType: null @@ -85,7 +85,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] ] @@ -117,7 +117,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -165,7 +165,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] receiverType: null @@ -187,7 +187,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] ] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt index d915a231f2a..f3eb215d5d6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt @@ -3,7 +3,10 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: /Foo.i contextReceivers: [] getter: KtPropertyGetterSymbol: - annotationsList: [] + annotationsList: [ + kotlin/jvm/JvmName(name = "getMyI") + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] hasBody: false @@ -15,7 +18,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -38,7 +41,10 @@ KtKotlinPropertySymbol: receiverType: null returnType: kotlin/Int setter: KtPropertySetterSymbol: - annotationsList: [] + annotationsList: [ + kotlin/jvm/JvmName(name = "setMyI") + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] hasBody: false @@ -63,7 +69,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] receiverType: null @@ -85,7 +91,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] ] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt index 0d1750b501b..7b5ffce49b4 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt @@ -15,7 +15,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.txt index 645a3646405..8a6f2be33e9 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.txt @@ -121,7 +121,10 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: /prop contextReceivers: [] getter: KtPropertyGetterSymbol: - annotationsList: [] + annotationsList: [ + GetAnnotation() + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] hasBody: false @@ -133,7 +136,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] @@ -156,7 +159,10 @@ KtKotlinPropertySymbol: receiverType: null returnType: kotlin/Int setter: KtPropertySetterSymbol: - annotationsList: [] + annotationsList: [ + SetAnnotation() + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] hasBody: false @@ -168,7 +174,10 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE parameter: KtValueParameterSymbol: - annotationsList: [] + annotationsList: [ + SetparamAnnotation() + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] generatedPrimaryConstructorProperty: null @@ -181,7 +190,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] receiverType: null @@ -190,7 +199,10 @@ KtKotlinPropertySymbol: typeParameters: [] valueParameters: [ KtValueParameterSymbol: - annotationsList: [] + annotationsList: [ + SetparamAnnotation() + psi: KtAnnotationEntry + ] callableIdIfNonLocal: null contextReceivers: [] generatedPrimaryConstructorProperty: null @@ -203,7 +215,7 @@ KtKotlinPropertySymbol: name: value origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] ] @@ -273,7 +285,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt index f1b853bcc74..0073368aba9 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt @@ -15,7 +15,7 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt index c2f855a1bf0..ec2a0b94b86 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt @@ -216,7 +216,10 @@ KtKotlinPropertySymbol: modality: FINAL origin: SOURCE receiverType: null - returnType: ERROR_TYPE + returnType: [ + Anno4() + psi: KtAnnotationEntry + ] @R|Anno4|() I symbolKind: ACCESSOR typeParameters: [] valueParameters: []