[AA] integrate KtReceiverParameterSymbol to KtCallableSymbol

^KT-54417

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

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

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: [
-    ReceiverTypeAnnotation()
-      psi: KtAnnotationEntry
-  ] @R|ReceiverTypeAnnotation|()  kotlin/Long
+  receiver: KtReceiverParameterSymbol:
+    annotationsList: [
+      ReceiverAnnotation()
+        psi: KtAnnotationEntry
+    ]
+    origin: SOURCE
+    type: [
+      ReceiverTypeAnnotation()
+        psi: KtAnnotationEntry
+    ] @R|ReceiverTypeAnnotation|()  kotlin/Long
   returnType: kotlin/Int
   symbolKind: ACCESSOR
   typeParameters: []

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

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

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

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

analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt

@@ -14,7 +14,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: null
+    receiver: null
     returnType: kotlin/Long
     symbolKind: ACCESSOR
     typeParameters: []
@@ -37,7 +37,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmField
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Long
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -64,13 +64,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Long
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiverType: null
+    receiver: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -88,7 +88,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiverType: null
+        receiver: null
         returnType: kotlin/Long
         symbolKind: LOCAL
         typeParameters: []
@@ -125,7 +125,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: null
+    receiver: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -148,7 +148,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmFieldOnField
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Int
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -175,13 +175,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiverType: null
+    receiver: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -199,7 +199,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiverType: null
+        receiver: null
         returnType: kotlin/Int
         symbolKind: LOCAL
         typeParameters: []

analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt

@@ -17,7 +17,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: null
+    receiver: null
     returnType: kotlin/Long
     symbolKind: ACCESSOR
     typeParameters: []
@@ -40,7 +40,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmField
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Long
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -67,13 +67,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Long
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiverType: null
+    receiver: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -91,7 +91,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiverType: null
+        receiver: null
         returnType: kotlin/Long
         symbolKind: LOCAL
         typeParameters: []
@@ -130,7 +130,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: null
+    receiver: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -153,7 +153,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmFieldOnField
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Int
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -180,13 +180,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiverType: null
+    receiver: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -204,7 +204,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiverType: null
+        receiver: null
         returnType: kotlin/Int
         symbolKind: LOCAL
         typeParameters: []

analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt

@@ -6,7 +6,7 @@ KtLocalVariableSymbol:
   isVal: true
   name: q
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
@@ -30,7 +30,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: aaa
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: LOCAL
   typeParameters: []
@@ -79,7 +79,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: yyy
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt

@@ -15,7 +15,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -42,7 +42,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt

@@ -14,7 +14,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: null
+    receiver: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -38,7 +38,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
@@ -68,7 +68,10 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: kotlin/Int
+    receiver: KtReceiverParameterSymbol:
+      annotationsList: []
+      origin: SOURCE
+      type: kotlin/Int
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -91,7 +94,10 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: kotlin/Int
+  receiver: KtReceiverParameterSymbol:
+    annotationsList: []
+    origin: SOURCE
+    type: kotlin/Int
   returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER

analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt

