[AA] integrate KtReceiverParameterSymbol to KtCallableSymbol

^KT-54417

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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
     override val contextReceivers: List<KtContextReceiver>
         get() = withValidityAssertion { descriptor.createContextReceivers(analysisContext) }

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.
+ * 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.
- */
-
-/*
- * 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.
  */
 
@@ -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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
     override val modality: Modality
         get() = withValidityAssertion { propertyDescriptor.ktModality }

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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
     override val modality: Modality
         get() = withValidityAssertion { propertyDescriptor.ktModality }

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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
     override val contextReceivers: List<KtContextReceiver>
         get() = withValidityAssertion { descriptor.createContextReceivers(analysisContext) }

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.lifetime.withValidityAssertion
-import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol
 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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
     override val contextReceivers: List<KtContextReceiver>
         get() = withValidityAssertion { descriptor.createContextReceivers(analysisContext) }

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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
     override fun createPointer(): KtSymbolPointer<KtPropertyGetterSymbol> = withValidityAssertion {
         return KtPsiBasedSymbolPointer.createForSymbolFromSource<KtPropertyGetterSymbol>(this) ?: KtFe10NeverRestoringSymbolPointer()

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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
     override fun createPointer(): KtSymbolPointer<KtPropertySetterSymbol> {
         withValidityAssertion {

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.lifetime.withValidityAssertion
-import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin
+import org.jetbrains.kotlin.analysis.api.symbols.*
-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.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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
     override val contextReceivers: List<KtContextReceiver>
         get() = withValidityAssertion { descriptor.createContextReceivers(analysisContext) }

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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
 
     override val typeParameters: List<KtTypeParameterSymbol>

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?
+    override val receiver: KtReceiverParameterSymbol?
-        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext) }
+        get() = withValidityAssertion { descriptor.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext) }
 
     override val typeParameters: List<KtTypeParameterSymbol>
         get() = withValidityAssertion { descriptor.typeParameters.map { it.toKtTypeParameter(analysisContext) } }

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()
+            return descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext)
-            val extensionReceiverParameter = descriptor.extensionReceiverParameter ?: return null
-            return extensionReceiverParameter.type.toKtType(analysisContext)
         }
 
     override val contextReceivers: List<KtContextReceiver>

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()) {
+            if (!propertyPsi.isExtensionDeclaration()) {
-                descriptor?.extensionReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType()
+                return null
-            } else {
-                null
             }
+
+            descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext)
         }
 
     override val modality: Modality

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()) {
+            if (!propertyPsi.isExtensionDeclaration()) {
-                descriptor?.extensionReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType()
+                return null
-            } else {
-                null
             }
+
+            descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext)
         }
 
     override val modality: Modality

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()
+            return descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext)
-            val extensionReceiverParameter = descriptor.extensionReceiverParameter ?: return null
-            return extensionReceiverParameter.type.toKtType(analysisContext)
         }
 
     override val contextReceivers: List<KtContextReceiver>

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.lifetime.withValidityAssertion
-import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol
 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()) {
+            if (!psi.isExtensionDeclaration()) {
-                descriptor?.extensionReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType()
+                return null
-            } else {
-                null
             }
+
+            descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext)
         }
 
     override val contextReceivers: List<KtContextReceiver>

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()
+            if (!psi.isExtensionDeclaration()) {
-            val extensionReceiverParameter = descriptor.extensionReceiverParameter ?: return null
+                return null
-            extensionReceiverParameter.type.toKtType(analysisContext)
+            }
+
+            descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext)
         }
 
     override val contextReceivers: List<KtContextReceiver>

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
+            descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext)
-            return when {
-                descriptor != null -> descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext)
-                !psi.property.isTopLevel -> createErrorType()
-                else -> null
-            }
         }
 
     override fun createPointer(): KtSymbolPointer<KtPropertyGetterSymbol> = withValidityAssertion {

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
+            descriptor?.extensionReceiverParameter?.toKtReceiverParameterSymbol(analysisContext)
-            return when {
-                descriptor != null -> descriptor.extensionReceiverParameter?.type?.toKtType(analysisContext)
-                psi.property.isExtensionDeclaration() -> createErrorType()
-                else -> null
-            }
         }
 
     override val parameter: KtValueParameterSymbol

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<KtContextReceiver> by cached { firSymbol.createContextReceivers(builder) }
 

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<KtContextReceiver> by cached { firSymbol.createContextReceivers(builder) }
 
     override val typeParameters by cached { firSymbol.createKtTypeParameters(builder) }

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<KtContextReceiver> by cached { firSymbol.createContextReceivers(builder) }
 

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) }
 
     /**

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<KtValueParameterSymbol> 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

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() }
 

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<KtTypeParameterSymbol>
         get() = withValidityAssertion { firSymbol.createKtTypeParameters(builder) }

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<FirTypeRef>.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)

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 <S : KtFunctionLikeSymbol> asSignature(symbol: S): KtFunctionLikeSignature<S> {
-        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 <S : KtVariableLikeSymbol> asSignature(symbol: S): KtVariableLikeSignature<S> {
-        return KtVariableLikeSignature(symbol, symbol.returnType, symbol.receiverType)
+        return KtVariableLikeSignature(symbol, symbol.returnType, symbol.receiver?.type)
     }
 }

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)
     }
 

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 ->
+            (this@with as? KtFunctionSymbol)?.receiver?.let { receiver ->
-                append("<extension receiver>: ${receiver.render()}")
+                append("<extension receiver>: ${receiver.type.render()}")
                 if (valueParameters.isNotEmpty()) append(", ")
             }
 

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<String> = emptyList()) {
         renderSymbolHeader(symbol)
         val apiClass = getSymbolApiClass(symbol)
         withIndent {
             apiClass.members
                 .asSequence()
                 .filterIsInstance<KProperty<*>>()
-                .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
         }

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<KtCallableSymbol>

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<KtContextReceiver> get() = withValidityAssertion { emptyList() }
 
     abstract override fun createPointer(): KtSymbolPointer<KtConstructorSymbol>

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<KtContextReceiver> get() = withValidityAssertion { emptyList() }
 
     final override val typeParameters: List<KtTypeParameterSymbol>
@@ -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<KtContextReceiver> get() = withValidityAssertion { emptyList() }
 
     final override val typeParameters: List<KtTypeParameterSymbol>
@@ -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<KtContextReceiver> get() = withValidityAssertion { emptyList() }
 
     final override val typeParameters: List<KtTypeParameterSymbol>
@@ -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<KtContextReceiver> get() = withValidityAssertion { emptyList() }
 
     final override val typeParameters: List<KtTypeParameterSymbol>
@@ -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<KtContextReceiver> get() = withValidityAssertion { emptyList() }
 
     /**

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<X, kotlin/collections/Map<Y, O>>
   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<X, O>
     symbolKind: ACCESSOR
     typeParameters: []
@@ -158,7 +158,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: map
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/Map<X, O>
   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: []

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<E>
       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<E>
   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<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -442,7 +442,7 @@ KtFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/ListIterator<E>
   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<E>
   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: []

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<X, kotlin/collections/Map<Y, O>>
   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<X, O>
     symbolKind: ACCESSOR
     typeParameters: []
@@ -152,7 +152,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: map
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/Map<X, O>
   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: []

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<X, Y>
   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<X, kotlin/String>
     symbolKind: ACCESSOR
     typeParameters: []
@@ -152,7 +152,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: map
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/Map<X, kotlin/String>
   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: []

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<E>
       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<E>
   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<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -442,7 +442,7 @@ KtFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/ListIterator<E>
   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<E>
   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: []

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

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

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

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: []

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: []

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: []

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

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: []

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<E>
       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<E>
       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<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -295,7 +295,7 @@ KtFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/MutableListIterator<E>
   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<E>
       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<E>
       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<E>
   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<E>
       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<E>
   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: []

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<test/E!>, java/lang/Class<test/E!>?>
   symbolKind: CLASS_MEMBER
   typeParameters: []

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: []

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: []

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: []

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: []

analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt

@@ -15,10 +15,16 @@ KtFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverType: [
+  receiver: KtReceiverParameterSymbol:
-    ReceiverTypeAnnotation()
+    annotationsList: [
-      psi: KtAnnotationEntry
+      ReceiverAnnotation()
-  ] @R|ReceiverTypeAnnotation|()  kotlin/Int
+        psi: KtAnnotationEntry
+    ]
+    origin: SOURCE
+    type: [
+      ReceiverTypeAnnotation()
+        psi: KtAnnotationEntry
+    ] @R|ReceiverTypeAnnotation|()  kotlin/Int
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []

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: []

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: []

analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.descriptors.txt

@@ -15,10 +15,16 @@ KtPropertyGetterSymbol:
   isOverride: false
   modality: FINAL
   origin: SOURCE
-  receiverType: [
+  receiver: KtReceiverParameterSymbol:
-    ReceiverTypeAnnotation()
+    annotationsList: [
-      psi: KtAnnotationEntry
+      ReceiverAnnotation()
-  ] @R|ReceiverTypeAnnotation|()  kotlin/Long
+        psi: KtAnnotationEntry
+    ]
+    origin: SOURCE
+    type: [
+      ReceiverTypeAnnotation()
+        psi: KtAnnotationEntry
+    ] @R|ReceiverTypeAnnotation|()  kotlin/Long
   returnType: kotlin/Int
   symbolKind: ACCESSOR
   typeParameters: []

analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.txt

@@ -15,10 +15,16 @@ KtPropertyGetterSymbol:
   isOverride: false
   modality: FINAL
   origin: SOURCE
-  receiverType: [
+  receiver: KtReceiverParameterSymbol:
-    ReceiverTypeAnnotation()
+    annotationsList: [
-      psi: KtAnnotationEntry
+      ReceiverAnnotation()
-  ] @R|ReceiverTypeAnnotation|()  kotlin/Long
+        psi: KtAnnotationEntry
+    ]
+    origin: SOURCE
+    type: [
+      ReceiverTypeAnnotation()
+        psi: KtAnnotationEntry
+    ] @R|ReceiverTypeAnnotation|()  kotlin/Long
   returnType: kotlin/Int
   symbolKind: ACCESSOR
   typeParameters: []

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

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

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt

@@ -14,10 +14,16 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: [
+    receiver: KtReceiverParameterSymbol:
-      ReceiverTypeAnnotation()
+      annotationsList: [
-        psi: KtAnnotationEntry
+        ReceiverAnnotation()
-    ] @R|ReceiverTypeAnnotation|()  kotlin/Long
+          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: [
+  receiver: KtReceiverParameterSymbol:
-    ReceiverTypeAnnotation()
+    annotationsList: [
-      psi: KtAnnotationEntry
+      ReceiverAnnotation()
-  ] @R|ReceiverTypeAnnotation|()  kotlin/Long
+        psi: KtAnnotationEntry
+    ]
+    origin: SOURCE
+    type: [
+      ReceiverTypeAnnotation()
+        psi: KtAnnotationEntry
+    ] @R|ReceiverTypeAnnotation|()  kotlin/Long
   returnType: kotlin/Boolean
   setter: null
   symbolKind: TOP_LEVEL

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: []

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: []

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<T>
   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<T>
   symbolKind: TOP_LEVEL
   typeParameters: [
@@ -95,7 +95,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: listOf
   origin: LIBRARY
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/List<T>
   symbolKind: TOP_LEVEL
   typeParameters: [
@@ -115,7 +115,7 @@ KtFunctionSymbol:
       isVararg: true
       name: elements
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: T
       symbolKind: LOCAL
       typeParameters: []

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<T>
   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<T>
   symbolKind: TOP_LEVEL
   typeParameters: [
@@ -94,7 +94,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: listOf
   origin: LIBRARY
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/List<T>
   symbolKind: TOP_LEVEL
   typeParameters: [
@@ -114,7 +114,7 @@ KtFunctionSymbol:
       isVararg: true
       name: elements
       origin: LIBRARY
-      receiverType: null
+      receiver: null
       returnType: T
       symbolKind: LOCAL
       typeParameters: []

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: []

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: []

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<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -43,7 +43,7 @@ KtFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/ListIterator<E>
   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: []

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<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -42,7 +42,7 @@ KtFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverType: null
+  receiver: null
   returnType: kotlin/collections/ListIterator<E>
   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: []

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: []

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: []

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

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

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: []

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

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: []

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: []

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: []

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: []

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: []

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: []

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

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<MyColor>
     symbolKind: ACCESSOR
     typeParameters: []
@@ -377,7 +377,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: lambda
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Lazy<MyColor>
   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

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<MyColor>
     symbolKind: ACCESSOR
     typeParameters: []
@@ -376,7 +376,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: lambda
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Lazy<MyColor>
   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

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

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

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: []

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: []

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: []

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: []

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

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

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: []

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: []

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: []

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: []

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: []

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: []

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: []

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<kotlin/Int, kotlin/Int>
   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<kotlin/Int, kotlin/Int>
   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<kotlin/Int, kotlin/Int>
       symbolKind: LOCAL
       typeParameters: []