From 2741052db35d4608072548fcb0ca93d943ec8d96 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Tue, 18 Oct 2022 11:08:23 +0200 Subject: [PATCH] [AA] integrate KtReceiverParameterSymbol to KtCallableSymbol ^KT-54417 --- .../KtFe10DescAnonymousFunctionSymbol.kt | 12 +- .../KtFe10DescDefaultPropertyGetterSymbol.kt | 12 +- .../KtFe10DescDefaultPropertySetterSymbol.kt | 7 +- .../KtFe10DescFunctionSymbol.kt | 7 +- .../KtFe10DescKotlinPropertySymbol.kt | 13 +- .../KtFe10DescPropertyGetterSymbol.kt | 9 +- .../KtFe10DescPropertySetterSymbol.kt | 9 +- .../KtFe10DescSamConstructorSymbol.kt | 13 +- .../KtFe10DescSyntheticJavaPropertySymbol.kt | 8 +- ...cSyntheticJavaPropertySymbolForOverride.kt | 8 +- .../KtFe10PsiAnonymousFunctionSymbol.kt | 11 +- .../KtFe10PsiDefaultPropertyGetterSymbol.kt | 14 +- .../KtFe10PsiDefaultPropertySetterSymbol.kt | 14 +- .../psiBased/KtFe10PsiFunctionSymbol.kt | 14 +- .../psiBased/KtFe10PsiKotlinPropertySymbol.kt | 28 +- ...KtFe10PsiLiteralAnonymousFunctionSymbol.kt | 14 +- .../psiBased/KtFe10PsiPropertyGetterSymbol.kt | 13 +- .../psiBased/KtFe10PsiPropertySetterSymbol.kt | 16 +- .../symbols/KtFirAnonymousFunctionSymbol.kt | 5 +- .../api/fir/symbols/KtFirFunctionSymbol.kt | 3 +- .../fir/symbols/KtFirKotlinPropertySymbol.kt | 2 +- .../fir/symbols/KtFirPropertyGetterSymbol.kt | 5 +- .../fir/symbols/KtFirPropertySetterSymbol.kt | 3 +- .../fir/symbols/KtFirSamConstructorSymbol.kt | 5 +- .../KtFirSyntheticJavaPropertySymbol.kt | 2 +- .../fir/symbols/KtFirTypeAndAnnotations.kt | 5 +- .../AbstractKtSignatureSubstitutorImpl.kt | 12 +- ...stractAnalysisApiSignatureContractsTest.kt | 4 +- .../base/test/cases/components/testUtils.kt | 4 +- .../api/symbols/DebugSymbolRenderer.kt | 6 +- .../analysis/api/symbols/KtCallableSymbol.kt | 2 +- .../api/symbols/KtFunctionLikeSymbol.kt | 5 +- .../api/symbols/KtVariableLikeSymbol.kt | 13 +- .../innerClassTypeParamsSubstitution.txt | 20 +- .../scopeProvider/typeScope/intList.txt | 48 +-- .../outerClassTypeParamsSubstitution.txt | 18 +- .../typeScope/outerTypeParamsSubstitution.txt | 18 +- .../scopeProvider/typeScope/typeParamList.txt | 48 +-- .../propertyWithGetter.descriptors.txt | 4 +- .../propertyWithGetter.txt | 2 +- .../scopes/delegatedMemberScope/simple.txt | 21 +- .../delegatedMemberScope/withOverridden.txt | 2 +- .../fileScopeTest/fileScope.descriptors.txt | 112 +++--- .../scopes/fileScopeTest/fileScope.txt | 112 +++--- .../scopes/fileScopeTest/simpleFileScope.txt | 6 +- .../scopes/memberScopeByFqName/Int.txt | 238 +++++------ .../memberScopeByFqName/MutableList.txt | 92 ++--- .../scopes/memberScopeByFqName/enumEntry.txt | 28 +- .../memberScopeByFqName/java.lang.String.txt | 378 +++++++++--------- .../memberScopeByFqName/kotlin.Function2.txt | 14 +- .../customSerlializable.txt | 18 +- .../generatedCompanionWithFoo.txt | 12 +- .../nestedClassAndMaterializeMember.txt | 12 +- .../functionWithReceiverAnnotation.txt | 14 +- .../getterWithAnnotations.descriptors.txt | 2 +- .../getterWithAnnotations.txt | 2 +- ...WithReceiverAndAnnotations.descriptors.txt | 14 +- .../getterWithReceiverAndAnnotations.txt | 14 +- ...WithDelegateAndAnnotations.descriptors.txt | 4 +- .../propertyWithDelegateAndAnnotations.txt | 4 +- .../propertyWithReceiverAnnotation.txt | 28 +- .../symbolByFqName/enumEntry.descriptors.txt | 2 +- .../symbols/symbolByFqName/enumEntry.txt | 2 +- .../fileWalkDirectionEnum.descriptors.txt | 10 +- .../symbolByFqName/fileWalkDirectionEnum.txt | 10 +- .../memberFunction.descriptors.txt | 4 +- .../symbols/symbolByFqName/memberFunction.txt | 4 +- ...emberFunctionWithOverloads.descriptors.txt | 6 +- .../memberFunctionWithOverloads.txt | 6 +- .../symbolByPsi/annotations.descriptors.txt | 16 +- .../symbols/symbolByPsi/annotations.txt | 16 +- .../anonymousObject.descriptors.txt | 10 +- .../symbols/symbolByPsi/anonymousObject.txt | 10 +- .../symbols/symbolByPsi/backingField.txt | 10 +- .../symbols/symbolByPsi/classInitializer.txt | 4 +- .../symbols/symbolByPsi/classMembes.txt | 6 +- .../classPrimaryConstructor.descriptors.txt | 10 +- .../symbolByPsi/classPrimaryConstructor.txt | 10 +- .../classSecondaryConstructors.txt | 12 +- .../contextReceiversOnClass.txt | 4 +- .../contextReceiversOnFunction.txt | 2 +- .../contextReceiversOnProperty.txt | 4 +- .../symbolByPsi/delegateField.descriptors.txt | 36 +- .../symbols/symbolByPsi/delegateField.txt | 36 +- .../symbolByPsi/deprecated.descriptors.txt | 48 +-- .../symbols/symbolByPsi/deprecated.txt | 48 +-- .../destructuringDeclaration.descriptors.txt | 20 +- .../symbolByPsi/destructuringDeclaration.txt | 20 +- .../testData/symbols/symbolByPsi/dynamic.txt | 10 +- .../testData/symbols/symbolByPsi/enum.txt | 4 +- .../enumValueMember.descriptors.txt | 18 +- .../symbols/symbolByPsi/enumValueMember.txt | 18 +- .../symbolByPsi/explicitBackingField.txt | 10 +- .../symbols/symbolByPsi/extensionFunction.txt | 5 +- .../symbols/symbolByPsi/forLoopVariable.txt | 4 +- .../testData/symbols/symbolByPsi/function.txt | 4 +- .../symbolByPsi/functionWithTypeParams.txt | 4 +- .../implicitConstructorDelegationCall.txt | 4 +- .../symbols/symbolByPsi/implicitReturn.txt | 2 +- .../symbolByPsi/implicitReturnInLambda.txt | 28 +- .../symbolByPsi/jvmField.descriptors.txt | 20 +- .../testData/symbols/symbolByPsi/jvmField.txt | 20 +- .../symbols/symbolByPsi/localDeclarations.txt | 6 +- .../symbols/symbolByPsi/memberFunctions.txt | 4 +- .../symbols/symbolByPsi/memberProperties.txt | 14 +- .../symbolByPsi/outerAndInnerClasses.txt | 2 +- .../symbols/symbolByPsi/topLevelFunctions.txt | 4 +- .../typeAnnotations.descriptors.txt | 8 +- .../symbols/symbolByPsi/typeAnnotations.txt | 8 +- .../valueParameters/parameterInlining.txt | 8 +- .../symbols/symbolByPsi/varargFunctions.txt | 16 +- .../symbolByReference/accessorField.txt | 2 +- .../constructorViaTypeAlias.descriptors.txt | 4 +- .../constructorViaTypeAlias.txt | 4 +- .../explicitLambdaParameter.txt | 2 +- .../functionReceiverParameter.descriptors.txt | 14 +- .../genericFromFunctionInLocalClass.txt | 2 +- ...FromOuterClassInInnerClass.descriptors.txt | 2 +- .../genericFromOuterClassInInnerClass.txt | 2 +- .../implicitLambdaParameter.txt | 2 +- .../propertyReceiverParameter.descriptors.txt | 28 +- .../samConstructor.descriptors.txt | 4 +- .../symbolByReference/samConstructor.txt | 4 +- ...siDeclarationAndKtSymbolEqualityChecker.kt | 2 +- .../SymbolLightParameterForReceiver.kt | 18 +- 125 files changed, 1169 insertions(+), 1091 deletions(-) diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescAnonymousFunctionSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescAnonymousFunctionSymbol.kt index bbcd2f1d4ad..dd5786abd98 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescAnonymousFunctionSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescAnonymousFunctionSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -8,14 +8,12 @@ package org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased import org.jetbrains.kotlin.analysis.api.base.KtContextReceiver import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.KtFe10DescMemberSymbol -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.createContextReceivers -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktHasStableParameterNames -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.* import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtAnonymousFunctionSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -40,8 +38,8 @@ internal class KtFe10DescAnonymousFunctionSymbol( override val returnType: KtType get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtType(analysisContext) } - override val receiverType: KtType? - get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val contextReceivers: List get() = withValidityAssertion { descriptor.createContextReceivers(analysisContext) } diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertyGetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertyGetterSymbol.kt index 839e6c09ac8..3949e4dd058 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertyGetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertyGetterSymbol.kt @@ -1,10 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -/* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -21,6 +16,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10Neve import org.jetbrains.kotlin.analysis.api.impl.base.annotations.KtEmptyAnnotationsList import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -64,8 +60,8 @@ class KtFe10DescDefaultPropertyGetterSymbol( override val psi: PsiElement? get() = withValidityAssertion { null } - override val receiverType: KtType? - get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val modality: Modality get() = withValidityAssertion { propertyDescriptor.ktModality } diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertySetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertySetterSymbol.kt index 5c170613490..fc23a75a7b3 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertySetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertySetterSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached import org.jetbrains.kotlin.analysis.api.impl.base.annotations.KtEmptyAnnotationsList import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -66,8 +67,8 @@ internal class KtFe10DescDefaultPropertySetterSymbol( override val psi: PsiElement? get() = withValidityAssertion { null } - override val receiverType: KtType? - get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val modality: Modality get() = withValidityAssertion { propertyDescriptor.ktModality } diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt index 4a65ffeeb1b..5cd0150652c 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10Neve import org.jetbrains.kotlin.analysis.api.impl.base.util.kotlinFunctionInvokeCallableIds import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind @@ -75,8 +76,8 @@ internal class KtFe10DescFunctionSymbol private constructor( override val returnType: KtType get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtType(analysisContext) } - override val receiverType: KtType? - get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val contextReceivers: List get() = withValidityAssertion { descriptor.createContextReceivers(analysisContext) } diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt index e7460584db0..0636abbfffd 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -12,15 +12,12 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.* import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer -import org.jetbrains.kotlin.analysis.api.symbols.KtKotlinPropertySymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion +import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl import org.jetbrains.kotlin.name.CallableId @@ -92,8 +89,8 @@ internal class KtFe10DescKotlinPropertySymbol( override val returnType: KtType get() = withValidityAssertion { descriptor.type.toKtType(analysisContext) } - override val receiverType: KtType? - get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val contextReceivers: List get() = withValidityAssertion { descriptor.createContextReceivers(analysisContext) } diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt index 4504771bb71..9c4b9b0e392 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -10,12 +10,13 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.* import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor import org.jetbrains.kotlin.descriptors.hasBody import org.jetbrains.kotlin.name.CallableId @@ -49,8 +50,8 @@ internal class KtFe10DescPropertyGetterSymbol( override val returnType: KtType get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtType(analysisContext) } - override val receiverType: KtType? - get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override fun createPointer(): KtSymbolPointer = withValidityAssertion { return KtPsiBasedSymbolPointer.createForSymbolFromSource(this) ?: KtFe10NeverRestoringSymbolPointer() diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt index 17830ae26de..fbe48d5cc62 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -10,12 +10,13 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.* import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.descriptors.PropertySetterDescriptor import org.jetbrains.kotlin.descriptors.hasBody import org.jetbrains.kotlin.name.CallableId @@ -51,8 +52,8 @@ internal class KtFe10DescPropertySetterSymbol( override val parameter: KtValueParameterSymbol get() = withValidityAssertion { KtFe10DescValueParameterSymbol(descriptor.valueParameters.single(), analysisContext) } - override val receiverType: KtType? - get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override fun createPointer(): KtSymbolPointer { withValidityAssertion { diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt index 673fc0bbe27..d9875185ec6 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -12,14 +12,11 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.bas import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10DescSamConstructorSymbolPointer import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer -import org.jetbrains.kotlin.analysis.api.symbols.KtSamConstructorSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin -import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion +import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion -import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.calls.inference.returnTypeOrNothing @@ -48,8 +45,8 @@ internal class KtFe10DescSamConstructorSymbol( override val returnType: KtType get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtType(analysisContext) } - override val receiverType: KtType? - get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val contextReceivers: List get() = withValidityAssertion { descriptor.createContextReceivers(analysisContext) } diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt index b18b0b279b8..8b6eabe42a0 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -11,11 +11,11 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.* import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.Name @@ -83,8 +83,8 @@ internal class KtFe10DescSyntheticJavaPropertySymbol( override val returnType: KtType get() = withValidityAssertion { descriptor.type.toKtType(analysisContext) } - override val receiverType: KtType? - get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val typeParameters: List diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt index f332033e21b..afbe778f122 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -11,11 +11,11 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.* import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaForKotlinOverridePropertyDescriptor import org.jetbrains.kotlin.name.CallableId @@ -83,8 +83,8 @@ internal class KtFe10DescSyntheticJavaPropertySymbolForOverride( override val returnType: KtType get() = withValidityAssertion { descriptor.type.toKtType(analysisContext) } - override val receiverType: KtType? - get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) } + override val receiver: KtReceiverParameterSymbol? + get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val typeParameters: List get() = withValidityAssertion { descriptor.typeParameters.map { it.toKtTypeParameter(analysisContext) } } diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiAnonymousFunctionSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiAnonymousFunctionSymbol.kt index c5ad22b4204..90110af81b1 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiAnonymousFunctionSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiAnonymousFunctionSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -9,7 +9,9 @@ import org.jetbrains.kotlin.analysis.api.base.KtContextReceiver import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode +import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.createContextReceivers +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer @@ -18,6 +20,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.creat import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtAnonymousFunctionSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -47,15 +50,13 @@ internal class KtFe10PsiAnonymousFunctionSymbol( descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType() } - override val receiverType: KtType? + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { if (!psi.isExtensionDeclaration()) { return null } - val descriptor = this.descriptor ?: return createErrorType() - val extensionReceiverParameter = descriptor.extensionReceiverParameter ?: return null - return extensionReceiverParameter.type.toKtType(analysisContext) + return descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val contextReceivers: List diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt index 2f95fc7cd74..c1dc0c75ffe 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.base.KtFe10Symbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer @@ -25,6 +26,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached import org.jetbrains.kotlin.analysis.api.impl.base.annotations.KtEmptyAnnotationsList import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -75,13 +77,13 @@ internal class KtFe10PsiDefaultPropertyGetterSymbol( override val returnType: KtType get() = withValidityAssertion { descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType() } - override val receiverType: KtType? + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { - return if (propertyPsi.isExtensionDeclaration()) { - descriptor?.extensionReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType() - } else { - null + if (!propertyPsi.isExtensionDeclaration()) { + return null } + + descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val modality: Modality diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt index d03a05be924..1d9f7e63b3f 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.base.KtFe10Symbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer @@ -25,6 +26,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached import org.jetbrains.kotlin.analysis.api.impl.base.annotations.KtEmptyAnnotationsList import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -82,13 +84,13 @@ internal class KtFe10PsiDefaultPropertySetterSymbol( return analysisContext.builtIns.unitType.toKtType(analysisContext) } - override val receiverType: KtType? + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { - return if (propertyPsi.isExtensionDeclaration()) { - descriptor?.extensionReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType() - } else { - null + if (!propertyPsi.isExtensionDeclaration()) { + return null } + + descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val modality: Modality diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt index b82af07c1a7..f237fe5983f 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -9,17 +9,15 @@ import org.jetbrains.kotlin.analysis.api.base.KtContextReceiver import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.createContextReceivers -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.* import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.* import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached import org.jetbrains.kotlin.analysis.api.impl.base.util.kotlinFunctionInvokeCallableIds import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind @@ -82,15 +80,13 @@ internal class KtFe10PsiFunctionSymbol( override val returnType: KtType get() = withValidityAssertion { descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType() } - override val receiverType: KtType? + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { if (!psi.isExtensionDeclaration()) { return null } - val descriptor = this.descriptor ?: return createErrorType() - val extensionReceiverParameter = descriptor.extensionReceiverParameter ?: return null - return extensionReceiverParameter.type.toKtType(analysisContext) + return descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val contextReceivers: List diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt index 6c185d2d334..4642bf00338 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -10,27 +10,17 @@ import org.jetbrains.kotlin.analysis.api.base.KtContextReceiver import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.* -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.createKtInitializerValue -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.* import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.* -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktModality -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktSymbolKind -import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached -import org.jetbrains.kotlin.analysis.api.symbols.KtKotlinPropertySymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion +import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.Visibilities @@ -111,13 +101,13 @@ internal class KtFe10PsiKotlinPropertySymbol( override val returnType: KtType get() = withValidityAssertion { descriptor?.type?.toKtType(analysisContext) ?: createErrorType() } - override val receiverType: KtType? + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { - return if (psi.isExtensionDeclaration()) { - descriptor?.extensionReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType() - } else { - null + if (!psi.isExtensionDeclaration()) { + return null } + + descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val contextReceivers: List diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiLiteralAnonymousFunctionSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiLiteralAnonymousFunctionSymbol.kt index 3157d956349..39a90fab8b7 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiLiteralAnonymousFunctionSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiLiteralAnonymousFunctionSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.KtFe10DescValueParameterSymbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.createContextReceivers +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer @@ -18,6 +19,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.creat import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtAnonymousFunctionSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -54,11 +56,13 @@ internal class KtFe10PsiLiteralAnonymousFunctionSymbol( descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType() } - override val receiverType: KtType? + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { - val descriptor = this.descriptor ?: return createErrorType() - val extensionReceiverParameter = descriptor.extensionReceiverParameter ?: return null - extensionReceiverParameter.type.toKtType(analysisContext) + if (!psi.isExtensionDeclaration()) { + return null + } + + descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val contextReceivers: List diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt index 89a7ebe8490..cf15cf645ee 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.Analysis import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer @@ -20,6 +21,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVis import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -73,14 +75,9 @@ internal class KtFe10PsiPropertyGetterSymbol( get() = withValidityAssertion { descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType() } - override val receiverType: KtType? + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { - val descriptor = this.descriptor - return when { - descriptor != null -> descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) - !psi.property.isTopLevel -> createErrorType() - else -> null - } + descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override fun createPointer(): KtSymbolPointer = withValidityAssertion { diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertySetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertySetterSymbol.kt index da829a6a502..4bb55219428 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertySetterSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertySetterSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.Analysis import org.jetbrains.kotlin.analysis.api.descriptors.symbols.calculateHashCode import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility +import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType import org.jetbrains.kotlin.analysis.api.descriptors.symbols.isEqualTo import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer @@ -18,12 +19,13 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.creat import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktModality import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.PropertySetterDescriptor import org.jetbrains.kotlin.descriptors.Visibilities @@ -31,7 +33,6 @@ import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.psi.KtPropertyAccessor -import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration import org.jetbrains.kotlin.resolve.BindingContext internal class KtFe10PsiPropertySetterSymbol( @@ -75,14 +76,9 @@ internal class KtFe10PsiPropertySetterSymbol( descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType() } - override val receiverType: KtType? + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { - val descriptor = this.descriptor - return when { - descriptor != null -> descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) - psi.property.isExtensionDeclaration() -> createErrorType() - else -> null - } + descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) } override val parameter: KtValueParameterSymbol diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt index f38cefa00be..8af3ecdf726 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.analysis.api.fir.utils.cached import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtAnonymousFunctionSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer @@ -40,7 +41,7 @@ internal class KtFirAnonymousFunctionSymbol( } override val returnType: KtType get() = withValidityAssertion { firSymbol.returnType(builder) } - override val receiverType: KtType? get() = withValidityAssertion { firSymbol.receiverType(builder) } + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { firSymbol.receiver(builder) } override val contextReceivers: List by cached { firSymbol.createContextReceivers(builder) } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt index 05b3de138a8..8b7a42b1f24 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.analysis.api.impl.base.util.kotlinFunctionInvokeCall import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind import org.jetbrains.kotlin.analysis.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException @@ -50,7 +51,7 @@ internal class KtFirFunctionSymbol( get() = withValidityAssertion { callableIdIfNonLocal in kotlinFunctionInvokeCallableIds } override val returnType: KtType get() = withValidityAssertion { firSymbol.returnType(builder) } - override val receiverType: KtType? get() = withValidityAssertion { firSymbol.receiverType(builder) } + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { firSymbol.receiver(builder) } override val contextReceivers: List by cached { firSymbol.createContextReceivers(builder) } override val typeParameters by cached { firSymbol.createKtTypeParameters(builder) } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt index f4130d98cf4..31da0cfbc44 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt @@ -61,7 +61,7 @@ internal class KtFirKotlinPropertySymbol( override val name: Name get() = withValidityAssertion { firSymbol.name } override val returnType: KtType get() = withValidityAssertion { firSymbol.returnType(builder) } - override val receiverType: KtType? get() = withValidityAssertion { firSymbol.receiverType(builder) } + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { firSymbol.receiver(builder) } override val contextReceivers: List by cached { firSymbol.createContextReceivers(builder) } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt index 81fbed52d5e..b7e0d5dee80 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.analysis.api.fir.utils.cached import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -55,8 +56,8 @@ internal class KtFirPropertyGetterSymbol( override val returnType: KtType get() = withValidityAssertion { firSymbol.returnType(builder) } - override val receiverType: KtType? get() = withValidityAssertion { firSymbol.fir.propertySymbol.receiverType(builder) } - + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { firSymbol.fir.propertySymbol.receiver(builder) } + override val annotationsList by cached { KtFirAnnotationListForDeclaration.create(firSymbol, firResolveSession.useSiteFirSession, token) } /** diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt index 7e72455edce..d3ed68152ba 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.analysis.api.fir.utils.cached import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -92,7 +93,7 @@ internal class KtFirPropertySetterSymbol( override val valueParameters: List by cached { listOf(parameter) } override val returnType: KtType get() = withValidityAssertion { firSymbol.returnType(builder) } - override val receiverType: KtType? get() = withValidityAssertion { firSymbol.fir.propertySymbol.receiverType(builder) } + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { firSymbol.fir.propertySymbol.receiver(builder) } override val hasStableParameterNames: Boolean diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt index ecb56fb8028..ec6dc01a1ec 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.KtFirSamConstructo import org.jetbrains.kotlin.analysis.api.fir.utils.cached import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSamConstructorSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol @@ -59,7 +60,7 @@ internal class KtFirSamConstructorSymbol( override val isExtension: Boolean get() = withValidityAssertion { firSymbol.isExtension } - override val receiverType: KtType? get() = withValidityAssertion { firSymbol.receiverType(builder) } + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { firSymbol.receiver(builder) } override val callableIdIfNonLocal: CallableId? get() = withValidityAssertion { firSymbol.getCallableIdIfNonLocal() } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt index 695b5a5170c..ff977156808 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt @@ -43,7 +43,7 @@ internal class KtFirSyntheticJavaPropertySymbol( override val name: Name get() = withValidityAssertion { firSymbol.name } override val returnType: KtType get() = withValidityAssertion { firSymbol.returnType(builder) } - override val receiverType: KtType? get() = withValidityAssertion { firSymbol.receiverType(builder) } + override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { firSymbol.receiver(builder) } override val typeParameters: List get() = withValidityAssertion { firSymbol.createKtTypeParameters(builder) } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAndAnnotations.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAndAnnotations.kt index a7ced14e465..ed743124b24 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAndAnnotations.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAndAnnotations.kt @@ -6,13 +6,13 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.resolve.transformers.resolveSupertypesInTheAir import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol -import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -38,6 +38,9 @@ private fun List.mapToKtType( internal fun FirCallableSymbol<*>.returnType(builder: KtSymbolByFirBuilder): KtType = builder.typeBuilder.buildKtType(resolvedReturnType) +internal fun FirCallableSymbol<*>.receiver(builder: KtSymbolByFirBuilder): KtReceiverParameterSymbol? = + builder.callableBuilder.buildExtensionReceiverSymbol(this) + internal fun FirCallableSymbol<*>.receiverType(builder: KtSymbolByFirBuilder): KtType? = resolvedReceiverTypeRef?.let { receiver -> builder.typeBuilder.buildKtType(receiver) diff --git a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubstitutorImpl.kt b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubstitutorImpl.kt index ad75a38b75c..d801c3aa29c 100644 --- a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubstitutorImpl.kt +++ b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubstitutorImpl.kt @@ -9,7 +9,9 @@ import org.jetbrains.kotlin.analysis.api.components.KtSignatureSubstitutor import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature import org.jetbrains.kotlin.analysis.api.signatures.KtFunctionLikeSignature import org.jetbrains.kotlin.analysis.api.signatures.KtVariableLikeSignature -import org.jetbrains.kotlin.analysis.api.symbols.* +import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtVariableLikeSymbol import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor import org.jetbrains.kotlin.analysis.utils.errors.unexpectedElementError @@ -45,7 +47,7 @@ abstract class AbstractKtSignatureSubstitutorImpl : KtSignatureSubstitutor() { return KtFunctionLikeSignature( symbol, substitutor.substitute(symbol.returnType), - symbol.receiverType?.let { substitutor.substitute(it) }, + symbol.receiver?.type?.let { substitutor.substitute(it) }, symbol.valueParameters.map { substitute(it, substitutor) } ) } @@ -55,7 +57,7 @@ abstract class AbstractKtSignatureSubstitutorImpl : KtSignatureSubstitutor() { return KtVariableLikeSignature( symbol, substitutor.substitute(symbol.returnType), - symbol.receiverType?.let { substitutor.substitute(it) }, + symbol.receiver?.type?.let { substitutor.substitute(it) }, ) } @@ -68,10 +70,10 @@ abstract class AbstractKtSignatureSubstitutorImpl : KtSignatureSubstitutor() { } override fun asSignature(symbol: S): KtFunctionLikeSignature { - return KtFunctionLikeSignature(symbol, symbol.returnType, symbol.receiverType, symbol.valueParameters.map { asSignature(it) }) + return KtFunctionLikeSignature(symbol, symbol.returnType, symbol.receiver?.type, symbol.valueParameters.map { asSignature(it) }) } override fun asSignature(symbol: S): KtVariableLikeSignature { - return KtVariableLikeSignature(symbol, symbol.returnType, symbol.receiverType) + return KtVariableLikeSignature(symbol, symbol.returnType, symbol.receiver?.type) } } \ No newline at end of file diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/signatureSubstitution/AbstractAnalysisApiSignatureContractsTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/signatureSubstitution/AbstractAnalysisApiSignatureContractsTest.kt index 5cbc19fc5d7..189dc1f5a66 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/signatureSubstitution/AbstractAnalysisApiSignatureContractsTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/signatureSubstitution/AbstractAnalysisApiSignatureContractsTest.kt @@ -102,7 +102,7 @@ abstract class AbstractAnalysisApiSignatureContractsTest : AbstractAnalysisApiSi substitutor: KtSubstitutor, testServices: TestServices ) { - testServices.assertions.assertEquals(symbol.receiverType?.let(substitutor::substitute), signature.receiverType) + testServices.assertions.assertEquals(symbol.receiver?.type?.let(substitutor::substitute), signature.receiverType) testServices.assertions.assertEquals(symbol.returnType.let(substitutor::substitute), signature.returnType) testServices.assertions.assertEquals(symbol.valueParameters.size, signature.valueParameters.size) @@ -118,7 +118,7 @@ abstract class AbstractAnalysisApiSignatureContractsTest : AbstractAnalysisApiSi substitutor: KtSubstitutor, testServices: TestServices ) { - testServices.assertions.assertEquals(symbol.receiverType?.let(substitutor::substitute), signature.receiverType) + testServices.assertions.assertEquals(symbol.receiver?.type?.let(substitutor::substitute), signature.receiverType) testServices.assertions.assertEquals(symbol.returnType.let(substitutor::substitute), signature.returnType) } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/testUtils.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/testUtils.kt index 77f8c02308c..fc83d23c638 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/testUtils.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/testUtils.kt @@ -47,8 +47,8 @@ internal fun KtAnalysisSession.stringRepresentation(any: Any): String = with(any } ) append("(") - (this@with as? KtFunctionSymbol)?.receiverType?.let { receiver -> - append(": ${receiver.render()}") + (this@with as? KtFunctionSymbol)?.receiver?.let { receiver -> + append(": ${receiver.type.render()}") if (valueParameters.isNotEmpty()) append(", ") } 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 524f1f72c2d..01019a9fdcb 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) { + private fun PrettyPrinter.renderSymbolInternals(symbol: KtSymbol, customIgnoredPropertynames: List = emptyList()) { renderSymbolHeader(symbol) val apiClass = getSymbolApiClass(symbol) withIndent { apiClass.members .asSequence() .filterIsInstance>() - .filter { it.name !in ignoredPropertyNames } + .filter { it.name !in ignoredPropertyNames && it.name !in customIgnoredPropertynames } .sortedBy { it.name } .forEach { member -> renderProperty( @@ -155,7 +155,7 @@ public class DebugSymbolRenderer( } } - if (renderSymbolsFully || symbol is KtPropertyGetterSymbol || symbol is KtPropertySetterSymbol || symbol is KtValueParameterSymbol) { + if (renderSymbolsFully || symbol is KtPropertyGetterSymbol || symbol is KtPropertySetterSymbol || symbol is KtValueParameterSymbol || symbol is KtReceiverParameterSymbol) { renderSymbol(symbol) return } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt index 0548e5717e2..5b00bf400b0 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt @@ -17,7 +17,7 @@ public sealed class KtCallableSymbol : KtSymbolWithKind, KtPossibleMemberSymbol, public abstract val callableIdIfNonLocal: CallableId? public abstract val returnType: KtType - public abstract val receiverType: KtType? + public abstract val receiver: KtReceiverParameterSymbol? public abstract val isExtension: Boolean abstract override fun createPointer(): KtSymbolPointer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt index b217c6548f6..7ebc1e0b4cf 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.analysis.api.base.KtContextReceiver import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.markers.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer -import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId @@ -74,7 +73,7 @@ public abstract class KtConstructorSymbol : KtFunctionLikeSymbol(), final override val callableIdIfNonLocal: CallableId? get() = withValidityAssertion { null } final override val symbolKind: KtSymbolKind get() = withValidityAssertion { KtSymbolKind.CLASS_MEMBER } final override val isExtension: Boolean get() = withValidityAssertion { false } - final override val receiverType: KtType? get() = withValidityAssertion { null } + final override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { null } final override val contextReceivers: List get() = withValidityAssertion { emptyList() } abstract override fun createPointer(): KtSymbolPointer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt index 36f1e1fa69d..c6abe7c1b97 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -13,7 +13,6 @@ import org.jetbrains.kotlin.analysis.api.base.KtContextReceiver import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.markers.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer -import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId @@ -44,7 +43,7 @@ public abstract class KtBackingFieldSymbol : KtVariableLikeSymbol() { override val origin: KtSymbolOrigin get() = withValidityAssertion { KtSymbolOrigin.PROPERTY_BACKING_FIELD } final override val callableIdIfNonLocal: CallableId? get() = withValidityAssertion { null } final override val isExtension: Boolean get() = withValidityAssertion { false } - final override val receiverType: KtType? get() = withValidityAssertion { null } + final override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { null } final override val contextReceivers: List get() = withValidityAssertion { emptyList() } final override val typeParameters: List @@ -61,7 +60,7 @@ public abstract class KtBackingFieldSymbol : KtVariableLikeSymbol() { public abstract class KtEnumEntrySymbol : KtVariableLikeSymbol(), KtSymbolWithMembers, KtSymbolWithKind { final override val symbolKind: KtSymbolKind get() = withValidityAssertion { KtSymbolKind.CLASS_MEMBER } final override val isExtension: Boolean get() = withValidityAssertion { false } - final override val receiverType: KtType? get() = withValidityAssertion { null } + final override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { null } final override val contextReceivers: List get() = withValidityAssertion { emptyList() } final override val typeParameters: List @@ -86,7 +85,7 @@ public abstract class KtJavaFieldSymbol : KtSymbolWithKind { final override val symbolKind: KtSymbolKind get() = withValidityAssertion { KtSymbolKind.CLASS_MEMBER } final override val isExtension: Boolean get() = withValidityAssertion { false } - final override val receiverType: KtType? get() = withValidityAssertion { null } + final override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { null } final override val contextReceivers: List get() = withValidityAssertion { emptyList() } final override val typeParameters: List @@ -157,7 +156,7 @@ public abstract class KtSyntheticJavaPropertySymbol : KtPropertySymbol() { public abstract class KtLocalVariableSymbol : KtVariableSymbol(), KtSymbolWithKind { final override val callableIdIfNonLocal: CallableId? get() = withValidityAssertion { null } final override val isExtension: Boolean get() = withValidityAssertion { false } - final override val receiverType: KtType? get() = withValidityAssertion { null } + final override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { null } final override val contextReceivers: List get() = withValidityAssertion { emptyList() } final override val typeParameters: List @@ -170,7 +169,7 @@ public abstract class KtValueParameterSymbol : KtVariableLikeSymbol(), KtSymbolW final override val symbolKind: KtSymbolKind get() = withValidityAssertion { KtSymbolKind.LOCAL } final override val callableIdIfNonLocal: CallableId? get() = withValidityAssertion { null } final override val isExtension: Boolean get() = withValidityAssertion { false } - final override val receiverType: KtType? get() = withValidityAssertion { null } + final override val receiver: KtReceiverParameterSymbol? get() = withValidityAssertion { null } final override val contextReceivers: List get() = withValidityAssertion { emptyList() } /** diff --git a/analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt b/analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt index 2d80a796fe0..6b805bab596 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt @@ -78,7 +78,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/collections/Map> symbolKind: CLASS_MEMBER typeParameters: [ @@ -98,7 +98,7 @@ KtFunctionSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: X symbolKind: LOCAL typeParameters: [] @@ -115,7 +115,7 @@ KtFunctionSymbol: isVararg: false name: y origin: SOURCE - receiverType: null + receiver: null returnType: Y symbolKind: LOCAL typeParameters: [] @@ -137,7 +137,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/collections/Map symbolKind: ACCESSOR typeParameters: [] @@ -158,7 +158,7 @@ KtKotlinPropertySymbol: modality: FINAL name: map origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/collections/Map setter: null symbolKind: CLASS_MEMBER @@ -181,7 +181,7 @@ KtFunctionSymbol: modality: ABSTRACT name: fromSuper origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: O symbolKind: CLASS_MEMBER typeParameters: [] @@ -204,7 +204,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -222,7 +222,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -245,7 +245,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -268,7 +268,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/typeScope/intList.txt b/analysis/analysis-api/testData/components/scopeProvider/typeScope/intList.txt index 19d89933789..46e778d0957 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/typeScope/intList.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/typeScope/intList.txt @@ -168,7 +168,7 @@ KtFunctionSymbol: modality: ABSTRACT name: contains origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -186,7 +186,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -209,7 +209,7 @@ KtFunctionSymbol: modality: ABSTRACT name: containsAll origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -227,7 +227,7 @@ KtFunctionSymbol: isVararg: false name: elements origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/Collection symbolKind: LOCAL typeParameters: [] @@ -250,7 +250,7 @@ KtFunctionSymbol: modality: ABSTRACT name: get origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: CLASS_MEMBER typeParameters: [] @@ -268,7 +268,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -291,7 +291,7 @@ KtFunctionSymbol: modality: ABSTRACT name: indexOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -309,7 +309,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -332,7 +332,7 @@ KtFunctionSymbol: modality: ABSTRACT name: isEmpty origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -355,7 +355,7 @@ KtFunctionSymbol: modality: ABSTRACT name: iterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/Iterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -378,7 +378,7 @@ KtFunctionSymbol: modality: ABSTRACT name: lastIndexOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -396,7 +396,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -419,7 +419,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/ListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -442,7 +442,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/ListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -460,7 +460,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -483,7 +483,7 @@ KtFunctionSymbol: modality: ABSTRACT name: subList origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/List symbolKind: CLASS_MEMBER typeParameters: [] @@ -501,7 +501,7 @@ KtFunctionSymbol: isVararg: false name: fromIndex origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -518,7 +518,7 @@ KtFunctionSymbol: isVararg: false name: toIndex origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -540,7 +540,7 @@ KtKotlinPropertySymbol: isOverride: false modality: ABSTRACT origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -561,7 +561,7 @@ KtKotlinPropertySymbol: modality: ABSTRACT name: size origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -584,7 +584,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -602,7 +602,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -625,7 +625,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -648,7 +648,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/typeScope/outerClassTypeParamsSubstitution.txt b/analysis/analysis-api/testData/components/scopeProvider/typeScope/outerClassTypeParamsSubstitution.txt index 9d7257bafbb..425eb764ec2 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/typeScope/outerClassTypeParamsSubstitution.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/typeScope/outerClassTypeParamsSubstitution.txt @@ -72,7 +72,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/collections/Map> symbolKind: CLASS_MEMBER typeParameters: [ @@ -92,7 +92,7 @@ KtFunctionSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: X symbolKind: LOCAL typeParameters: [] @@ -109,7 +109,7 @@ KtFunctionSymbol: isVararg: false name: y origin: SOURCE - receiverType: null + receiver: null returnType: Y symbolKind: LOCAL typeParameters: [] @@ -131,7 +131,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/collections/Map symbolKind: ACCESSOR typeParameters: [] @@ -152,7 +152,7 @@ KtKotlinPropertySymbol: modality: FINAL name: map origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/collections/Map setter: null symbolKind: CLASS_MEMBER @@ -175,7 +175,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -193,7 +193,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -216,7 +216,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -239,7 +239,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/typeScope/outerTypeParamsSubstitution.txt b/analysis/analysis-api/testData/components/scopeProvider/typeScope/outerTypeParamsSubstitution.txt index cfdc04300a7..7f97baf940c 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/typeScope/outerTypeParamsSubstitution.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/typeScope/outerTypeParamsSubstitution.txt @@ -72,7 +72,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/collections/Map symbolKind: CLASS_MEMBER typeParameters: [ @@ -92,7 +92,7 @@ KtFunctionSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: X symbolKind: LOCAL typeParameters: [] @@ -109,7 +109,7 @@ KtFunctionSymbol: isVararg: false name: y origin: SOURCE - receiverType: null + receiver: null returnType: Y symbolKind: LOCAL typeParameters: [] @@ -131,7 +131,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/collections/Map symbolKind: ACCESSOR typeParameters: [] @@ -152,7 +152,7 @@ KtKotlinPropertySymbol: modality: FINAL name: map origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/collections/Map setter: null symbolKind: CLASS_MEMBER @@ -175,7 +175,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -193,7 +193,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -216,7 +216,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -239,7 +239,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/typeScope/typeParamList.txt b/analysis/analysis-api/testData/components/scopeProvider/typeScope/typeParamList.txt index 3a1a1e34ee9..75d6d5b7525 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/typeScope/typeParamList.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/typeScope/typeParamList.txt @@ -168,7 +168,7 @@ KtFunctionSymbol: modality: ABSTRACT name: contains origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -186,7 +186,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -209,7 +209,7 @@ KtFunctionSymbol: modality: ABSTRACT name: containsAll origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -227,7 +227,7 @@ KtFunctionSymbol: isVararg: false name: elements origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/Collection symbolKind: LOCAL typeParameters: [] @@ -250,7 +250,7 @@ KtFunctionSymbol: modality: ABSTRACT name: get origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: CLASS_MEMBER typeParameters: [] @@ -268,7 +268,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -291,7 +291,7 @@ KtFunctionSymbol: modality: ABSTRACT name: indexOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -309,7 +309,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -332,7 +332,7 @@ KtFunctionSymbol: modality: ABSTRACT name: isEmpty origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -355,7 +355,7 @@ KtFunctionSymbol: modality: ABSTRACT name: iterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/Iterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -378,7 +378,7 @@ KtFunctionSymbol: modality: ABSTRACT name: lastIndexOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -396,7 +396,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -419,7 +419,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/ListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -442,7 +442,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/ListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -460,7 +460,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -483,7 +483,7 @@ KtFunctionSymbol: modality: ABSTRACT name: subList origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/List symbolKind: CLASS_MEMBER typeParameters: [] @@ -501,7 +501,7 @@ KtFunctionSymbol: isVararg: false name: fromIndex origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -518,7 +518,7 @@ KtFunctionSymbol: isVararg: false name: toIndex origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -540,7 +540,7 @@ KtKotlinPropertySymbol: isOverride: false modality: ABSTRACT origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -561,7 +561,7 @@ KtKotlinPropertySymbol: modality: ABSTRACT name: size origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -584,7 +584,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -602,7 +602,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -625,7 +625,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -648,7 +648,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.txt index 16ce0b6605d..3ad1b7c740f 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: OPEN origin: DELEGATED - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: OPEN name: foo origin: DELEGATED - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.txt index 7b55a1e7be3..257566b27ee 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.txt +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.txt @@ -18,7 +18,7 @@ KtKotlinPropertySymbol: modality: OPEN name: foo origin: DELEGATED - receiverType: null + receiver: null returnType: kotlin/Int 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 7a62ca55a83..dce2c92a4b2 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt @@ -18,7 +18,10 @@ KtKotlinPropertySymbol: modality: OPEN name: zoo origin: DELEGATED - receiverType: kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: DELEGATED + type: kotlin/Int returnType: kotlin/Unit setter: null symbolKind: CLASS_MEMBER @@ -49,7 +52,7 @@ KtFunctionSymbol: modality: OPEN name: foo origin: DELEGATED - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -79,7 +82,7 @@ KtKotlinPropertySymbol: modality: OPEN name: foo origin: DELEGATED - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -110,7 +113,10 @@ KtFunctionSymbol: modality: OPEN name: smth origin: DELEGATED - receiverType: kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: DELEGATED + type: kotlin/Int returnType: kotlin/Short symbolKind: CLASS_MEMBER typeParameters: [] @@ -140,7 +146,7 @@ KtKotlinPropertySymbol: modality: OPEN name: bar origin: DELEGATED - receiverType: null + receiver: null returnType: kotlin/Long setter: null symbolKind: CLASS_MEMBER @@ -174,7 +180,10 @@ KtKotlinPropertySymbol: modality: OPEN name: doo origin: DELEGATED - receiverType: kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: DELEGATED + type: kotlin/Int returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt index 773197dcffc..bc770677490 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: OPEN name: bar origin: DELEGATED - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt b/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt index a0e4cab5037..a11b04066ad 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 - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -55,7 +55,7 @@ KtFunctionSymbol: modality: FINAL name: functionWithDefault origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -73,7 +73,7 @@ KtFunctionSymbol: isVararg: false name: par1 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -100,7 +100,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -123,7 +123,7 @@ KtKotlinPropertySymbol: modality: FINAL name: testVal origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -152,7 +152,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -175,7 +175,7 @@ KtKotlinPropertySymbol: modality: FINAL name: initializedVariable origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -202,13 +202,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -226,7 +226,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -262,7 +262,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -285,7 +285,7 @@ KtKotlinPropertySymbol: modality: FINAL name: unitializedVariable origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -312,13 +312,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -336,7 +336,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -372,7 +372,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -395,7 +395,7 @@ KtKotlinPropertySymbol: modality: FINAL name: lateinitVariable origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [] @@ -422,13 +422,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -446,7 +446,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -482,7 +482,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -505,7 +505,7 @@ KtKotlinPropertySymbol: modality: FINAL name: variableWithBackingField origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -532,13 +532,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -556,7 +556,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -592,7 +592,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -615,7 +615,7 @@ KtKotlinPropertySymbol: modality: FINAL name: privateSetter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [ @@ -645,13 +645,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -669,7 +669,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -705,7 +705,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -728,7 +728,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmNameOnSetter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [ @@ -758,13 +758,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -782,7 +782,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -821,7 +821,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -844,7 +844,7 @@ KtKotlinPropertySymbol: modality: FINAL name: customGetter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -876,7 +876,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -899,7 +899,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmNameOnGetter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -928,7 +928,10 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: kotlin/Int returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -951,7 +954,10 @@ KtKotlinPropertySymbol: modality: FINAL name: propertyWithReceiver origin: SOURCE - receiverType: kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: kotlin/Int returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -980,7 +986,10 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: T + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: T returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -1003,7 +1012,10 @@ KtKotlinPropertySymbol: modality: FINAL name: propertyWithGenericReceiver origin: SOURCE - receiverType: T + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: T returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -1034,7 +1046,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -1057,7 +1069,7 @@ KtKotlinPropertySymbol: modality: FINAL name: constant origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -1086,7 +1098,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -1109,7 +1121,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmField origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -1136,13 +1148,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -1160,7 +1172,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: 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 48a14085868..6429db78c43 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 - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -55,7 +55,7 @@ KtFunctionSymbol: modality: FINAL name: functionWithDefault origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -73,7 +73,7 @@ KtFunctionSymbol: isVararg: false name: par1 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -100,7 +100,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -123,7 +123,7 @@ KtKotlinPropertySymbol: modality: FINAL name: testVal origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -152,7 +152,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -175,7 +175,7 @@ KtKotlinPropertySymbol: modality: FINAL name: initializedVariable origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -202,13 +202,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -226,7 +226,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -262,7 +262,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -285,7 +285,7 @@ KtKotlinPropertySymbol: modality: FINAL name: unitializedVariable origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -312,13 +312,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -336,7 +336,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -372,7 +372,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -395,7 +395,7 @@ KtKotlinPropertySymbol: modality: FINAL name: lateinitVariable origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [] @@ -422,13 +422,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -446,7 +446,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -482,7 +482,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -505,7 +505,7 @@ KtKotlinPropertySymbol: modality: FINAL name: variableWithBackingField origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -532,13 +532,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -556,7 +556,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -592,7 +592,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -615,7 +615,7 @@ KtKotlinPropertySymbol: modality: FINAL name: privateSetter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [ @@ -645,13 +645,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -669,7 +669,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -705,7 +705,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -728,7 +728,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmNameOnSetter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: KtPropertySetterSymbol: annotationsList: [ @@ -758,13 +758,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -782,7 +782,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -821,7 +821,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -844,7 +844,7 @@ KtKotlinPropertySymbol: modality: FINAL name: customGetter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -876,7 +876,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -899,7 +899,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmNameOnGetter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -928,7 +928,10 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: kotlin/Int returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -951,7 +954,10 @@ KtKotlinPropertySymbol: modality: FINAL name: propertyWithReceiver origin: SOURCE - receiverType: kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: kotlin/Int returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -980,7 +986,10 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: T + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: T returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -1003,7 +1012,10 @@ KtKotlinPropertySymbol: modality: FINAL name: propertyWithGenericReceiver origin: SOURCE - receiverType: T + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: T returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -1034,7 +1046,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -1057,7 +1069,7 @@ KtKotlinPropertySymbol: modality: FINAL name: constant origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -1089,7 +1101,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -1112,7 +1124,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmField origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -1139,13 +1151,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -1163,7 +1175,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt b/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt index 8f2b18e8ab1..9c8c97e5978 100644 --- a/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt +++ b/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt @@ -26,7 +26,7 @@ KtFunctionSymbol: modality: FINAL name: test origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -51,7 +51,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -74,7 +74,7 @@ KtKotlinPropertySymbol: modality: FINAL name: testVal origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt index 2e3a68c114b..a451f2034d7 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt @@ -18,7 +18,7 @@ KtFunctionSymbol: modality: FINAL name: and origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -36,7 +36,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -68,7 +68,7 @@ KtFunctionSymbol: modality: FINAL name: compareTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -86,7 +86,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Byte symbolKind: LOCAL typeParameters: [] @@ -118,7 +118,7 @@ KtFunctionSymbol: modality: FINAL name: compareTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -136,7 +136,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: LOCAL typeParameters: [] @@ -168,7 +168,7 @@ KtFunctionSymbol: modality: FINAL name: compareTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -186,7 +186,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: LOCAL typeParameters: [] @@ -218,7 +218,7 @@ KtFunctionSymbol: modality: OPEN name: compareTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -236,7 +236,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -268,7 +268,7 @@ KtFunctionSymbol: modality: FINAL name: compareTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -286,7 +286,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -318,7 +318,7 @@ KtFunctionSymbol: modality: FINAL name: compareTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -336,7 +336,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Short symbolKind: LOCAL typeParameters: [] @@ -365,7 +365,7 @@ KtFunctionSymbol: modality: FINAL name: dec origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -395,7 +395,7 @@ KtFunctionSymbol: modality: FINAL name: div origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -413,7 +413,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Byte symbolKind: LOCAL typeParameters: [] @@ -445,7 +445,7 @@ KtFunctionSymbol: modality: FINAL name: div origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: CLASS_MEMBER typeParameters: [] @@ -463,7 +463,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: LOCAL typeParameters: [] @@ -495,7 +495,7 @@ KtFunctionSymbol: modality: FINAL name: div origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: CLASS_MEMBER typeParameters: [] @@ -513,7 +513,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: LOCAL typeParameters: [] @@ -545,7 +545,7 @@ KtFunctionSymbol: modality: FINAL name: div origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -563,7 +563,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -595,7 +595,7 @@ KtFunctionSymbol: modality: FINAL name: div origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: CLASS_MEMBER typeParameters: [] @@ -613,7 +613,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -645,7 +645,7 @@ KtFunctionSymbol: modality: FINAL name: div origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -663,7 +663,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Short symbolKind: LOCAL typeParameters: [] @@ -695,7 +695,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -713,7 +713,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -742,7 +742,7 @@ KtFunctionSymbol: modality: FINAL name: inc origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -772,7 +772,7 @@ KtFunctionSymbol: modality: FINAL name: inv origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -802,7 +802,7 @@ KtFunctionSymbol: modality: FINAL name: minus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -820,7 +820,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Byte symbolKind: LOCAL typeParameters: [] @@ -852,7 +852,7 @@ KtFunctionSymbol: modality: FINAL name: minus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: CLASS_MEMBER typeParameters: [] @@ -870,7 +870,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: LOCAL typeParameters: [] @@ -902,7 +902,7 @@ KtFunctionSymbol: modality: FINAL name: minus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: CLASS_MEMBER typeParameters: [] @@ -920,7 +920,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: LOCAL typeParameters: [] @@ -952,7 +952,7 @@ KtFunctionSymbol: modality: FINAL name: minus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -970,7 +970,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1002,7 +1002,7 @@ KtFunctionSymbol: modality: FINAL name: minus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: CLASS_MEMBER typeParameters: [] @@ -1020,7 +1020,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -1052,7 +1052,7 @@ KtFunctionSymbol: modality: FINAL name: minus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1070,7 +1070,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Short symbolKind: LOCAL typeParameters: [] @@ -1102,7 +1102,7 @@ KtFunctionSymbol: modality: FINAL name: or origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1120,7 +1120,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1152,7 +1152,7 @@ KtFunctionSymbol: modality: FINAL name: plus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1170,7 +1170,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Byte symbolKind: LOCAL typeParameters: [] @@ -1202,7 +1202,7 @@ KtFunctionSymbol: modality: FINAL name: plus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: CLASS_MEMBER typeParameters: [] @@ -1220,7 +1220,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: LOCAL typeParameters: [] @@ -1252,7 +1252,7 @@ KtFunctionSymbol: modality: FINAL name: plus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: CLASS_MEMBER typeParameters: [] @@ -1270,7 +1270,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: LOCAL typeParameters: [] @@ -1302,7 +1302,7 @@ KtFunctionSymbol: modality: FINAL name: plus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1320,7 +1320,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1352,7 +1352,7 @@ KtFunctionSymbol: modality: FINAL name: plus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: CLASS_MEMBER typeParameters: [] @@ -1370,7 +1370,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -1402,7 +1402,7 @@ KtFunctionSymbol: modality: FINAL name: plus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1420,7 +1420,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Short symbolKind: LOCAL typeParameters: [] @@ -1449,7 +1449,7 @@ KtFunctionSymbol: modality: FINAL name: rangeTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/ranges/IntRange symbolKind: CLASS_MEMBER typeParameters: [] @@ -1467,7 +1467,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Byte symbolKind: LOCAL typeParameters: [] @@ -1496,7 +1496,7 @@ KtFunctionSymbol: modality: FINAL name: rangeTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/ranges/IntRange symbolKind: CLASS_MEMBER typeParameters: [] @@ -1514,7 +1514,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1543,7 +1543,7 @@ KtFunctionSymbol: modality: FINAL name: rangeTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/ranges/LongRange symbolKind: CLASS_MEMBER typeParameters: [] @@ -1561,7 +1561,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -1590,7 +1590,7 @@ KtFunctionSymbol: modality: FINAL name: rangeTo origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/ranges/IntRange symbolKind: CLASS_MEMBER typeParameters: [] @@ -1608,7 +1608,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Short symbolKind: LOCAL typeParameters: [] @@ -1642,7 +1642,7 @@ KtFunctionSymbol: modality: FINAL name: rangeUntil origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/ranges/IntRange symbolKind: CLASS_MEMBER typeParameters: [] @@ -1660,7 +1660,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Byte symbolKind: LOCAL typeParameters: [] @@ -1694,7 +1694,7 @@ KtFunctionSymbol: modality: FINAL name: rangeUntil origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/ranges/IntRange symbolKind: CLASS_MEMBER typeParameters: [] @@ -1712,7 +1712,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1746,7 +1746,7 @@ KtFunctionSymbol: modality: FINAL name: rangeUntil origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/ranges/LongRange symbolKind: CLASS_MEMBER typeParameters: [] @@ -1764,7 +1764,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -1798,7 +1798,7 @@ KtFunctionSymbol: modality: FINAL name: rangeUntil origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/ranges/IntRange symbolKind: CLASS_MEMBER typeParameters: [] @@ -1816,7 +1816,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Short symbolKind: LOCAL typeParameters: [] @@ -1850,7 +1850,7 @@ KtFunctionSymbol: modality: FINAL name: rem origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1868,7 +1868,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Byte symbolKind: LOCAL typeParameters: [] @@ -1902,7 +1902,7 @@ KtFunctionSymbol: modality: FINAL name: rem origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: CLASS_MEMBER typeParameters: [] @@ -1920,7 +1920,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: LOCAL typeParameters: [] @@ -1954,7 +1954,7 @@ KtFunctionSymbol: modality: FINAL name: rem origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: CLASS_MEMBER typeParameters: [] @@ -1972,7 +1972,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: LOCAL typeParameters: [] @@ -2006,7 +2006,7 @@ KtFunctionSymbol: modality: FINAL name: rem origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2024,7 +2024,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2058,7 +2058,7 @@ KtFunctionSymbol: modality: FINAL name: rem origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: CLASS_MEMBER typeParameters: [] @@ -2076,7 +2076,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -2110,7 +2110,7 @@ KtFunctionSymbol: modality: FINAL name: rem origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2128,7 +2128,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Short symbolKind: LOCAL typeParameters: [] @@ -2160,7 +2160,7 @@ KtFunctionSymbol: modality: FINAL name: shl origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2178,7 +2178,7 @@ KtFunctionSymbol: isVararg: false name: bitCount origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2210,7 +2210,7 @@ KtFunctionSymbol: modality: FINAL name: shr origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2228,7 +2228,7 @@ KtFunctionSymbol: isVararg: false name: bitCount origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2260,7 +2260,7 @@ KtFunctionSymbol: modality: FINAL name: times origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2278,7 +2278,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Byte symbolKind: LOCAL typeParameters: [] @@ -2310,7 +2310,7 @@ KtFunctionSymbol: modality: FINAL name: times origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: CLASS_MEMBER typeParameters: [] @@ -2328,7 +2328,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: LOCAL typeParameters: [] @@ -2360,7 +2360,7 @@ KtFunctionSymbol: modality: FINAL name: times origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: CLASS_MEMBER typeParameters: [] @@ -2378,7 +2378,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: LOCAL typeParameters: [] @@ -2410,7 +2410,7 @@ KtFunctionSymbol: modality: FINAL name: times origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2428,7 +2428,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2460,7 +2460,7 @@ KtFunctionSymbol: modality: FINAL name: times origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: CLASS_MEMBER typeParameters: [] @@ -2478,7 +2478,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -2510,7 +2510,7 @@ KtFunctionSymbol: modality: FINAL name: times origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2528,7 +2528,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Short symbolKind: LOCAL typeParameters: [] @@ -2560,7 +2560,7 @@ KtFunctionSymbol: modality: OPEN name: toByte origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Byte symbolKind: CLASS_MEMBER typeParameters: [] @@ -2590,7 +2590,7 @@ KtFunctionSymbol: modality: OPEN name: toChar origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Char symbolKind: CLASS_MEMBER typeParameters: [] @@ -2620,7 +2620,7 @@ KtFunctionSymbol: modality: OPEN name: toDouble origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Double symbolKind: CLASS_MEMBER typeParameters: [] @@ -2650,7 +2650,7 @@ KtFunctionSymbol: modality: OPEN name: toFloat origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Float symbolKind: CLASS_MEMBER typeParameters: [] @@ -2680,7 +2680,7 @@ KtFunctionSymbol: modality: OPEN name: toInt origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2710,7 +2710,7 @@ KtFunctionSymbol: modality: OPEN name: toLong origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: CLASS_MEMBER typeParameters: [] @@ -2740,7 +2740,7 @@ KtFunctionSymbol: modality: OPEN name: toShort origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Short symbolKind: CLASS_MEMBER typeParameters: [] @@ -2770,7 +2770,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -2800,7 +2800,7 @@ KtFunctionSymbol: modality: FINAL name: unaryMinus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2830,7 +2830,7 @@ KtFunctionSymbol: modality: FINAL name: unaryPlus origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2860,7 +2860,7 @@ KtFunctionSymbol: modality: FINAL name: ushr origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2878,7 +2878,7 @@ KtFunctionSymbol: isVararg: false name: bitCount origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2910,7 +2910,7 @@ KtFunctionSymbol: modality: FINAL name: xor origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2928,7 +2928,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2957,7 +2957,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2999,7 +2999,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/Integer symbolKind: CLASS_MEMBER typeParameters: [] @@ -3017,7 +3017,7 @@ KtConstructorSymbol: isVararg: false name: value origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3037,7 +3037,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt index 29d803f2a9d..78e9c501f5c 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: ABSTRACT name: add origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -33,7 +33,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -62,7 +62,7 @@ KtFunctionSymbol: modality: ABSTRACT name: add origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -80,7 +80,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -99,7 +99,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -128,7 +128,7 @@ KtFunctionSymbol: modality: ABSTRACT name: addAll origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -146,7 +146,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -165,7 +165,7 @@ KtFunctionSymbol: isVararg: false name: elements origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/Collection symbolKind: LOCAL typeParameters: [] @@ -194,7 +194,7 @@ KtFunctionSymbol: modality: ABSTRACT name: addAll origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -212,7 +212,7 @@ KtFunctionSymbol: isVararg: false name: elements origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/Collection symbolKind: LOCAL typeParameters: [] @@ -241,7 +241,7 @@ KtFunctionSymbol: modality: ABSTRACT name: clear origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -268,7 +268,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/MutableListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -295,7 +295,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/MutableListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -313,7 +313,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -342,7 +342,7 @@ KtFunctionSymbol: modality: ABSTRACT name: remove origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -360,7 +360,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -389,7 +389,7 @@ KtFunctionSymbol: modality: ABSTRACT name: removeAll origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -407,7 +407,7 @@ KtFunctionSymbol: isVararg: false name: elements origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/Collection symbolKind: LOCAL typeParameters: [] @@ -436,7 +436,7 @@ KtFunctionSymbol: modality: ABSTRACT name: removeAt origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: CLASS_MEMBER typeParameters: [] @@ -454,7 +454,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -483,7 +483,7 @@ KtFunctionSymbol: modality: ABSTRACT name: retainAll origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -501,7 +501,7 @@ KtFunctionSymbol: isVararg: false name: elements origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/Collection symbolKind: LOCAL typeParameters: [] @@ -530,7 +530,7 @@ KtFunctionSymbol: modality: ABSTRACT name: set origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: CLASS_MEMBER typeParameters: [] @@ -548,7 +548,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -567,7 +567,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -596,7 +596,7 @@ KtFunctionSymbol: modality: ABSTRACT name: subList origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/MutableList symbolKind: CLASS_MEMBER typeParameters: [] @@ -614,7 +614,7 @@ KtFunctionSymbol: isVararg: false name: fromIndex origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -633,7 +633,7 @@ KtFunctionSymbol: isVararg: false name: toIndex origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -662,7 +662,7 @@ KtFunctionSymbol: modality: ABSTRACT name: contains origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -680,7 +680,7 @@ KtFunctionSymbol: isVararg: false name: element origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -709,7 +709,7 @@ KtFunctionSymbol: modality: ABSTRACT name: containsAll origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -727,7 +727,7 @@ KtFunctionSymbol: isVararg: false name: elements origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: kotlin/collections/Collection symbolKind: LOCAL typeParameters: [] @@ -756,7 +756,7 @@ KtFunctionSymbol: modality: ABSTRACT name: get origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: E symbolKind: CLASS_MEMBER typeParameters: [] @@ -774,7 +774,7 @@ KtFunctionSymbol: isVararg: false name: index origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -803,7 +803,7 @@ KtFunctionSymbol: modality: ABSTRACT name: indexOf origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -821,7 +821,7 @@ KtFunctionSymbol: isVararg: false name: element origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -850,7 +850,7 @@ KtFunctionSymbol: modality: ABSTRACT name: isEmpty origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -877,7 +877,7 @@ KtFunctionSymbol: modality: ABSTRACT name: iterator origin: INTERSECTION_OVERRIDE - receiverType: null + receiver: null returnType: kotlin/collections/MutableIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -904,7 +904,7 @@ KtFunctionSymbol: modality: ABSTRACT name: lastIndexOf origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -922,7 +922,7 @@ KtFunctionSymbol: isVararg: false name: element origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: E symbolKind: LOCAL typeParameters: [] @@ -950,7 +950,7 @@ KtKotlinPropertySymbol: isOverride: false modality: ABSTRACT origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -974,7 +974,7 @@ KtKotlinPropertySymbol: modality: ABSTRACT name: size origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -1005,7 +1005,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -1023,7 +1023,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -1052,7 +1052,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1079,7 +1079,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt index c7bf74bf3d2..ea10b08017c 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER @@ -69,7 +69,7 @@ KtFunctionSymbol: modality: FINAL name: clone origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any symbolKind: CLASS_MEMBER typeParameters: [] @@ -96,7 +96,7 @@ KtFunctionSymbol: modality: FINAL name: compareTo origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -114,7 +114,7 @@ KtFunctionSymbol: isVararg: false name: other origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: test/E symbolKind: LOCAL typeParameters: [] @@ -143,7 +143,7 @@ KtFunctionSymbol: modality: FINAL name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -161,7 +161,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -190,7 +190,7 @@ KtFunctionSymbol: modality: FINAL name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -217,7 +217,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -246,7 +246,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -270,7 +270,7 @@ KtKotlinPropertySymbol: modality: FINAL name: name origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER @@ -300,7 +300,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -324,7 +324,7 @@ KtKotlinPropertySymbol: modality: FINAL name: ordinal origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -355,7 +355,7 @@ KtFunctionSymbol: modality: FINAL name: getDeclaringClass origin: SUBSTITUTION_OVERRIDE - receiverType: null + receiver: null returnType: ft, java/lang/Class?> symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt index 15696c891d7..8ae184ccd7b 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt @@ -8,7 +8,7 @@ KtJavaFieldSymbol: modality: FINAL name: value origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharArray! symbolKind: CLASS_MEMBER typeParameters: [] @@ -27,7 +27,7 @@ KtJavaFieldSymbol: modality: OPEN name: hash origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -53,7 +53,7 @@ KtFunctionSymbol: modality: OPEN name: hash32 origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -73,7 +73,7 @@ KtJavaFieldSymbol: modality: OPEN name: hash32 origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -98,7 +98,7 @@ KtSyntheticJavaPropertySymbol: isOverride: false modality: OPEN origin: JAVA_SYNTHETIC_PROPERTY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -122,7 +122,7 @@ KtSyntheticJavaPropertySymbol: modality: OPEN name: length origin: JAVA_SYNTHETIC_PROPERTY - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -153,7 +153,7 @@ KtFunctionSymbol: modality: OPEN name: isEmpty origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -180,7 +180,7 @@ KtFunctionSymbol: modality: OPEN name: codePointAt origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -198,7 +198,7 @@ KtFunctionSymbol: isVararg: false name: index origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -227,7 +227,7 @@ KtFunctionSymbol: modality: OPEN name: codePointBefore origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -245,7 +245,7 @@ KtFunctionSymbol: isVararg: false name: index origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -274,7 +274,7 @@ KtFunctionSymbol: modality: OPEN name: codePointCount origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -292,7 +292,7 @@ KtFunctionSymbol: isVararg: false name: beginIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -311,7 +311,7 @@ KtFunctionSymbol: isVararg: false name: endIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -340,7 +340,7 @@ KtFunctionSymbol: modality: OPEN name: offsetByCodePoints origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -358,7 +358,7 @@ KtFunctionSymbol: isVararg: false name: index origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -377,7 +377,7 @@ KtFunctionSymbol: isVararg: false name: codePointOffset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -406,7 +406,7 @@ KtFunctionSymbol: modality: OPEN name: getChars origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -424,7 +424,7 @@ KtFunctionSymbol: isVararg: false name: dst origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharArray! symbolKind: LOCAL typeParameters: [] @@ -443,7 +443,7 @@ KtFunctionSymbol: isVararg: false name: dstBegin origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -472,7 +472,7 @@ KtFunctionSymbol: modality: OPEN name: getChars origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -490,7 +490,7 @@ KtFunctionSymbol: isVararg: false name: srcBegin origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -509,7 +509,7 @@ KtFunctionSymbol: isVararg: false name: srcEnd origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -528,7 +528,7 @@ KtFunctionSymbol: isVararg: false name: dst origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharArray! symbolKind: LOCAL typeParameters: [] @@ -547,7 +547,7 @@ KtFunctionSymbol: isVararg: false name: dstBegin origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -579,7 +579,7 @@ KtFunctionSymbol: modality: OPEN name: getBytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -597,7 +597,7 @@ KtFunctionSymbol: isVararg: false name: srcBegin origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -616,7 +616,7 @@ KtFunctionSymbol: isVararg: false name: srcEnd origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -635,7 +635,7 @@ KtFunctionSymbol: isVararg: false name: dst origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: LOCAL typeParameters: [] @@ -654,7 +654,7 @@ KtFunctionSymbol: isVararg: false name: dstBegin origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -683,7 +683,7 @@ KtFunctionSymbol: modality: OPEN name: getBytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: CLASS_MEMBER typeParameters: [] @@ -701,7 +701,7 @@ KtFunctionSymbol: isVararg: false name: charsetName origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -730,7 +730,7 @@ KtFunctionSymbol: modality: OPEN name: getBytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: CLASS_MEMBER typeParameters: [] @@ -748,7 +748,7 @@ KtFunctionSymbol: isVararg: false name: charset origin: JAVA - receiverType: null + receiver: null returnType: java/nio/charset/Charset! symbolKind: LOCAL typeParameters: [] @@ -777,7 +777,7 @@ KtFunctionSymbol: modality: OPEN name: getBytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: CLASS_MEMBER typeParameters: [] @@ -804,7 +804,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -822,7 +822,7 @@ KtFunctionSymbol: isVararg: false name: anObject origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -851,7 +851,7 @@ KtFunctionSymbol: modality: OPEN name: contentEquals origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -869,7 +869,7 @@ KtFunctionSymbol: isVararg: false name: sb origin: JAVA - receiverType: null + receiver: null returnType: java/lang/StringBuffer! symbolKind: LOCAL typeParameters: [] @@ -898,7 +898,7 @@ KtFunctionSymbol: modality: OPEN name: contentEquals origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -916,7 +916,7 @@ KtFunctionSymbol: isVararg: false name: cs origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharSequence! symbolKind: LOCAL typeParameters: [] @@ -945,7 +945,7 @@ KtFunctionSymbol: modality: OPEN name: equalsIgnoreCase origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -963,7 +963,7 @@ KtFunctionSymbol: isVararg: false name: anotherString origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -992,7 +992,7 @@ KtFunctionSymbol: modality: OPEN name: compareTo origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1010,7 +1010,7 @@ KtFunctionSymbol: isVararg: false name: anotherString origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1039,7 +1039,7 @@ KtFunctionSymbol: modality: OPEN name: compareToIgnoreCase origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1057,7 +1057,7 @@ KtFunctionSymbol: isVararg: false name: str origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1086,7 +1086,7 @@ KtFunctionSymbol: modality: OPEN name: regionMatches origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -1104,7 +1104,7 @@ KtFunctionSymbol: isVararg: false name: toffset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1123,7 +1123,7 @@ KtFunctionSymbol: isVararg: false name: other origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1142,7 +1142,7 @@ KtFunctionSymbol: isVararg: false name: ooffset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1161,7 +1161,7 @@ KtFunctionSymbol: isVararg: false name: len origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1190,7 +1190,7 @@ KtFunctionSymbol: modality: OPEN name: regionMatches origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -1208,7 +1208,7 @@ KtFunctionSymbol: isVararg: false name: ignoreCase origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: LOCAL typeParameters: [] @@ -1227,7 +1227,7 @@ KtFunctionSymbol: isVararg: false name: toffset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1246,7 +1246,7 @@ KtFunctionSymbol: isVararg: false name: other origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1265,7 +1265,7 @@ KtFunctionSymbol: isVararg: false name: ooffset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1284,7 +1284,7 @@ KtFunctionSymbol: isVararg: false name: len origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1313,7 +1313,7 @@ KtFunctionSymbol: modality: OPEN name: startsWith origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -1331,7 +1331,7 @@ KtFunctionSymbol: isVararg: false name: prefix origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1350,7 +1350,7 @@ KtFunctionSymbol: isVararg: false name: toffset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1379,7 +1379,7 @@ KtFunctionSymbol: modality: OPEN name: startsWith origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -1397,7 +1397,7 @@ KtFunctionSymbol: isVararg: false name: prefix origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1426,7 +1426,7 @@ KtFunctionSymbol: modality: OPEN name: endsWith origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -1444,7 +1444,7 @@ KtFunctionSymbol: isVararg: false name: suffix origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1473,7 +1473,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1500,7 +1500,7 @@ KtFunctionSymbol: modality: OPEN name: indexOf origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1518,7 +1518,7 @@ KtFunctionSymbol: isVararg: false name: ch origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1547,7 +1547,7 @@ KtFunctionSymbol: modality: OPEN name: indexOf origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1565,7 +1565,7 @@ KtFunctionSymbol: isVararg: false name: ch origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1584,7 +1584,7 @@ KtFunctionSymbol: isVararg: false name: fromIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1613,7 +1613,7 @@ KtFunctionSymbol: modality: OPEN name: indexOf origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1631,7 +1631,7 @@ KtFunctionSymbol: isVararg: false name: str origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1660,7 +1660,7 @@ KtFunctionSymbol: modality: OPEN name: indexOf origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1678,7 +1678,7 @@ KtFunctionSymbol: isVararg: false name: str origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1697,7 +1697,7 @@ KtFunctionSymbol: isVararg: false name: fromIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1726,7 +1726,7 @@ KtFunctionSymbol: modality: OPEN name: indexOfSupplementary origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1744,7 +1744,7 @@ KtFunctionSymbol: isVararg: false name: ch origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1763,7 +1763,7 @@ KtFunctionSymbol: isVararg: false name: fromIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1792,7 +1792,7 @@ KtFunctionSymbol: modality: OPEN name: lastIndexOf origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1810,7 +1810,7 @@ KtFunctionSymbol: isVararg: false name: ch origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1839,7 +1839,7 @@ KtFunctionSymbol: modality: OPEN name: lastIndexOf origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1857,7 +1857,7 @@ KtFunctionSymbol: isVararg: false name: ch origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1876,7 +1876,7 @@ KtFunctionSymbol: isVararg: false name: fromIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -1905,7 +1905,7 @@ KtFunctionSymbol: modality: OPEN name: lastIndexOf origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1923,7 +1923,7 @@ KtFunctionSymbol: isVararg: false name: str origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1952,7 +1952,7 @@ KtFunctionSymbol: modality: OPEN name: lastIndexOf origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -1970,7 +1970,7 @@ KtFunctionSymbol: isVararg: false name: str origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -1989,7 +1989,7 @@ KtFunctionSymbol: isVararg: false name: fromIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2018,7 +2018,7 @@ KtFunctionSymbol: modality: OPEN name: lastIndexOfSupplementary origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -2036,7 +2036,7 @@ KtFunctionSymbol: isVararg: false name: ch origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2055,7 +2055,7 @@ KtFunctionSymbol: isVararg: false name: fromIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2084,7 +2084,7 @@ KtFunctionSymbol: modality: OPEN name: substring origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2102,7 +2102,7 @@ KtFunctionSymbol: isVararg: false name: beginIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2131,7 +2131,7 @@ KtFunctionSymbol: modality: OPEN name: substring origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2149,7 +2149,7 @@ KtFunctionSymbol: isVararg: false name: beginIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2168,7 +2168,7 @@ KtFunctionSymbol: isVararg: false name: endIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2197,7 +2197,7 @@ KtFunctionSymbol: modality: OPEN name: subSequence origin: JAVA - receiverType: null + receiver: null returnType: @EnhancedNullability kotlin/CharSequence symbolKind: CLASS_MEMBER typeParameters: [] @@ -2215,7 +2215,7 @@ KtFunctionSymbol: isVararg: false name: beginIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2234,7 +2234,7 @@ KtFunctionSymbol: isVararg: false name: endIndex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2263,7 +2263,7 @@ KtFunctionSymbol: modality: OPEN name: concat origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2281,7 +2281,7 @@ KtFunctionSymbol: isVararg: false name: str origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -2310,7 +2310,7 @@ KtFunctionSymbol: modality: OPEN name: replace origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2328,7 +2328,7 @@ KtFunctionSymbol: isVararg: false name: oldChar origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Char symbolKind: LOCAL typeParameters: [] @@ -2347,7 +2347,7 @@ KtFunctionSymbol: isVararg: false name: newChar origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Char symbolKind: LOCAL typeParameters: [] @@ -2376,7 +2376,7 @@ KtFunctionSymbol: modality: OPEN name: replace origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2394,7 +2394,7 @@ KtFunctionSymbol: isVararg: false name: target origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharSequence! symbolKind: LOCAL typeParameters: [] @@ -2413,7 +2413,7 @@ KtFunctionSymbol: isVararg: false name: replacement origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharSequence! symbolKind: LOCAL typeParameters: [] @@ -2442,7 +2442,7 @@ KtFunctionSymbol: modality: OPEN name: matches origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -2460,7 +2460,7 @@ KtFunctionSymbol: isVararg: false name: regex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -2489,7 +2489,7 @@ KtFunctionSymbol: modality: OPEN name: contains origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -2507,7 +2507,7 @@ KtFunctionSymbol: isVararg: false name: s origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharSequence! symbolKind: LOCAL typeParameters: [] @@ -2536,7 +2536,7 @@ KtFunctionSymbol: modality: OPEN name: replaceFirst origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2554,7 +2554,7 @@ KtFunctionSymbol: isVararg: false name: regex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -2573,7 +2573,7 @@ KtFunctionSymbol: isVararg: false name: replacement origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -2602,7 +2602,7 @@ KtFunctionSymbol: modality: OPEN name: replaceAll origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2620,7 +2620,7 @@ KtFunctionSymbol: isVararg: false name: regex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -2639,7 +2639,7 @@ KtFunctionSymbol: isVararg: false name: replacement origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -2668,7 +2668,7 @@ KtFunctionSymbol: modality: OPEN name: split origin: JAVA - receiverType: null + receiver: null returnType: ft, kotlin/Array?> symbolKind: CLASS_MEMBER typeParameters: [] @@ -2686,7 +2686,7 @@ KtFunctionSymbol: isVararg: false name: regex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -2705,7 +2705,7 @@ KtFunctionSymbol: isVararg: false name: limit origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -2734,7 +2734,7 @@ KtFunctionSymbol: modality: OPEN name: split origin: JAVA - receiverType: null + receiver: null returnType: ft, kotlin/Array?> symbolKind: CLASS_MEMBER typeParameters: [] @@ -2752,7 +2752,7 @@ KtFunctionSymbol: isVararg: false name: regex origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -2781,7 +2781,7 @@ KtFunctionSymbol: modality: OPEN name: toLowerCase origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2799,7 +2799,7 @@ KtFunctionSymbol: isVararg: false name: locale origin: JAVA - receiverType: null + receiver: null returnType: java/util/Locale! symbolKind: LOCAL typeParameters: [] @@ -2828,7 +2828,7 @@ KtFunctionSymbol: modality: OPEN name: toLowerCase origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2855,7 +2855,7 @@ KtFunctionSymbol: modality: OPEN name: toUpperCase origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2873,7 +2873,7 @@ KtFunctionSymbol: isVararg: false name: locale origin: JAVA - receiverType: null + receiver: null returnType: java/util/Locale! symbolKind: LOCAL typeParameters: [] @@ -2902,7 +2902,7 @@ KtFunctionSymbol: modality: OPEN name: toUpperCase origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2929,7 +2929,7 @@ KtFunctionSymbol: modality: OPEN name: trim origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -2956,7 +2956,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: JAVA - receiverType: null + receiver: null returnType: @EnhancedNullability kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -2983,7 +2983,7 @@ KtFunctionSymbol: modality: OPEN name: toCharArray origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharArray! symbolKind: CLASS_MEMBER typeParameters: [] @@ -3010,7 +3010,7 @@ KtFunctionSymbol: modality: OPEN name: intern origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: CLASS_MEMBER typeParameters: [] @@ -3037,7 +3037,7 @@ KtFunctionSymbol: modality: OPEN name: get origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Char symbolKind: CLASS_MEMBER typeParameters: [] @@ -3055,7 +3055,7 @@ KtFunctionSymbol: isVararg: false name: index origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3101,7 +3101,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3119,7 +3119,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3137,7 +3137,7 @@ KtConstructorSymbol: isVararg: false name: original origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -3157,7 +3157,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3175,7 +3175,7 @@ KtConstructorSymbol: isVararg: false name: value origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharArray! symbolKind: LOCAL typeParameters: [] @@ -3195,7 +3195,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3213,7 +3213,7 @@ KtConstructorSymbol: isVararg: false name: value origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharArray! symbolKind: LOCAL typeParameters: [] @@ -3232,7 +3232,7 @@ KtConstructorSymbol: isVararg: false name: offset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3251,7 +3251,7 @@ KtConstructorSymbol: isVararg: false name: count origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3271,7 +3271,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3289,7 +3289,7 @@ KtConstructorSymbol: isVararg: false name: codePoints origin: JAVA - receiverType: null + receiver: null returnType: kotlin/IntArray! symbolKind: LOCAL typeParameters: [] @@ -3308,7 +3308,7 @@ KtConstructorSymbol: isVararg: false name: offset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3327,7 +3327,7 @@ KtConstructorSymbol: isVararg: false name: count origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3350,7 +3350,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3368,7 +3368,7 @@ KtConstructorSymbol: isVararg: false name: ascii origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: LOCAL typeParameters: [] @@ -3387,7 +3387,7 @@ KtConstructorSymbol: isVararg: false name: hibyte origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3406,7 +3406,7 @@ KtConstructorSymbol: isVararg: false name: offset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3425,7 +3425,7 @@ KtConstructorSymbol: isVararg: false name: count origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3448,7 +3448,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3466,7 +3466,7 @@ KtConstructorSymbol: isVararg: false name: ascii origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: LOCAL typeParameters: [] @@ -3485,7 +3485,7 @@ KtConstructorSymbol: isVararg: false name: hibyte origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3505,7 +3505,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3523,7 +3523,7 @@ KtConstructorSymbol: isVararg: false name: bytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: LOCAL typeParameters: [] @@ -3542,7 +3542,7 @@ KtConstructorSymbol: isVararg: false name: offset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3561,7 +3561,7 @@ KtConstructorSymbol: isVararg: false name: length origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3580,7 +3580,7 @@ KtConstructorSymbol: isVararg: false name: charsetName origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -3600,7 +3600,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3618,7 +3618,7 @@ KtConstructorSymbol: isVararg: false name: bytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: LOCAL typeParameters: [] @@ -3637,7 +3637,7 @@ KtConstructorSymbol: isVararg: false name: offset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3656,7 +3656,7 @@ KtConstructorSymbol: isVararg: false name: length origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3675,7 +3675,7 @@ KtConstructorSymbol: isVararg: false name: charset origin: JAVA - receiverType: null + receiver: null returnType: java/nio/charset/Charset! symbolKind: LOCAL typeParameters: [] @@ -3695,7 +3695,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3713,7 +3713,7 @@ KtConstructorSymbol: isVararg: false name: bytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: LOCAL typeParameters: [] @@ -3732,7 +3732,7 @@ KtConstructorSymbol: isVararg: false name: charsetName origin: JAVA - receiverType: null + receiver: null returnType: kotlin/String! symbolKind: LOCAL typeParameters: [] @@ -3752,7 +3752,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3770,7 +3770,7 @@ KtConstructorSymbol: isVararg: false name: bytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: LOCAL typeParameters: [] @@ -3789,7 +3789,7 @@ KtConstructorSymbol: isVararg: false name: charset origin: JAVA - receiverType: null + receiver: null returnType: java/nio/charset/Charset! symbolKind: LOCAL typeParameters: [] @@ -3809,7 +3809,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3827,7 +3827,7 @@ KtConstructorSymbol: isVararg: false name: bytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: LOCAL typeParameters: [] @@ -3846,7 +3846,7 @@ KtConstructorSymbol: isVararg: false name: offset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3865,7 +3865,7 @@ KtConstructorSymbol: isVararg: false name: length origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -3885,7 +3885,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3903,7 +3903,7 @@ KtConstructorSymbol: isVararg: false name: bytes origin: JAVA - receiverType: null + receiver: null returnType: kotlin/ByteArray! symbolKind: LOCAL typeParameters: [] @@ -3923,7 +3923,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3941,7 +3941,7 @@ KtConstructorSymbol: isVararg: false name: buffer origin: JAVA - receiverType: null + receiver: null returnType: java/lang/StringBuffer! symbolKind: LOCAL typeParameters: [] @@ -3961,7 +3961,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -3979,7 +3979,7 @@ KtConstructorSymbol: isVararg: false name: builder origin: JAVA - receiverType: null + receiver: null returnType: java/lang/StringBuilder! symbolKind: LOCAL typeParameters: [] @@ -3999,7 +3999,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -4017,7 +4017,7 @@ KtConstructorSymbol: isVararg: false name: value origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharArray! symbolKind: LOCAL typeParameters: [] @@ -4036,7 +4036,7 @@ KtConstructorSymbol: isVararg: false name: share origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: LOCAL typeParameters: [] @@ -4059,7 +4059,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/lang/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -4077,7 +4077,7 @@ KtConstructorSymbol: isVararg: false name: offset origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -4096,7 +4096,7 @@ KtConstructorSymbol: isVararg: false name: count origin: JAVA - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -4115,7 +4115,7 @@ KtConstructorSymbol: isVararg: false name: value origin: JAVA - receiverType: null + receiver: null returnType: kotlin/CharArray! symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt index ef050857c7d..844d26daeff 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: ABSTRACT name: invoke origin: LIBRARY - receiverType: null + receiver: null returnType: R symbolKind: CLASS_MEMBER typeParameters: [] @@ -33,7 +33,7 @@ KtFunctionSymbol: isVararg: false name: p1 origin: LIBRARY - receiverType: null + receiver: null returnType: P1 symbolKind: LOCAL typeParameters: [] @@ -52,7 +52,7 @@ KtFunctionSymbol: isVararg: false name: p2 origin: LIBRARY - receiverType: null + receiver: null returnType: P2 symbolKind: LOCAL typeParameters: [] @@ -81,7 +81,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -99,7 +99,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -128,7 +128,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -155,7 +155,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt index 3a91fac3d7f..e54205fd000 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: serializeFirstTarget origin: PLUGIN - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -33,7 +33,7 @@ KtFunctionSymbol: isVararg: false name: x origin: PLUGIN - receiverType: null + receiver: null returnType: test/FirstTarget symbolKind: LOCAL typeParameters: [] @@ -62,7 +62,7 @@ KtFunctionSymbol: modality: FINAL name: serializeSecondTarget origin: PLUGIN - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -80,7 +80,7 @@ KtFunctionSymbol: isVararg: false name: x origin: PLUGIN - receiverType: null + receiver: null returnType: test/SecondTarget symbolKind: LOCAL typeParameters: [] @@ -109,7 +109,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -127,7 +127,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -156,7 +156,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -183,7 +183,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -202,7 +202,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE_MEMBER_GENERATED - receiverType: null + receiver: null returnType: test/Serializer symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt index acf3877840a..f2a1b542ff8 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: PLUGIN - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -42,7 +42,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -60,7 +60,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -89,7 +89,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -116,7 +116,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -135,7 +135,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: PLUGIN - receiverType: null + receiver: null returnType: test/WithGeneratedCompanion.Companion symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt index a77b2271f46..df1ac75ae8b 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: materialize origin: PLUGIN - receiverType: null + receiver: null returnType: test/MyClass symbolKind: CLASS_MEMBER typeParameters: [] @@ -42,7 +42,7 @@ KtFunctionSymbol: modality: OPEN name: equals origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Boolean symbolKind: CLASS_MEMBER typeParameters: [] @@ -60,7 +60,7 @@ KtFunctionSymbol: isVararg: false name: other origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Any? symbolKind: LOCAL typeParameters: [] @@ -89,7 +89,7 @@ KtFunctionSymbol: modality: OPEN name: hashCode origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -116,7 +116,7 @@ KtFunctionSymbol: modality: OPEN name: toString origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/String symbolKind: CLASS_MEMBER typeParameters: [] @@ -158,7 +158,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE_MEMBER_GENERATED - receiverType: null + receiver: null returnType: test/MyClass symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt index 1e3569c71a9..fe813dc23e3 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt @@ -15,10 +15,16 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ] + origin: SOURCE + type: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Int returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.descriptors.txt index 41f88ae44c3..c1cf63bbbdd 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.descriptors.txt @@ -15,7 +15,7 @@ KtPropertyGetterSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.txt index ac79ab9c9bf..ae0e41da3a3 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.txt @@ -15,7 +15,7 @@ KtPropertyGetterSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt index 2999d69b214..87fe5d92639 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt @@ -15,10 +15,16 @@ KtPropertyGetterSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Long + receiver: KtReceiverParameterSymbol: + annotationsList: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ] + origin: SOURCE + type: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Long 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 3352f1dd88c..a59724a9c2f 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.txt @@ -15,10 +15,16 @@ KtPropertyGetterSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Long + receiver: KtReceiverParameterSymbol: + annotationsList: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ] + origin: SOURCE + type: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Long returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt index 1ca53e6ed01..21814ec131a 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt @@ -19,7 +19,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -42,7 +42,7 @@ KtKotlinPropertySymbol: modality: FINAL name: lazyProperty origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt index d580685c2d3..25ffd9566d0 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt @@ -21,7 +21,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -44,7 +44,7 @@ KtKotlinPropertySymbol: modality: FINAL name: lazyProperty origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt index e6a2498f984..5bb8d72070d 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt @@ -14,10 +14,16 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Long + receiver: KtReceiverParameterSymbol: + annotationsList: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ] + origin: SOURCE + type: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Long returnType: kotlin/Boolean symbolKind: ACCESSOR typeParameters: [] @@ -40,10 +46,16 @@ KtKotlinPropertySymbol: modality: FINAL name: prop origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Long + receiver: KtReceiverParameterSymbol: + annotationsList: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ] + origin: SOURCE + type: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Long returnType: kotlin/Boolean setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.descriptors.txt index bad2d300a0c..c2a4694dff5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.descriptors.txt @@ -6,7 +6,7 @@ KtEnumEntrySymbol: isExtension: false name: SYNCHRONIZED origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/LazyThreadSafetyMode symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt index 89ecfcb9ff3..c7f76797361 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt @@ -6,7 +6,7 @@ KtEnumEntrySymbol: isExtension: false name: SYNCHRONIZED origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/LazyThreadSafetyMode symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.descriptors.txt index fa529d8ad50..d3ceaa81a36 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.descriptors.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: listOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/List symbolKind: TOP_LEVEL typeParameters: [ @@ -35,7 +35,7 @@ KtFunctionSymbol: isVararg: false name: element origin: SOURCE - receiverType: null + receiver: null returnType: T symbolKind: LOCAL typeParameters: [] @@ -67,7 +67,7 @@ KtFunctionSymbol: modality: FINAL name: listOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/List symbolKind: TOP_LEVEL typeParameters: [ @@ -95,7 +95,7 @@ KtFunctionSymbol: modality: FINAL name: listOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/List symbolKind: TOP_LEVEL typeParameters: [ @@ -115,7 +115,7 @@ KtFunctionSymbol: isVararg: true name: elements origin: SOURCE - receiverType: null + receiver: null returnType: T symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt index 0fe9b9cf763..ffcfd982e0a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: listOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/List symbolKind: TOP_LEVEL typeParameters: [ @@ -35,7 +35,7 @@ KtFunctionSymbol: isVararg: false name: element origin: LIBRARY - receiverType: null + receiver: null returnType: T symbolKind: LOCAL typeParameters: [] @@ -66,7 +66,7 @@ KtFunctionSymbol: modality: FINAL name: listOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/List symbolKind: TOP_LEVEL typeParameters: [ @@ -94,7 +94,7 @@ KtFunctionSymbol: modality: FINAL name: listOf origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/List symbolKind: TOP_LEVEL typeParameters: [ @@ -114,7 +114,7 @@ KtFunctionSymbol: isVararg: true name: elements origin: LIBRARY - receiverType: null + receiver: null returnType: T symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.descriptors.txt index 1bc96e9406a..0dec2ad6670 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.descriptors.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: ABSTRACT name: get origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: CLASS_MEMBER typeParameters: [] @@ -33,7 +33,7 @@ KtFunctionSymbol: isVararg: false name: index origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt index a5e60affdc9..a6b7b5ccc9a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: ABSTRACT name: get origin: LIBRARY - receiverType: null + receiver: null returnType: E symbolKind: CLASS_MEMBER typeParameters: [] @@ -33,7 +33,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.descriptors.txt index 1929df9799e..5bfcfb6c457 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.descriptors.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/ListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -43,7 +43,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/ListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -61,7 +61,7 @@ KtFunctionSymbol: isVararg: false name: index origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt index 756617db3d4..badc639d02d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/ListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -42,7 +42,7 @@ KtFunctionSymbol: modality: ABSTRACT name: listIterator origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/collections/ListIterator symbolKind: CLASS_MEMBER typeParameters: [] @@ -60,7 +60,7 @@ KtFunctionSymbol: isVararg: false name: index origin: LIBRARY - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt index f1f3c2eb5bc..cc280deee7b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: Anno symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: param1 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: param1 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -103,7 +103,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -127,7 +127,7 @@ KtConstructorSymbol: modality: FINAL name: param2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -148,7 +148,7 @@ KtConstructorSymbol: isVararg: false name: param2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -202,7 +202,7 @@ KtFunctionSymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt index 6cb91797eb5..c9b72df9e7e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: Anno symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: param1 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: param1 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -103,7 +103,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -127,7 +127,7 @@ KtConstructorSymbol: modality: FINAL name: param2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -148,7 +148,7 @@ KtConstructorSymbol: isVararg: false name: param2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -202,7 +202,7 @@ KtFunctionSymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt index 509f1e4acf3..0d5aa217eed 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: run origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -41,7 +41,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -65,7 +65,7 @@ KtKotlinPropertySymbol: modality: FINAL name: data origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -109,7 +109,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: java/lang/Runnable symbolKind: ACCESSOR typeParameters: [] @@ -133,7 +133,7 @@ KtKotlinPropertySymbol: modality: FINAL name: anonymousObject origin: SOURCE - receiverType: null + receiver: null returnType: java/lang/Runnable setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt index 7fdbcfb9d18..0c4fa92c046 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: run origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] @@ -41,7 +41,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -65,7 +65,7 @@ KtKotlinPropertySymbol: modality: FINAL name: data origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -109,7 +109,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: java/lang/Runnable symbolKind: ACCESSOR typeParameters: [] @@ -133,7 +133,7 @@ KtKotlinPropertySymbol: modality: FINAL name: anonymousObject origin: SOURCE - receiverType: null + receiver: null returnType: java/lang/Runnable setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt index 6bf03bb5153..e639a4954b0 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 - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -37,7 +37,7 @@ KtKotlinPropertySymbol: modality: FINAL name: p origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -64,13 +64,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -88,7 +88,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt index 3b1a9443df8..93b45efad15 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt index a8046358429..04a551cb99e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: a origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -69,7 +69,7 @@ KtFunctionSymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt index f295688f04e..9b8be85a986 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: A symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: a origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: a origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -96,7 +96,7 @@ KtConstructorSymbol: isVararg: false name: b origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt index 1a049f1f334..2af82c4b327 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: A symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: a origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: a origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -96,7 +96,7 @@ KtConstructorSymbol: isVararg: false name: b origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt index e723643949a..04fbe561af8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: A symbolKind: CLASS_MEMBER typeParameters: [] @@ -25,7 +25,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: SOURCE - receiverType: null + receiver: null returnType: A symbolKind: CLASS_MEMBER typeParameters: [] @@ -43,7 +43,7 @@ KtConstructorSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -63,7 +63,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: SOURCE - receiverType: null + receiver: null returnType: A symbolKind: CLASS_MEMBER typeParameters: [] @@ -81,7 +81,7 @@ KtConstructorSymbol: isVararg: false name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -100,7 +100,7 @@ KtConstructorSymbol: isVararg: false name: z origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.txt index 3fa82bcffd7..41c98f12127 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: SOURCE - receiverType: null + receiver: null returnType: A symbolKind: CLASS_MEMBER typeParameters: [] @@ -25,7 +25,7 @@ KtConstructorSymbol: isVararg: false name: int origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnFunction.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnFunction.txt index bb3c7a3fab0..1ed5d611cc9 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnFunction.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnFunction.txt @@ -18,7 +18,7 @@ KtFunctionSymbol: modality: FINAL name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.txt index 65e659506b6..98bd5d881b5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.txt @@ -17,7 +17,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -40,7 +40,7 @@ KtKotlinPropertySymbol: modality: FINAL name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt index d42cb3ec42f..d616a756042 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -103,7 +103,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -127,7 +127,7 @@ KtConstructorSymbol: modality: FINAL name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -148,7 +148,7 @@ KtConstructorSymbol: isVararg: false name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -174,7 +174,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -198,7 +198,7 @@ KtConstructorSymbol: modality: FINAL name: z origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -219,7 +219,7 @@ KtConstructorSymbol: isVararg: false name: z origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -260,7 +260,7 @@ KtAnonymousFunctionSymbol: hasStableParameterNames: true isExtension: false origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: LOCAL typeParameters: [] @@ -284,7 +284,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: ACCESSOR typeParameters: [] @@ -308,7 +308,7 @@ KtKotlinPropertySymbol: modality: FINAL name: delegate origin: SOURCE - receiverType: null + receiver: null returnType: MyColor setter: null symbolKind: CLASS_MEMBER @@ -329,7 +329,7 @@ KtAnonymousFunctionSymbol: hasStableParameterNames: true isExtension: false origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: LOCAL typeParameters: [] @@ -353,7 +353,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Lazy symbolKind: ACCESSOR typeParameters: [] @@ -377,7 +377,7 @@ KtKotlinPropertySymbol: modality: FINAL name: lambda origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Lazy setter: null symbolKind: CLASS_MEMBER @@ -407,7 +407,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: ACCESSOR typeParameters: [] @@ -431,7 +431,7 @@ KtKotlinPropertySymbol: modality: FINAL name: nonLazy origin: SOURCE - receiverType: null + receiver: null returnType: MyColor setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt index 61224a36735..bf97feaec9e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -103,7 +103,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -127,7 +127,7 @@ KtConstructorSymbol: modality: FINAL name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -148,7 +148,7 @@ KtConstructorSymbol: isVararg: false name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -174,7 +174,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -198,7 +198,7 @@ KtConstructorSymbol: modality: FINAL name: z origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -219,7 +219,7 @@ KtConstructorSymbol: isVararg: false name: z origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -260,7 +260,7 @@ KtAnonymousFunctionSymbol: hasStableParameterNames: true isExtension: false origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: LOCAL typeParameters: [] @@ -284,7 +284,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: ACCESSOR typeParameters: [] @@ -307,7 +307,7 @@ KtKotlinPropertySymbol: modality: FINAL name: delegate origin: SOURCE - receiverType: null + receiver: null returnType: MyColor setter: null symbolKind: CLASS_MEMBER @@ -328,7 +328,7 @@ KtAnonymousFunctionSymbol: hasStableParameterNames: true isExtension: false origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: LOCAL typeParameters: [] @@ -352,7 +352,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Lazy symbolKind: ACCESSOR typeParameters: [] @@ -376,7 +376,7 @@ KtKotlinPropertySymbol: modality: FINAL name: lambda origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Lazy setter: null symbolKind: CLASS_MEMBER @@ -406,7 +406,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: MyColor symbolKind: ACCESSOR typeParameters: [] @@ -430,7 +430,7 @@ KtKotlinPropertySymbol: modality: FINAL name: nonLazy origin: SOURCE - receiverType: null + receiver: null returnType: MyColor setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt index b8adccd8534..24fe8be1e70 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 - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -40,7 +40,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -72,7 +72,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -95,7 +95,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -124,7 +124,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -147,7 +147,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i3 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -177,13 +177,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -201,7 +201,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -241,7 +241,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -264,7 +264,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i4 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -294,13 +294,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -318,7 +318,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -359,7 +359,7 @@ KtFunctionSymbol: modality: FINAL name: f origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -413,7 +413,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -437,7 +437,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -471,7 +471,7 @@ KtFunctionSymbol: modality: FINAL name: f2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -523,7 +523,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -546,7 +546,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -578,7 +578,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -601,7 +601,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -630,7 +630,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -653,7 +653,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j2 origin: SOURCE - receiverType: null + receiver: 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 d91710bff50..9e8d1d3bad2 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 - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -40,7 +40,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -72,7 +72,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -95,7 +95,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -124,7 +124,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -147,7 +147,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i3 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -177,13 +177,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -201,7 +201,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -240,7 +240,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -263,7 +263,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i4 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [ @@ -293,13 +293,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -317,7 +317,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -357,7 +357,7 @@ KtFunctionSymbol: modality: FINAL name: f origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -411,7 +411,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -435,7 +435,7 @@ KtKotlinPropertySymbol: modality: FINAL name: i2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -469,7 +469,7 @@ KtFunctionSymbol: modality: FINAL name: f2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -521,7 +521,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -544,7 +544,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -576,7 +576,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -599,7 +599,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL @@ -631,7 +631,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -654,7 +654,7 @@ KtKotlinPropertySymbol: modality: FINAL name: j2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt index ebce635f493..c2c64930e0e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: P symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -103,7 +103,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -127,7 +127,7 @@ KtConstructorSymbol: modality: FINAL name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -148,7 +148,7 @@ KtConstructorSymbol: isVararg: false name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -190,7 +190,7 @@ KtLocalVariableSymbol: isVal: true name: l origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -205,7 +205,7 @@ KtLocalVariableSymbol: isVal: true name: r origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -229,7 +229,7 @@ KtFunctionSymbol: modality: FINAL name: destruct origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt index bbea82d95a9..7182031cc82 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: P symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -103,7 +103,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -127,7 +127,7 @@ KtConstructorSymbol: modality: FINAL name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -148,7 +148,7 @@ KtConstructorSymbol: isVararg: false name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -190,7 +190,7 @@ KtLocalVariableSymbol: isVal: true name: l origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -205,7 +205,7 @@ KtLocalVariableSymbol: isVal: true name: r origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -229,7 +229,7 @@ KtFunctionSymbol: modality: FINAL name: destruct origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.txt index 8c5b420bd82..8211e8e5f8e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: dynamic symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: p origin: SOURCE - receiverType: null + receiver: null returnType: dynamic setter: null symbolKind: CLASS_MEMBER @@ -59,7 +59,7 @@ KtAnonymousFunctionSymbol: hasStableParameterNames: true isExtension: false origin: SOURCE - receiverType: null + receiver: null returnType: dynamic symbolKind: LOCAL typeParameters: [] @@ -84,7 +84,7 @@ KtFunctionSymbol: modality: FINAL name: f origin: SOURCE - receiverType: null + receiver: null returnType: dynamic symbolKind: CLASS_MEMBER typeParameters: [] @@ -102,7 +102,7 @@ KtFunctionSymbol: isVararg: false name: p origin: SOURCE - receiverType: null + receiver: null returnType: dynamic symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt index ad951526c1f..c4a2e4175d4 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt @@ -6,7 +6,7 @@ KtEnumEntrySymbol: isExtension: false name: Y origin: SOURCE - receiverType: null + receiver: null returnType: X symbolKind: CLASS_MEMBER typeParameters: [] @@ -21,7 +21,7 @@ KtEnumEntrySymbol: isExtension: false name: Z origin: SOURCE - receiverType: null + receiver: null returnType: X symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt index ac5d864f11c..6a0d22500bf 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: Style symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -104,7 +104,7 @@ KtKotlinPropertySymbol: isOverride: true modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -128,7 +128,7 @@ KtKotlinPropertySymbol: modality: FINAL name: exitAnimation origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER @@ -150,7 +150,7 @@ KtEnumEntrySymbol: isExtension: false name: SHEET origin: SOURCE - receiverType: null + receiver: null returnType: Style symbolKind: CLASS_MEMBER typeParameters: [] @@ -173,7 +173,7 @@ KtKotlinPropertySymbol: isOverride: false modality: ABSTRACT origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -197,7 +197,7 @@ KtKotlinPropertySymbol: modality: ABSTRACT name: exitAnimation origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt index 04404253da0..d885ffb54cb 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: true origin: SOURCE - receiverType: null + receiver: null returnType: Style symbolKind: CLASS_MEMBER typeParameters: [] @@ -32,7 +32,7 @@ KtConstructorSymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -56,7 +56,7 @@ KtConstructorSymbol: modality: FINAL name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER @@ -77,7 +77,7 @@ KtConstructorSymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: LOCAL typeParameters: [] @@ -104,7 +104,7 @@ KtKotlinPropertySymbol: isOverride: true modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -127,7 +127,7 @@ KtKotlinPropertySymbol: modality: FINAL name: exitAnimation origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER @@ -149,7 +149,7 @@ KtEnumEntrySymbol: isExtension: false name: SHEET origin: SOURCE - receiverType: null + receiver: null returnType: Style symbolKind: CLASS_MEMBER typeParameters: [] @@ -172,7 +172,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String symbolKind: ACCESSOR typeParameters: [] @@ -196,7 +196,7 @@ KtKotlinPropertySymbol: modality: ABSTRACT name: exitAnimation origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/String setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt index 6bf03bb5153..e639a4954b0 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 - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -37,7 +37,7 @@ KtKotlinPropertySymbol: modality: FINAL name: p origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -64,13 +64,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -88,7 +88,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: 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 da95235f850..328e904a1f6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt @@ -15,7 +15,10 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: kotlin/String + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: kotlin/String returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt index a70ed75943c..0408f8163c5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt @@ -6,7 +6,7 @@ KtLocalVariableSymbol: isVal: true name: loopVariable origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -30,7 +30,7 @@ KtFunctionSymbol: modality: FINAL name: usage origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt index 22b854edc5a..c73306a2860 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -33,7 +33,7 @@ KtFunctionSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt index 03f595d94f8..7e2e5bb33c8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt @@ -26,7 +26,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [ @@ -46,7 +46,7 @@ KtFunctionSymbol: isVararg: false name: x origin: SOURCE - receiverType: null + receiver: null returnType: X symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt index d9d91769d30..2ee18858b64 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: SOURCE - receiverType: null + receiver: null returnType: A symbolKind: CLASS_MEMBER typeParameters: [] @@ -25,7 +25,7 @@ KtConstructorSymbol: isVararg: false name: i origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt index d330861f529..9dfc4f82fa7 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt index fde2cbcdf71..f1af8fd8116 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt @@ -6,7 +6,7 @@ KtLocalVariableSymbol: isVal: true name: b origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -20,7 +20,7 @@ KtAnonymousFunctionSymbol: hasStableParameterNames: true isExtension: false origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -38,7 +38,7 @@ KtAnonymousFunctionSymbol: isVararg: false name: a origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -56,7 +56,7 @@ KtLocalVariableSymbol: isVal: true name: lam1 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Function1 symbolKind: LOCAL typeParameters: [] @@ -71,7 +71,7 @@ KtLocalVariableSymbol: isVal: true name: c origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -85,7 +85,7 @@ KtAnonymousFunctionSymbol: hasStableParameterNames: true isExtension: false origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -103,7 +103,7 @@ KtAnonymousFunctionSymbol: isVararg: false name: a origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -121,7 +121,7 @@ KtLocalVariableSymbol: isVal: true name: lam2 origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Function1 symbolKind: LOCAL typeParameters: [] @@ -136,7 +136,7 @@ KtLocalVariableSymbol: isVal: true name: b origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -150,7 +150,7 @@ KtAnonymousFunctionSymbol: hasStableParameterNames: true isExtension: false origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -168,7 +168,7 @@ KtAnonymousFunctionSymbol: isVararg: false name: it origin: SOURCE_MEMBER_GENERATED - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -195,7 +195,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -221,7 +221,7 @@ KtFunctionSymbol: modality: FINAL name: bar origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -239,7 +239,7 @@ KtFunctionSymbol: isVararg: false name: lmbd origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Function1 symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt index 5d75d73c82a..4b7ee249f0e 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 - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -37,7 +37,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmField origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -64,13 +64,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -88,7 +88,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -125,7 +125,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -148,7 +148,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmFieldOnField origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -175,13 +175,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -199,7 +199,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: 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 e6e49f41fe8..f4edeb4551d 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 - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: ACCESSOR typeParameters: [] @@ -40,7 +40,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmField origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long setter: KtPropertySetterSymbol: annotationsList: [] @@ -67,13 +67,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -91,7 +91,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Long symbolKind: LOCAL typeParameters: [] @@ -130,7 +130,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -153,7 +153,7 @@ KtKotlinPropertySymbol: modality: FINAL name: jvmFieldOnField origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: KtPropertySetterSymbol: annotationsList: [] @@ -180,13 +180,13 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: ACCESSOR typeParameters: [] @@ -204,7 +204,7 @@ KtKotlinPropertySymbol: isVararg: false name: value origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt index b08b823ce01..fc1703e365e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt @@ -6,7 +6,7 @@ KtLocalVariableSymbol: isVal: true name: q origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -30,7 +30,7 @@ KtFunctionSymbol: modality: FINAL name: aaa origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: LOCAL typeParameters: [] @@ -79,7 +79,7 @@ KtFunctionSymbol: modality: FINAL name: yyy origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt index d388b0b5310..70a662cac5c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: CLASS_MEMBER typeParameters: [] @@ -42,7 +42,7 @@ KtFunctionSymbol: modality: FINAL name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt index a382266ecec..ab4837d4ece 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt @@ -14,7 +14,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -38,7 +38,7 @@ KtKotlinPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER @@ -68,7 +68,10 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: kotlin/Int returnType: kotlin/Int symbolKind: ACCESSOR typeParameters: [] @@ -91,7 +94,10 @@ KtKotlinPropertySymbol: modality: FINAL name: y origin: SOURCE - receiverType: kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [] + origin: SOURCE + type: kotlin/Int returnType: kotlin/Int setter: null symbolKind: CLASS_MEMBER diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt index 1de0f46707c..9f371666f27 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt @@ -473,7 +473,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: CLASS_MEMBER typeParameters: [ diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt index b0d91a51aa0..f8eb3fd55c0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: TOP_LEVEL typeParameters: [] @@ -41,7 +41,7 @@ KtFunctionSymbol: modality: FINAL name: y origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt index b185e5e62ad..c8f2349311c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt @@ -142,7 +142,7 @@ KtFunctionSymbol: modality: FINAL name: f origin: SOURCE - receiverType: null + receiver: null returnType: [ Anno3() psi: KtAnnotationEntry @@ -163,7 +163,7 @@ KtFunctionSymbol: isVararg: false name: arg origin: SOURCE - receiverType: null + receiver: null returnType: [ Anno2() psi: KtAnnotationEntry @@ -194,7 +194,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: [ Anno4() psi: KtAnnotationEntry @@ -221,7 +221,7 @@ KtKotlinPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: [ Anno4() psi: KtAnnotationEntry diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt index b0baaa2ddfe..364ac8ea625 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt @@ -142,7 +142,7 @@ KtFunctionSymbol: modality: FINAL name: f origin: SOURCE - receiverType: null + receiver: null returnType: [ Anno3() psi: KtAnnotationEntry @@ -163,7 +163,7 @@ KtFunctionSymbol: isVararg: false name: arg origin: SOURCE - receiverType: null + receiver: null returnType: [ Anno2() psi: KtAnnotationEntry @@ -194,7 +194,7 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: null + receiver: null returnType: [ Anno4() psi: KtAnnotationEntry @@ -221,7 +221,7 @@ KtKotlinPropertySymbol: modality: FINAL name: x origin: SOURCE - receiverType: null + receiver: null returnType: [ Anno4() psi: KtAnnotationEntry diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.txt index 912a7d00d4e..cf5a26351f6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -33,7 +33,7 @@ KtFunctionSymbol: isVararg: false name: inlineParameter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Function0 symbolKind: LOCAL typeParameters: [] @@ -52,7 +52,7 @@ KtFunctionSymbol: isVararg: false name: crossinlineParameter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Function0 symbolKind: LOCAL typeParameters: [] @@ -71,7 +71,7 @@ KtFunctionSymbol: isVararg: false name: noinlineParameter origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Function0 symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt index a679620740e..897a090fb74 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: primitive origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -33,7 +33,7 @@ KtFunctionSymbol: isVararg: true name: a origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] @@ -61,7 +61,7 @@ KtFunctionSymbol: modality: FINAL name: nullablePrimitive origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -79,7 +79,7 @@ KtFunctionSymbol: isVararg: true name: b origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Float? symbolKind: LOCAL typeParameters: [] @@ -107,7 +107,7 @@ KtFunctionSymbol: modality: FINAL name: nonPrimitive origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -125,7 +125,7 @@ KtFunctionSymbol: isVararg: true name: c origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Any symbolKind: LOCAL typeParameters: [] @@ -153,7 +153,7 @@ KtFunctionSymbol: modality: FINAL name: error origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] @@ -171,7 +171,7 @@ KtFunctionSymbol: isVararg: true name: d origin: SOURCE - receiverType: null + receiver: null returnType: ERROR_TYPE symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt index ff7ca838e81..96939567e37 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt @@ -6,7 +6,7 @@ KtBackingFieldSymbol: name: field origin: PROPERTY_BACKING_FIELD owningProperty: KtKotlinPropertySymbol(/x) - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.txt index 80d6788d5b7..5c7e7374933 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/util/ArrayList symbolKind: CLASS_MEMBER typeParameters: [ @@ -27,7 +27,7 @@ KtConstructorSymbol: isVararg: false name: c origin: JAVA - receiverType: null + receiver: null returnType: (kotlin/collections/MutableCollection..kotlin/collections/Collection?) symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt index 141a145f6ca..c13441c1355 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt @@ -7,7 +7,7 @@ KtConstructorSymbol: isExtension: false isPrimary: false origin: JAVA - receiverType: null + receiver: null returnType: java/util/ArrayList symbolKind: CLASS_MEMBER typeParameters: [ @@ -27,7 +27,7 @@ KtConstructorSymbol: isVararg: false name: c origin: JAVA - receiverType: null + receiver: null returnType: ft>, kotlin/collections/Collection>?> symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.txt index 4eaf9b3614e..fec22cf68fa 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.txt @@ -11,7 +11,7 @@ KtValueParameterSymbol: isVararg: false name: it origin: SOURCE - receiverType: null + receiver: 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 1e3569c71a9..fe813dc23e3 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.txt @@ -15,10 +15,16 @@ KtFunctionSymbol: modality: FINAL name: foo origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Int + receiver: KtReceiverParameterSymbol: + annotationsList: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ] + origin: SOURCE + type: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Int returnType: kotlin/Unit symbolKind: TOP_LEVEL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.txt b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.txt index 06290e27867..f60bef0dd50 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: withOuter origin: SOURCE - receiverType: null + receiver: null returnType: Outer? symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.descriptors.txt index d78f7d8c915..f42e7d514f8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.descriptors.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: withOuter origin: SOURCE - receiverType: null + receiver: null returnType: Outer? symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.txt b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.txt index 2336966f7c3..9afe02dcb3c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.txt @@ -15,7 +15,7 @@ KtFunctionSymbol: modality: FINAL name: withOuter origin: SOURCE - receiverType: null + receiver: null returnType: Outer? symbolKind: CLASS_MEMBER typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/implicitLambdaParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/implicitLambdaParameter.txt index be8584a36a8..bc836ecad99 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/implicitLambdaParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/implicitLambdaParameter.txt @@ -11,7 +11,7 @@ KtValueParameterSymbol: isVararg: false name: it origin: SOURCE_MEMBER_GENERATED - receiverType: null + receiver: null returnType: kotlin/Int symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt index e6a2498f984..5bb8d72070d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt @@ -14,10 +14,16 @@ KtKotlinPropertySymbol: isOverride: false modality: FINAL origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Long + receiver: KtReceiverParameterSymbol: + annotationsList: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ] + origin: SOURCE + type: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Long returnType: kotlin/Boolean symbolKind: ACCESSOR typeParameters: [] @@ -40,10 +46,16 @@ KtKotlinPropertySymbol: modality: FINAL name: prop origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Long + receiver: KtReceiverParameterSymbol: + annotationsList: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ] + origin: SOURCE + type: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Long returnType: kotlin/Boolean setter: null symbolKind: TOP_LEVEL diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.descriptors.txt index e726796268f..cb6c6046340 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.descriptors.txt @@ -6,7 +6,7 @@ KtSamConstructorSymbol: isExtension: false name: Runnable origin: SAM_CONSTRUCTOR - receiverType: null + receiver: null returnType: java/lang/Runnable symbolKind: SAM_CONSTRUCTOR typeParameters: [] @@ -24,7 +24,7 @@ KtSamConstructorSymbol: isVararg: false name: function origin: SOURCE - receiverType: null + receiver: null returnType: kotlin/Function0 symbolKind: LOCAL typeParameters: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt index be0000e8c6a..d5e97954fb5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt @@ -6,7 +6,7 @@ KtSamConstructorSymbol: isExtension: false name: Runnable origin: SAM_CONSTRUCTOR - receiverType: null + receiver: null returnType: java/lang/Runnable symbolKind: SAM_CONSTRUCTOR typeParameters: [] @@ -24,7 +24,7 @@ KtSamConstructorSymbol: isVararg: false name: function origin: SAM_CONSTRUCTOR - receiverType: null + receiver: null returnType: kotlin/Function0 symbolKind: LOCAL typeParameters: [] diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/analysis/providers/PsiDeclarationAndKtSymbolEqualityChecker.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/analysis/providers/PsiDeclarationAndKtSymbolEqualityChecker.kt index 1c31f2593b3..901a61d9f80 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/analysis/providers/PsiDeclarationAndKtSymbolEqualityChecker.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/analysis/providers/PsiDeclarationAndKtSymbolEqualityChecker.kt @@ -51,7 +51,7 @@ internal object PsiDeclarationAndKtSymbolEqualityChecker { if (psi.parameterList.parametersCount != valueParameterCount) return false if (symbol.isExtension) { val psiParameter = psi.parameterList.parameters[0] - if (symbol.receiverType?.let { isTheSameTypes(psi, psiParameter.type, it, isVararg = false) } != true) return false + if (symbol.receiver?.type?.let { isTheSameTypes(psi, psiParameter.type, it, isVararg = false) } != true) return false } val offset = if (symbol.isExtension) 1 else 0 symbol.valueParameters.forEachIndexed { index, valueParameterSymbol -> diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterForReceiver.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterForReceiver.kt index a82ae51e21b..3ec74c3ae02 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterForReceiver.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterForReceiver.kt @@ -13,9 +13,9 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.annotations.annotations import org.jetbrains.kotlin.analysis.api.lifetime.isValid import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol -import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolLightAnnotationForAnnotationCall @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.KtParameter context(KtAnalysisSession) internal class SymbolLightParameterForReceiver private constructor( - private val receiverType: KtType, + private val receiver: KtReceiverParameterSymbol, private val context: KtSymbol, methodName: String, method: SymbolLightMethodBase @@ -43,13 +43,13 @@ internal class SymbolLightParameterForReceiver private constructor( if (callableSymbol !is KtNamedSymbol) return null if (!callableSymbol.isExtension) return null - val extensionTypeAndAnnotations = callableSymbol.receiverType ?: return null + val extensionTypeAndAnnotations = callableSymbol.receiver ?: return null return SymbolLightParameterForReceiver( - receiverType = extensionTypeAndAnnotations, + receiver = extensionTypeAndAnnotations, context = callableSymbol, methodName = callableSymbol.name.asString(), - method = method + method = method, ) } } @@ -69,8 +69,8 @@ internal class SymbolLightParameterForReceiver private constructor( private val _annotations: List by lazyPub { buildList { - receiverType.nullabilityType.computeNullabilityAnnotation(this@SymbolLightParameterForReceiver)?.let { add(it) } - receiverType.annotations.mapTo(this) { + receiver.type.nullabilityType.computeNullabilityAnnotation(this@SymbolLightParameterForReceiver)?.let { add(it) } + receiver.annotations.mapTo(this) { SymbolLightAnnotationForAnnotationCall(it, this@SymbolLightParameterForReceiver) } } @@ -82,7 +82,7 @@ internal class SymbolLightParameterForReceiver private constructor( } private val _type: PsiType by lazyPub { - receiverType.asPsiType(this@SymbolLightParameterForReceiver) ?: nonExistentType() + receiver.type.asPsiType(this@SymbolLightParameterForReceiver) ?: nonExistentType() } override fun getType(): PsiType = _type @@ -90,7 +90,7 @@ internal class SymbolLightParameterForReceiver private constructor( override fun equals(other: Any?): Boolean = this === other || (other is SymbolLightParameterForReceiver && - receiverType == other.receiverType) + receiver == other.receiver) override fun hashCode(): Int = kotlinOrigin.hashCode()