@@ -473,7 +473,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
   typeParameters: [

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt

@@ -15,7 +15,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Int
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -41,7 +41,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt

@@ -142,7 +142,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: f
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: [
     Anno3()
       psi: KtAnnotationEntry
@@ -163,7 +163,7 @@ KtFunctionSymbol:
       isVararg: false
       name: arg
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: [
         Anno2()
           psi: KtAnnotationEntry
@@ -194,7 +194,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: null
+    receiver: null
     returnType: [
       Anno4()
         psi: KtAnnotationEntry
@@ -221,7 +221,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: [
     Anno4()
       psi: KtAnnotationEntry

analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt

@@ -142,7 +142,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: f
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: [
     Anno3()
       psi: KtAnnotationEntry
@@ -163,7 +163,7 @@ KtFunctionSymbol:
       isVararg: false
       name: arg
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: [
         Anno2()
           psi: KtAnnotationEntry
@@ -194,7 +194,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: null
+    receiver: null
     returnType: [
       Anno4()
         psi: KtAnnotationEntry
@@ -221,7 +221,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: [
     Anno4()
       psi: KtAnnotationEntry

analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.txt

@@ -15,7 +15,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -33,7 +33,7 @@ KtFunctionSymbol:
       isVararg: false
       name: inlineParameter
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Function0<kotlin/Int>
       symbolKind: LOCAL
       typeParameters: []
@@ -52,7 +52,7 @@ KtFunctionSymbol:
       isVararg: false
       name: crossinlineParameter
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Function0<kotlin/Int>
       symbolKind: LOCAL
       typeParameters: []
@@ -71,7 +71,7 @@ KtFunctionSymbol:
       isVararg: false
       name: noinlineParameter
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Function0<kotlin/Int>
       symbolKind: LOCAL
       typeParameters: []

analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt

@@ -15,7 +15,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: primitive
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -33,7 +33,7 @@ KtFunctionSymbol:
       isVararg: true
       name: a
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
@@ -61,7 +61,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: nullablePrimitive
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -79,7 +79,7 @@ KtFunctionSymbol:
       isVararg: true
       name: b
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Float?
       symbolKind: LOCAL
       typeParameters: []
@@ -107,7 +107,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: nonPrimitive
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -125,7 +125,7 @@ KtFunctionSymbol:
       isVararg: true
       name: c
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Any
       symbolKind: LOCAL
       typeParameters: []
@@ -153,7 +153,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: error
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -171,7 +171,7 @@ KtFunctionSymbol:
       isVararg: true
       name: d
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: ERROR_TYPE
       symbolKind: LOCAL
       typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt

@@ -6,7 +6,7 @@ KtBackingFieldSymbol:
   name: field
   origin: PROPERTY_BACKING_FIELD
   owningProperty: KtKotlinPropertySymbol(/x)
-  receiverType: null
+  receiver: null
   returnType: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.txt

@@ -7,7 +7,7 @@ KtConstructorSymbol:
   isExtension: false
   isPrimary: false
   origin: JAVA
-  receiverType: null
+  receiver: null
   returnType: java/util/ArrayList<E>
   symbolKind: CLASS_MEMBER
   typeParameters: [
@@ -27,7 +27,7 @@ KtConstructorSymbol:
       isVararg: false
       name: c
       origin: JAVA
-      receiverType: null
+      receiver: null
       returnType: (kotlin/collections/MutableCollection<out E!>..kotlin/collections/Collection<E!>?)
       symbolKind: LOCAL
       typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt

@@ -7,7 +7,7 @@ KtConstructorSymbol:
   isExtension: false
   isPrimary: false
   origin: JAVA
-  receiverType: null
+  receiver: null
   returnType: java/util/ArrayList<E>
   symbolKind: CLASS_MEMBER
   typeParameters: [
@@ -27,7 +27,7 @@ KtConstructorSymbol:
       isVararg: false
       name: c
       origin: JAVA
-      receiverType: null
+      receiver: null
       returnType: ft<kotlin/collections/MutableCollection<out ft<E & Any, E?>>, kotlin/collections/Collection<out ft<E & Any, E?>>?>
       symbolKind: LOCAL
       typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.txt

@@ -11,7 +11,7 @@ KtValueParameterSymbol:
   isVararg: false
   name: it
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.txt

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

analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.txt

@@ -15,7 +15,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: withOuter
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: Outer?
   symbolKind: CLASS_MEMBER
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.descriptors.txt

@@ -15,7 +15,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: withOuter
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: Outer?
   symbolKind: CLASS_MEMBER
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.txt

@@ -15,7 +15,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: withOuter
   origin: SOURCE
-  receiverType: null
+  receiver: null
   returnType: Outer?
   symbolKind: CLASS_MEMBER
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/implicitLambdaParameter.txt

@@ -11,7 +11,7 @@ KtValueParameterSymbol:
   isVararg: false
   name: it
   origin: SOURCE_MEMBER_GENERATED
-  receiverType: null
+  receiver: null
   returnType: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt

@@ -14,10 +14,16 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiverType: [
-      ReceiverTypeAnnotation()
-        psi: KtAnnotationEntry
-    ] @R|ReceiverTypeAnnotation|()  kotlin/Long
+    receiver: KtReceiverParameterSymbol:
+      annotationsList: [
+        ReceiverAnnotation()
+          psi: KtAnnotationEntry
+      ]
+      origin: SOURCE
+      type: [
+        ReceiverTypeAnnotation()
+          psi: KtAnnotationEntry
+      ] @R|ReceiverTypeAnnotation|()  kotlin/Long
     returnType: kotlin/Boolean
     symbolKind: ACCESSOR
     typeParameters: []
@@ -40,10 +46,16 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: prop
   origin: SOURCE
-  receiverType: [
-    ReceiverTypeAnnotation()
-      psi: KtAnnotationEntry
-  ] @R|ReceiverTypeAnnotation|()  kotlin/Long
+  receiver: KtReceiverParameterSymbol:
+    annotationsList: [
+      ReceiverAnnotation()
+        psi: KtAnnotationEntry
+    ]
+    origin: SOURCE
+    type: [
+      ReceiverTypeAnnotation()
+        psi: KtAnnotationEntry
+    ] @R|ReceiverTypeAnnotation|()  kotlin/Long
   returnType: kotlin/Boolean
   setter: null
   symbolKind: TOP_LEVEL

analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.descriptors.txt

@@ -6,7 +6,7 @@ KtSamConstructorSymbol:
   isExtension: false
   name: Runnable
   origin: SAM_CONSTRUCTOR
-  receiverType: null
+  receiver: null
   returnType: java/lang/Runnable
   symbolKind: SAM_CONSTRUCTOR
   typeParameters: []
@@ -24,7 +24,7 @@ KtSamConstructorSymbol:
       isVararg: false
       name: function
       origin: SOURCE
-      receiverType: null
+      receiver: null
       returnType: kotlin/Function0<kotlin/Unit>
       symbolKind: LOCAL
       typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt

@@ -6,7 +6,7 @@ KtSamConstructorSymbol:
   isExtension: false
   name: Runnable
   origin: SAM_CONSTRUCTOR
-  receiverType: null
+  receiver: null
   returnType: java/lang/Runnable
   symbolKind: SAM_CONSTRUCTOR
   typeParameters: []
@@ -24,7 +24,7 @@ KtSamConstructorSymbol:
       isVararg: false
       name: function
       origin: SAM_CONSTRUCTOR
-      receiverType: null
+      receiver: null
       returnType: kotlin/Function0<kotlin/Unit>
       symbolKind: LOCAL
       typeParameters: []