From 032026278c1894995d1eaf7336e4922718eafaa6 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 14 Nov 2022 12:16:29 +0100 Subject: [PATCH] fix compilation and testData after rebase ^KT-54417 --- .../fir/components/KtFirSymbolInfoProvider.kt | 6 +- .../analysis/api/fir/utils/ktSymbolUtils.kt | 7 +- .../KtCallableReceiverTypeRenderer.kt | 1 + .../api/symbols/DebugSymbolRenderer.kt | 4 +- .../simple.descriptors.txt | 68 ++++++++--- .../scopes/delegatedMemberScope/simple.txt | 9 ++ .../fileScopeTest/fileScope.descriptors.txt | 112 ++++++++++-------- .../scopes/fileScopeTest/fileScope.txt | 112 ++++++++++-------- .../scopes/memberScopeByFqName/javaField.txt | 14 +-- .../memberScopeByFqName/javaFieldClash.txt | 14 +-- .../memberScopeByFqName/javaMethods.txt | 18 +-- ...hReceiverAnnotation.descriptors.pretty.txt | 1 - .../functionWithReceiverAnnotation.txt | 3 + ...WithReceiverAndAnnotations.descriptors.txt | 3 + .../getterWithReceiverAndAnnotations.txt | 3 + .../propertyWithAnnotations.descriptors.txt | 10 +- .../propertyWithAnnotations.txt | 10 +- ...ithAnnotationsAndAccessors.descriptors.txt | 10 +- .../propertyWithAnnotationsAndAccessors.txt | 10 +- ...hReceiverAnnotation.descriptors.pretty.txt | 2 - .../propertyWithReceiverAnnotation.txt | 6 + .../setterWithAnnotations.descriptors.txt | 6 +- .../setterWithAnnotations.txt | 6 +- .../symbols/symbolByPsi/backingField.txt | 10 +- .../classInitializer.descriptors.txt | 6 +- .../symbolByPsi/deprecated.descriptors.txt | 48 ++++---- .../symbols/symbolByPsi/deprecated.txt | 48 ++++---- .../enumEntryFunctions.descriptors.txt | 14 +-- .../symbolByPsi/enumEntryFunctions.txt | 14 +-- .../enumEntryOverride.descriptors.txt | 32 ++--- .../symbols/symbolByPsi/enumEntryOverride.txt | 32 ++--- .../enumEntryProperties.descriptors.txt | 30 +++-- .../symbolByPsi/enumEntryProperties.txt | 30 +++-- .../symbolByPsi/explicitBackingField.txt | 10 +- .../symbols/symbolByPsi/extensionFunction.txt | 3 + .../symbolByPsi/jvmField.descriptors.txt | 20 ++-- .../testData/symbols/symbolByPsi/jvmField.txt | 20 ++-- .../symbolByPsi/jvmName.descriptors.txt | 20 ++-- .../testData/symbols/symbolByPsi/jvmName.txt | 20 ++-- .../memberProperties.descriptors.txt | 20 +++- .../symbols/symbolByPsi/memberProperties.txt | 6 + .../outerAndInnerClasses.descriptors.txt | 4 +- .../symbolByPsi/outerAndInnerClasses.txt | 2 +- .../outerAndInnerTypeAlias.descriptors.txt | 6 +- .../symbolByPsi/outerAndInnerTypeAlias.txt | 6 +- .../symbolByPsi/topLevelProperties.txt | 48 ++++++-- .../constructorValueParameter.txt | 2 +- .../functionReceiverParameter.descriptors.txt | 3 + .../functionReceiverParameter.txt | 5 +- .../javaField.descriptors.txt | 2 +- .../symbols/symbolByReference/javaField.txt | 2 +- .../primaryConstructorValueParameter.txt | 2 +- ...orValueParameterAsProperty.descriptors.txt | 4 +- ...aryConstructorValueParameterAsProperty.txt | 4 +- .../propertyReceiverParameter.descriptors.txt | 6 + .../propertyReceiverParameter.txt | 5 +- .../setterValueParameter.txt | 2 +- .../symbolByReference/valueParameter.txt | 2 +- .../deserialization/ClassDeserialization.kt | 2 +- .../kotlin/fir/backend/ConversionUtils.kt | 2 +- .../kotlin/fir/builder/ConversionUtils.kt | 1 + ...irAnnotationArgumentsMappingTransformer.kt | 12 +- 62 files changed, 554 insertions(+), 386 deletions(-) delete mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt delete mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt index 096031d2894..4f0a22f05e6 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirSyntheticJavaPropertyS import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.utils.errors.requireIsInstance import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.declarations.FirProperty @@ -34,8 +35,8 @@ internal class KtFirSymbolInfoProvider( private val apiVersion = analysisSession.useSiteSession.languageVersionSettings.apiVersion override fun getDeprecation(symbol: KtSymbol): DeprecationInfo? { - if (symbol is KtFirBackingFieldSymbol || symbol is KtFirPackageSymbol) return null - require(symbol is KtFirSymbol<*>) + if (symbol is KtFirBackingFieldSymbol || symbol is KtFirPackageSymbol || symbol is KtReceiverParameterSymbol) return null + require(symbol is KtFirSymbol<*>) { "${this::class}" } return when (val firSymbol = symbol.firSymbol) { is FirPropertySymbol -> { firSymbol.getDeprecationForCallSite(apiVersion, AnnotationUseSiteTarget.PROPERTY) @@ -44,7 +45,6 @@ internal class KtFirSymbolInfoProvider( firSymbol.getDeprecationForCallSite(apiVersion) } } - } override fun getDeprecation(symbol: KtSymbol, annotationUseSiteTarget: AnnotationUseSiteTarget?): DeprecationInfo? { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/ktSymbolUtils.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/ktSymbolUtils.kt index 9e2e8b7fa98..7cb8f9667fb 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/ktSymbolUtils.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/ktSymbolUtils.kt @@ -43,5 +43,8 @@ fun FirBasedSymbol<*>.getContainingKtModule(firResolveSession: LLFirResolveSessi return target.llFirModuleData.ktModule } -fun KtSymbol.getContainingKtModule(firResolveSession: LLFirResolveSession): KtModule = - firSymbol.getContainingKtModule(firResolveSession) \ No newline at end of file +fun KtSymbol.getContainingKtModule(firResolveSession: LLFirResolveSession): KtModule = when (this) { + is KtFirSymbol<*> -> firSymbol.getContainingKtModule(firResolveSession) + is KtReceiverParameterSymbol -> owningCallableSymbol.getContainingKtModule(firResolveSession) + else -> TODO("${this::class}") +} diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableReceiverTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableReceiverTypeRenderer.kt index 0b5f0567ee4..9b4582fc797 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableReceiverTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableReceiverTypeRenderer.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.api.renderer.declarations.renderers.callab import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.declarations.KtDeclarationRenderer import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.receiverType import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter import org.jetbrains.kotlin.types.Variance diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt index 16131cad02f..601cf7e8033 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt @@ -107,14 +107,14 @@ public class DebugSymbolRenderer( } context(KtAnalysisSession) - private fun PrettyPrinter.renderSymbolInternals(symbol: KtSymbol, customIgnoredPropertyNames: List = emptyList()) { + private fun PrettyPrinter.renderSymbolInternals(symbol: KtSymbol) { renderSymbolHeader(symbol) val apiClass = getSymbolApiClass(symbol) withIndent { apiClass.members .asSequence() .filterIsInstance>() - .filter { it.name !in ignoredPropertyNames && it.name !in customIgnoredPropertyNames } + .filter { it.name !in ignoredPropertyNames } .sortedBy { it.name } .forEach { member -> renderProperty( diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.txt index 77a0c61822e..89dc0af5acf 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.txt @@ -14,7 +14,13 @@ KtKotlinPropertySymbol: isOverride: false modality: OPEN origin: DELEGATED - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +44,13 @@ KtKotlinPropertySymbol: modality: OPEN name: zoo origin: DELEGATED - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Unit setter: KtPropertySetterSymbol: annotationsList: [] @@ -65,13 +77,19 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -89,7 +107,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: LOCAL typeParameters: [] @@ -128,7 +146,7 @@ KtFunctionSymbol: modality: OPEN name: foo origin: DELEGATED - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -155,7 +173,13 @@ KtFunctionSymbol: modality: OPEN name: smth origin: DELEGATED - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtFunctionSymbol(/I.smth) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Short symbolKind: CLASS_MEMBER typeParameters: [] @@ -181,7 +205,7 @@ KtKotlinPropertySymbol: isOverride: false modality: OPEN origin: DELEGATED - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -205,7 +229,7 @@ KtKotlinPropertySymbol: modality: OPEN name: foo origin: DELEGATED - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -235,7 +259,7 @@ KtKotlinPropertySymbol: isOverride: false modality: OPEN origin: DELEGATED - receiverType: null + receiverParameter: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -259,7 +283,7 @@ KtKotlinPropertySymbol: modality: OPEN name: bar origin: DELEGATED - receiverType: null + receiverParameter: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -286,13 +310,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -310,7 +334,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -348,7 +372,13 @@ KtKotlinPropertySymbol: isOverride: false modality: OPEN origin: DELEGATED - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/I.doo) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -372,7 +402,13 @@ KtKotlinPropertySymbol: modality: OPEN name: doo origin: DELEGATED - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/I.doo) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt index 080ca178bd6..eddc85fbda1 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt @@ -21,7 +21,10 @@ KtKotlinPropertySymbol: receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: DELEGATED + owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo) type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Unit setter: null symbolKind: CLASS_MEMBER @@ -116,7 +119,10 @@ KtFunctionSymbol: receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: DELEGATED + owningCallableSymbol: KtFunctionSymbol(/I.smth) type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Short symbolKind: CLASS_MEMBER typeParameters: [] @@ -183,7 +189,10 @@ KtKotlinPropertySymbol: receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: DELEGATED + owningCallableSymbol: KtKotlinPropertySymbol(/I.doo) type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt b/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt index a11b04066ad..9cd1fed2f04 100644 --- a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt @@ -26,7 +26,7 @@ KtFunctionSymbol: modality: FINAL name: function origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -55,7 +55,7 @@ KtFunctionSymbol: modality: FINAL name: functionWithDefault origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -73,7 +73,7 @@ KtFunctionSymbol: isVararg: false name: par1 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -100,7 +100,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -123,7 +123,7 @@ KtKotlinPropertySymbol: modality: FINAL name: testVal origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -152,7 +152,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -175,7 +175,7 @@ KtKotlinPropertySymbol: modality: FINAL name: initializedVariable origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -202,13 +202,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -226,7 +226,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -262,7 +262,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -285,7 +285,7 @@ KtKotlinPropertySymbol: modality: FINAL name: unitializedVariable origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -312,13 +312,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -336,7 +336,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -372,7 +372,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -395,7 +395,7 @@ KtKotlinPropertySymbol: modality: FINAL name: lateinitVariable origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [] @@ -422,13 +422,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -446,7 +446,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -482,7 +482,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -505,7 +505,7 @@ KtKotlinPropertySymbol: modality: FINAL name: variableWithBackingField origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -532,13 +532,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -556,7 +556,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -592,7 +592,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -615,7 +615,7 @@ KtKotlinPropertySymbol: modality: FINAL name: privateSetter origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [ @@ -645,13 +645,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -669,7 +669,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -705,7 +705,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -728,7 +728,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmNameOnSetter origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [ @@ -758,13 +758,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -782,7 +782,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -821,7 +821,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -844,7 +844,7 @@ KtKotlinPropertySymbol: modality: FINAL name: customGetter origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -876,7 +876,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -899,7 +899,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmNameOnGetter origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -928,10 +928,13 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: KtReceiverParameterSymbol: + receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver) type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -954,10 +957,13 @@ KtKotlinPropertySymbol: modality: FINAL name: propertyWithReceiver origin: SOURCE - receiver: KtReceiverParameterSymbol: + receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver) type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -986,10 +992,13 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: KtReceiverParameterSymbol: + receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver) type: T + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -1012,10 +1021,13 @@ KtKotlinPropertySymbol: modality: FINAL name: propertyWithGenericReceiver origin: SOURCE - receiver: KtReceiverParameterSymbol: + receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver) type: T + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -1046,7 +1058,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -1069,7 +1081,7 @@ KtKotlinPropertySymbol: modality: FINAL name: constant origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -1098,7 +1110,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -1121,7 +1133,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmField origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -1148,13 +1160,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -1172,7 +1184,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt b/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt index 6429db78c43..4146b6a4c23 100644 --- a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt +++ b/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt @@ -26,7 +26,7 @@ KtFunctionSymbol: modality: FINAL name: function origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -55,7 +55,7 @@ KtFunctionSymbol: modality: FINAL name: functionWithDefault origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -73,7 +73,7 @@ KtFunctionSymbol: isVararg: false name: par1 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -100,7 +100,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -123,7 +123,7 @@ KtKotlinPropertySymbol: modality: FINAL name: testVal origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -152,7 +152,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -175,7 +175,7 @@ KtKotlinPropertySymbol: modality: FINAL name: initializedVariable origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -202,13 +202,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -226,7 +226,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -262,7 +262,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -285,7 +285,7 @@ KtKotlinPropertySymbol: modality: FINAL name: unitializedVariable origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -312,13 +312,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -336,7 +336,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -372,7 +372,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -395,7 +395,7 @@ KtKotlinPropertySymbol: modality: FINAL name: lateinitVariable origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [] @@ -422,13 +422,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -446,7 +446,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -482,7 +482,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -505,7 +505,7 @@ KtKotlinPropertySymbol: modality: FINAL name: variableWithBackingField origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -532,13 +532,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -556,7 +556,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -592,7 +592,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -615,7 +615,7 @@ KtKotlinPropertySymbol: modality: FINAL name: privateSetter origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [ @@ -645,13 +645,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -669,7 +669,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -705,7 +705,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -728,7 +728,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmNameOnSetter origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [ @@ -758,13 +758,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -782,7 +782,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -821,7 +821,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -844,7 +844,7 @@ KtKotlinPropertySymbol: modality: FINAL name: customGetter origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -876,7 +876,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -899,7 +899,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmNameOnGetter origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -928,10 +928,13 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: KtReceiverParameterSymbol: + receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver) type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -954,10 +957,13 @@ KtKotlinPropertySymbol: modality: FINAL name: propertyWithReceiver origin: SOURCE - receiver: KtReceiverParameterSymbol: + receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver) type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -986,10 +992,13 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: KtReceiverParameterSymbol: + receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver) type: T + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -1012,10 +1021,13 @@ KtKotlinPropertySymbol: modality: FINAL name: propertyWithGenericReceiver origin: SOURCE - receiver: KtReceiverParameterSymbol: + receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver) type: T + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -1046,7 +1058,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -1069,7 +1081,7 @@ KtKotlinPropertySymbol: modality: FINAL name: constant origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -1101,7 +1113,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -1124,7 +1136,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmField origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -1151,13 +1163,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -1175,7 +1187,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.txt index cf4d3b9639b..7ed82b8d4e6 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.txt @@ -8,7 +8,7 @@ KtJavaFieldSymbol: modality: OPEN name: field origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -27,7 +27,7 @@ KtJavaFieldSymbol: modality: OPEN name: field2 origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -53,7 +53,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -71,7 +71,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -100,7 +100,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -127,7 +127,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -146,7 +146,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: JAVA - receiverType: null + receiverParameter: null returnType: JavaClass symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.txt index 8eb56f43fe8..7f5f70bb7cf 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.txt @@ -8,7 +8,7 @@ KtJavaFieldSymbol: modality: OPEN name: field origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -27,7 +27,7 @@ KtJavaFieldSymbol: modality: OPEN name: field origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -53,7 +53,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -71,7 +71,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -100,7 +100,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -127,7 +127,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -146,7 +146,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: JAVA - receiverType: null + receiverParameter: null returnType: JavaClass symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.txt index e740cba3d64..d15e0f21e6d 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: OPEN name: foo origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -42,7 +42,7 @@ KtFunctionSymbol: modality: OPEN name: doo origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -60,7 +60,7 @@ KtFunctionSymbol: isVararg: false name: i origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -89,7 +89,7 @@ KtFunctionSymbol: modality: OPEN name: getStringValue origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -116,7 +116,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -134,7 +134,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -163,7 +163,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -190,7 +190,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiverParameter: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -209,7 +209,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: JAVA - receiverType: null + receiverParameter: null returnType: JavaClass symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt deleted file mode 100644 index 33ce30fa3d8..00000000000 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt +++ /dev/null @@ -1 +0,0 @@ -fun @ReceiverTypeAnnotation kotlin.Int.foo() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt index c4f4c1cbcc6..22ac5336516 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt @@ -21,10 +21,13 @@ KtFunctionSymbol: psi: KtAnnotationEntry ] origin: SOURCE + owningCallableSymbol: KtFunctionSymbol(/foo) type: [ ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt index 6f1330a7792..1a00c4a55cf 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt @@ -21,10 +21,13 @@ KtPropertyGetterSymbol: psi: KtAnnotationEntry ] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/x) type: [ ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Long + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.txt index 9c432ec67a1..48ef41a94dd 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.txt @@ -21,10 +21,13 @@ KtPropertyGetterSymbol: psi: KtAnnotationEntry ] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/x) type: [ ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Long + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt index 0c30de8dc98..94b32b938f5 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt @@ -20,7 +20,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -43,7 +43,7 @@ KtKotlinPropertySymbol: modality: FINAL name: prop origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -76,13 +76,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -103,7 +103,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt index 286ec8c555a..db2f506567c 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt @@ -22,7 +22,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -45,7 +45,7 @@ KtKotlinPropertySymbol: modality: FINAL name: prop origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -78,13 +78,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -105,7 +105,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt index bfccb1922a7..9b55618b1f0 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt @@ -22,7 +22,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -45,7 +45,7 @@ KtKotlinPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -82,13 +82,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -111,7 +111,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt index f28781c4c27..2a51a35f505 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt @@ -24,7 +24,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -47,7 +47,7 @@ KtKotlinPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -84,13 +84,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -113,7 +113,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt deleted file mode 100644 index 2cf64df2849..00000000000 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt +++ /dev/null @@ -1,2 +0,0 @@ -val @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean - get() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt index e9688ad58b3..00510fa5010 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt @@ -20,10 +20,13 @@ KtKotlinPropertySymbol: psi: KtAnnotationEntry ] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/prop) type: [ ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Long + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Boolean symbolKind: ACCESSOR typeParameters: [] @@ -52,10 +55,13 @@ KtKotlinPropertySymbol: psi: KtAnnotationEntry ] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/prop) type: [ ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Long + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Boolean setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.descriptors.txt index 8d84fc029e8..01cf0b97a8f 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.descriptors.txt @@ -33,13 +33,13 @@ KtPropertySetterSymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -62,7 +62,7 @@ KtPropertySetterSymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.txt index 76fa8c77253..71e3270aa74 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.txt @@ -33,13 +33,13 @@ KtPropertySetterSymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -62,7 +62,7 @@ KtPropertySetterSymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt index e639a4954b0..8c9d682fdf0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -37,7 +37,7 @@ KtKotlinPropertySymbol: modality: FINAL name: p origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -64,13 +64,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -88,7 +88,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt index bb29b26ae02..2d11fe03829 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -82,4 +82,4 @@ KtNamedClassOrObjectSymbol: typeParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt index 24fe8be1e70..f71b5c30540 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt @@ -17,7 +17,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -40,7 +40,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -72,7 +72,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -95,7 +95,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -124,7 +124,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -147,7 +147,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i3 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -177,13 +177,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -201,7 +201,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -241,7 +241,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -264,7 +264,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i4 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -294,13 +294,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -318,7 +318,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -359,7 +359,7 @@ KtFunctionSymbol: modality: FINAL name: f origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -413,7 +413,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -437,7 +437,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -471,7 +471,7 @@ KtFunctionSymbol: modality: FINAL name: f2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -523,7 +523,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -546,7 +546,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -578,7 +578,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -601,7 +601,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -630,7 +630,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -653,7 +653,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt index 9e8d1d3bad2..ffeb7e280f7 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt @@ -17,7 +17,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -40,7 +40,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -72,7 +72,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -95,7 +95,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -124,7 +124,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -147,7 +147,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i3 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -177,13 +177,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -201,7 +201,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -240,7 +240,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -263,7 +263,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i4 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -293,13 +293,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -317,7 +317,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -357,7 +357,7 @@ KtFunctionSymbol: modality: FINAL name: f origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -411,7 +411,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -435,7 +435,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -469,7 +469,7 @@ KtFunctionSymbol: modality: FINAL name: f2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -521,7 +521,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -544,7 +544,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -576,7 +576,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -599,7 +599,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -631,7 +631,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -654,7 +654,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j2 origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.descriptors.txt index cb12814f043..be446c10f17 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.descriptors.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: a origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -33,7 +33,7 @@ KtEnumEntrySymbol: isExtension: false name: FirstEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -48,7 +48,7 @@ KtEnumEntrySymbol: isExtension: false name: SecondEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -72,7 +72,7 @@ KtFunctionSymbol: modality: FINAL name: one origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -99,7 +99,7 @@ KtFunctionSymbol: modality: FINAL name: one origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -117,7 +117,7 @@ KtFunctionSymbol: isVararg: false name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -137,7 +137,7 @@ KtEnumEntrySymbol: isExtension: false name: ThirdEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.txt index 8dbd33762a5..3caeb6f7bf0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: a origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -33,7 +33,7 @@ KtEnumEntrySymbol: isExtension: false name: FirstEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -48,7 +48,7 @@ KtEnumEntrySymbol: isExtension: false name: SecondEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -72,7 +72,7 @@ KtFunctionSymbol: modality: FINAL name: one origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -99,7 +99,7 @@ KtFunctionSymbol: modality: FINAL name: one origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -117,7 +117,7 @@ KtFunctionSymbol: isVararg: false name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -137,7 +137,7 @@ KtEnumEntrySymbol: isExtension: false name: ThirdEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.txt index bb805921424..082f4d0aad8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: a origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -42,7 +42,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -60,7 +60,7 @@ KtEnumEntrySymbol: isExtension: false name: FirstEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -84,7 +84,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -110,7 +110,7 @@ KtKotlinPropertySymbol: isOverride: true modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -134,7 +134,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -156,7 +156,7 @@ KtEnumEntrySymbol: isExtension: false name: SecondEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -180,7 +180,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -207,7 +207,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -225,7 +225,7 @@ KtFunctionSymbol: isVararg: false name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -245,7 +245,7 @@ KtEnumEntrySymbol: isExtension: false name: ThirdEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -269,7 +269,7 @@ KtFunctionSymbol: modality: ABSTRACT name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -296,7 +296,7 @@ KtFunctionSymbol: modality: OPEN name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -314,7 +314,7 @@ KtFunctionSymbol: isVararg: false name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -342,7 +342,7 @@ KtKotlinPropertySymbol: isOverride: false modality: OPEN origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -366,7 +366,7 @@ KtKotlinPropertySymbol: modality: OPEN name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.txt index 3f31ed73e30..322a8d91c30 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: a origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -42,7 +42,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -60,7 +60,7 @@ KtEnumEntrySymbol: isExtension: false name: FirstEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -84,7 +84,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -110,7 +110,7 @@ KtKotlinPropertySymbol: isOverride: true modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -133,7 +133,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -155,7 +155,7 @@ KtEnumEntrySymbol: isExtension: false name: SecondEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -179,7 +179,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -206,7 +206,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -224,7 +224,7 @@ KtFunctionSymbol: isVararg: false name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -244,7 +244,7 @@ KtEnumEntrySymbol: isExtension: false name: ThirdEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -268,7 +268,7 @@ KtFunctionSymbol: modality: ABSTRACT name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -295,7 +295,7 @@ KtFunctionSymbol: modality: OPEN name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -313,7 +313,7 @@ KtFunctionSymbol: isVararg: false name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -341,7 +341,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -365,7 +365,7 @@ KtKotlinPropertySymbol: modality: OPEN name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.descriptors.txt index 98e9b89dc8b..a09e7005a65 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.descriptors.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: a origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -60,7 +60,7 @@ KtEnumEntrySymbol: isExtension: false name: FirstEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -75,7 +75,7 @@ KtEnumEntrySymbol: isExtension: false name: SecondEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -98,7 +98,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -122,7 +122,7 @@ KtKotlinPropertySymbol: modality: FINAL name: b origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -152,7 +152,13 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/d) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -176,7 +182,13 @@ KtKotlinPropertySymbol: modality: FINAL name: d origin: SOURCE - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/d) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -198,7 +210,7 @@ KtEnumEntrySymbol: isExtension: false name: ThirdEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.txt index 18f12cb8815..1b9bf1b86e3 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: a origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -60,7 +60,7 @@ KtEnumEntrySymbol: isExtension: false name: FirstEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -75,7 +75,7 @@ KtEnumEntrySymbol: isExtension: false name: SecondEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -98,7 +98,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -122,7 +122,7 @@ KtKotlinPropertySymbol: modality: FINAL name: b origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -152,7 +152,13 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/d) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -175,7 +181,13 @@ KtKotlinPropertySymbol: modality: FINAL name: d origin: SOURCE - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/d) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -197,7 +209,7 @@ KtEnumEntrySymbol: isExtension: false name: ThirdEntry origin: SOURCE - receiverType: null + receiverParameter: null returnType: MyEnumClass symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt index e639a4954b0..8c9d682fdf0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -37,7 +37,7 @@ KtKotlinPropertySymbol: modality: FINAL name: p origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -64,13 +64,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -88,7 +88,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt index d6056ad15bf..d4b348996f6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt @@ -18,7 +18,10 @@ KtFunctionSymbol: receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtFunctionSymbol(/foo) type: kotlin/String + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt index 4b7ee249f0e..11516aa22a1 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -37,7 +37,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmField origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -64,13 +64,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -88,7 +88,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -125,7 +125,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -148,7 +148,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmFieldOnField origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -175,13 +175,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -199,7 +199,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt index f4edeb4551d..628c3859f13 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt @@ -17,7 +17,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -40,7 +40,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmField origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -67,13 +67,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -91,7 +91,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -130,7 +130,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -153,7 +153,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmFieldOnField origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -180,13 +180,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiver: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -204,7 +204,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiver: null + receiverParameter: null 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 d0653a7cba6..846b65ba425 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt @@ -17,7 +17,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -41,7 +41,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -71,13 +71,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -95,7 +95,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -136,7 +136,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -160,7 +160,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -190,13 +190,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -214,7 +214,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt index 0ff84cc30cf..024f7d0e8b5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt @@ -17,7 +17,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -41,7 +41,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -71,13 +71,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -95,7 +95,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -136,7 +136,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -159,7 +159,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -189,13 +189,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -213,7 +213,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null 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 3c5592b2c0b..6c00d8630a4 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -68,7 +68,13 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/A.y) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -92,7 +98,13 @@ KtKotlinPropertySymbol: modality: FINAL name: y origin: SOURCE - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/A.y) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt index 3b318672396..5b0f19c2a64 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt @@ -71,7 +71,10 @@ KtKotlinPropertySymbol: receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/A.y) type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -97,7 +100,10 @@ KtKotlinPropertySymbol: receiverParameter: KtReceiverParameterSymbol: annotationsList: [] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/A.y) type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt index c014038cd54..bbbbdec423c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt @@ -394,7 +394,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [ @@ -473,7 +473,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [ diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt index 4ef6fc952fb..1a224c6ece9 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt @@ -394,7 +394,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [ diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.descriptors.txt index c3a400a0d1b..1c1ece5124a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.descriptors.txt @@ -123,7 +123,7 @@ KtFunctionSymbol: modality: FINAL name: check origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -173,7 +173,7 @@ KtFunctionSymbol: modality: FINAL name: check origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -223,7 +223,7 @@ KtFunctionSymbol: modality: FINAL name: check origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt index 6398b1e2a6e..20b5aa3760c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt @@ -123,7 +123,7 @@ KtFunctionSymbol: modality: FINAL name: check origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -173,7 +173,7 @@ KtFunctionSymbol: modality: FINAL name: check origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -223,7 +223,7 @@ KtFunctionSymbol: modality: FINAL name: check origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt index f7ed78eba4e..0a4b8039dc3 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -37,7 +37,7 @@ KtKotlinPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -66,7 +66,13 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/y) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -89,7 +95,13 @@ KtKotlinPropertySymbol: modality: FINAL name: y origin: SOURCE - receiverType: kotlin/Int + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/y) + type: kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -118,7 +130,13 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: kotlin/Short + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/get) + type: kotlin/Short + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -141,7 +159,13 @@ KtKotlinPropertySymbol: modality: FINAL name: get origin: SOURCE - receiverType: kotlin/Short + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/get) + type: kotlin/Short + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -168,13 +192,19 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: kotlin/Short + receiverParameter: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/get) + type: kotlin/Short + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -192,7 +222,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/constructorValueParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/constructorValueParameter.txt index 8cbc139ac95..486a88dab66 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/constructorValueParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/constructorValueParameter.txt @@ -11,7 +11,7 @@ KtValueParameterSymbol: isVararg: false name: abc origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.txt index c4f4c1cbcc6..22ac5336516 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.txt @@ -21,10 +21,13 @@ KtFunctionSymbol: psi: KtAnnotationEntry ] origin: SOURCE + owningCallableSymbol: KtFunctionSymbol(/foo) type: [ ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Int + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.txt index 8ce7fc5c266..88d5e3e232a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.txt @@ -9,6 +9,5 @@ KtReceiverParameterSymbol: ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Int - getContainingModule: Could not render due to java.lang.IllegalArgumentException: Failed requirement. - - deprecationStatus: Could not render due to java.lang.IllegalArgumentException: Failed requirement. + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/javaField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/javaField.descriptors.txt index 5f2d01f50b6..50abae9e41d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/javaField.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/javaField.descriptors.txt @@ -8,7 +8,7 @@ KtJavaFieldSymbol: modality: FINAL name: field origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/javaField.txt b/analysis/analysis-api/testData/symbols/symbolByReference/javaField.txt index 4c33b00b42d..b49b9abc8bf 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/javaField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/javaField.txt @@ -8,7 +8,7 @@ KtJavaFieldSymbol: modality: OPEN name: field origin: JAVA - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameter.txt index 8cbc139ac95..486a88dab66 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameter.txt @@ -11,7 +11,7 @@ KtValueParameterSymbol: isVararg: false name: abc origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.descriptors.txt index 09d955d851b..45e4e815ad1 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.descriptors.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: abc origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.txt index 1aaeefd94a3..771e3fadbff 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: abc origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt index e9688ad58b3..00510fa5010 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt @@ -20,10 +20,13 @@ KtKotlinPropertySymbol: psi: KtAnnotationEntry ] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/prop) type: [ ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Long + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Boolean symbolKind: ACCESSOR typeParameters: [] @@ -52,10 +55,13 @@ KtKotlinPropertySymbol: psi: KtAnnotationEntry ] origin: SOURCE + owningCallableSymbol: KtKotlinPropertySymbol(/prop) type: [ ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Long + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null returnType: kotlin/Boolean setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.txt index c5a9e5e6d3a..8a4934ed57b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.txt @@ -9,6 +9,5 @@ KtReceiverParameterSymbol: ReceiverTypeAnnotation() psi: KtAnnotationEntry ] @R|ReceiverTypeAnnotation|() kotlin/Long - getContainingModule: Could not render due to java.lang.IllegalArgumentException: Failed requirement. - - deprecationStatus: Could not render due to java.lang.IllegalArgumentException: Failed requirement. + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/setterValueParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/setterValueParameter.txt index 603c5e33d22..46d86b5c78b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/setterValueParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/setterValueParameter.txt @@ -11,7 +11,7 @@ KtValueParameterSymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/valueParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/valueParameter.txt index 8cbc139ac95..486a88dab66 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/valueParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/valueParameter.txt @@ -11,7 +11,7 @@ KtValueParameterSymbol: isVararg: false name: abc origin: SOURCE - receiverType: null + receiverParameter: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt index 4beafe1df92..6552756ed8b 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt @@ -219,7 +219,7 @@ fun deserializeClassToSymbol( valueClassRepresentation = classProto.loadValueClassRepresentation(context.nameResolver, context.typeTable, context.typeDeserializer::simpleType) { name -> - val member = declarations.singleOrNull { it is FirProperty && it.receiverTypeRef == null && it.name == name } + val member = declarations.singleOrNull { it is FirProperty && it.receiverParameter == null && it.name == name } (member as FirProperty?)?.returnTypeRef?.coneTypeSafe() } ?: computeValueClassRepresentation(this, session) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt index 4a09180737c..4e94d804ad8 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt @@ -245,7 +245,7 @@ private fun FirCallableSymbol<*>.toSymbolForCall( dispatchReceiver.typeRef.coneType.let { it.findClassRepresentation(it, declarationStorage.session) } } // Unbound callable reference to member (non-extension) - isReference && fir.receiverTypeRef == null -> { + isReference && fir.receiverParameter == null -> { // TODO: remove runIf with StandardClassIds.Any comparison after fixing ValueClass::equals case (KT-54887) runIf(containingClassLookupTag()?.classId != StandardClassIds.Any) { (explicitReceiver as? FirResolvedQualifier)?.toLookupTag() diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt index e331fbd1188..61d324e3f4b 100644 --- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt +++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt @@ -37,6 +37,7 @@ import org.jetbrains.kotlin.fir.symbols.constructStarProjectedType import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.ConeStarProjection +import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.builder.buildImplicitTypeRef import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsMappingTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsMappingTransformer.kt index 165673a8383..f629dc5d555 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsMappingTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsMappingTransformer.kt @@ -67,7 +67,7 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping( context.withSimpleFunction(simpleFunction, session) { simpleFunction .transformReturnTypeRef(transformer, data) - .transformReceiverTypeRef(transformer, data) + .transformReceiverParameter(transformer, data) .transformValueParameters(transformer, data) .transformAnnotations(transformer, data) } @@ -82,7 +82,7 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping( context.withConstructor(constructor) { constructor .transformAnnotations(transformer, data) - .transformReceiverTypeRef(transformer, data) + .transformReceiverParameter(transformer, data) .transformReturnTypeRef(transformer, data) context.forConstructorParameters(constructor, containingClass, components) { @@ -104,13 +104,13 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping( } override fun transformProperty(property: FirProperty, data: ResolutionMode): FirProperty { - property.transformReceiverTypeRef(transformer, ResolutionMode.ContextIndependent) + property.transformReceiverParameter(transformer, ResolutionMode.ContextIndependent) doTransformTypeParameters(property) context.withProperty(property) { property .transformAnnotations(transformer, data) - .transformReceiverTypeRef(transformer, data) + .transformReceiverParameter(transformer, data) .transformReturnTypeRef(transformer, data) .transformGetter(transformer, data) .transformSetter(transformer, data) @@ -126,7 +126,7 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping( propertyAccessor .transformValueParameters(transformer, data) .transformReturnTypeRef(transformer, data) - .transformReceiverTypeRef(transformer, data) + .transformReceiverParameter(transformer, data) .transformReturnTypeRef(transformer, data) .transformAnnotations(transformer, data) return propertyAccessor @@ -140,7 +140,7 @@ private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping( context.forEnumEntry { enumEntry .transformAnnotations(transformer, data) - .transformReceiverTypeRef(transformer, data) + .transformReceiverParameter(transformer, data) .transformReturnTypeRef(transformer, data) .transformTypeParameters(transformer, data) }