fix compilation and testData after rebase

^KT-54417

analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.txt

@@ -14,7 +14,13 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: OPEN
     origin: DELEGATED
-    receiverType: kotlin/Int
+    receiverParameter: KtReceiverParameterSymbol:
+      annotationsList: []
+      origin: SOURCE
+      owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo)
+      type: kotlin/Int
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -38,7 +44,13 @@ KtKotlinPropertySymbol:
   modality: OPEN
   name: zoo
   origin: DELEGATED
-  receiverType: kotlin/Int
+  receiverParameter: KtReceiverParameterSymbol:
+    annotationsList: []
+    origin: SOURCE
+    owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo)
+    type: kotlin/Int
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/Unit
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -65,13 +77,19 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiverType: null
+      receiverParameter: null
       returnType: kotlin/Unit
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiverType: kotlin/Int
+    receiverParameter: KtReceiverParameterSymbol:
+      annotationsList: []
+      origin: SOURCE
+      owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo)
+      type: kotlin/Int
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -89,7 +107,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiverType: null
+        receiverParameter: null
         returnType: kotlin/Unit
         symbolKind: LOCAL
         typeParameters: []
@@ -128,7 +146,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: foo
   origin: DELEGATED
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -155,7 +173,13 @@ KtFunctionSymbol:
   modality: OPEN
   name: smth
   origin: DELEGATED
-  receiverType: kotlin/Int
+  receiverParameter: KtReceiverParameterSymbol:
+    annotationsList: []
+    origin: SOURCE
+    owningCallableSymbol: KtFunctionSymbol(/I.smth)
+    type: kotlin/Int
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/Short
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -181,7 +205,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: OPEN
     origin: DELEGATED
-    receiverType: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -205,7 +229,7 @@ KtKotlinPropertySymbol:
   modality: OPEN
   name: foo
   origin: DELEGATED
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
@@ -235,7 +259,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: OPEN
     origin: DELEGATED
-    receiverType: null
+    receiverParameter: null
     returnType: kotlin/Long
     symbolKind: ACCESSOR
     typeParameters: []
@@ -259,7 +283,7 @@ KtKotlinPropertySymbol:
   modality: OPEN
   name: bar
   origin: DELEGATED
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Long
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -286,13 +310,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiverType: null
+      receiverParameter: null
       returnType: kotlin/Long
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiverType: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -310,7 +334,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiverType: null
+        receiverParameter: null
         returnType: kotlin/Long
         symbolKind: LOCAL
         typeParameters: []
@@ -348,7 +372,13 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: OPEN
     origin: DELEGATED
-    receiverType: kotlin/Int
+    receiverParameter: KtReceiverParameterSymbol:
+      annotationsList: []
+      origin: SOURCE
+      owningCallableSymbol: KtKotlinPropertySymbol(/I.doo)
+      type: kotlin/Int
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
     returnType: kotlin/String
     symbolKind: ACCESSOR
     typeParameters: []
@@ -372,7 +402,13 @@ KtKotlinPropertySymbol:
   modality: OPEN
   name: doo
   origin: DELEGATED
-  receiverType: kotlin/Int
+  receiverParameter: KtReceiverParameterSymbol:
+    annotationsList: []
+    origin: SOURCE
+    owningCallableSymbol: KtKotlinPropertySymbol(/I.doo)
+    type: kotlin/Int
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/String
   setter: null
   symbolKind: CLASS_MEMBER

analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt

@@ -21,7 +21,10 @@ KtKotlinPropertySymbol:
   receiverParameter: KtReceiverParameterSymbol:
     annotationsList: []
     origin: DELEGATED
+    owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo)
     type: kotlin/Int
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/Unit
   setter: null
   symbolKind: CLASS_MEMBER
@@ -116,7 +119,10 @@ KtFunctionSymbol:
   receiverParameter: KtReceiverParameterSymbol:
     annotationsList: []
     origin: DELEGATED
+    owningCallableSymbol: KtFunctionSymbol(/I.smth)
     type: kotlin/Int
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/Short
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -183,7 +189,10 @@ KtKotlinPropertySymbol:
   receiverParameter: KtReceiverParameterSymbol:
     annotationsList: []
     origin: DELEGATED
+    owningCallableSymbol: KtKotlinPropertySymbol(/I.doo)
     type: kotlin/Int
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/String
   setter: null
   symbolKind: CLASS_MEMBER

analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt

@@ -26,7 +26,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: function
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -55,7 +55,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: functionWithDefault
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -73,7 +73,7 @@ KtFunctionSymbol:
       isVararg: false
       name: par1
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
@@ -100,7 +100,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -123,7 +123,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: testVal
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -152,7 +152,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -175,7 +175,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: initializedVariable
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -202,13 +202,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -226,7 +226,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/Int
         symbolKind: LOCAL
         typeParameters: []
@@ -262,7 +262,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Long
     symbolKind: ACCESSOR
     typeParameters: []
@@ -285,7 +285,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: unitializedVariable
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Long
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -312,13 +312,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Long
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -336,7 +336,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/Long
         symbolKind: LOCAL
         typeParameters: []
@@ -372,7 +372,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/String
     symbolKind: ACCESSOR
     typeParameters: []
@@ -395,7 +395,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: lateinitVariable
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/String
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -422,13 +422,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/String
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -446,7 +446,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/String
         symbolKind: LOCAL
         typeParameters: []
@@ -482,7 +482,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Long
     symbolKind: ACCESSOR
     typeParameters: []
@@ -505,7 +505,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: variableWithBackingField
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Long
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -532,13 +532,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Long
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -556,7 +556,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/Long
         symbolKind: LOCAL
         typeParameters: []
@@ -592,7 +592,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/String
     symbolKind: ACCESSOR
     typeParameters: []
@@ -615,7 +615,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: privateSetter
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/String
   setter: KtPropertySetterSymbol:
     annotationsList: [
@@ -645,13 +645,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/String
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -669,7 +669,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/String
         symbolKind: LOCAL
         typeParameters: []
@@ -705,7 +705,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/String
     symbolKind: ACCESSOR
     typeParameters: []
@@ -728,7 +728,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmNameOnSetter
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/String
   setter: KtPropertySetterSymbol:
     annotationsList: [
@@ -758,13 +758,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/String
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -782,7 +782,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/String
         symbolKind: LOCAL
         typeParameters: []
@@ -821,7 +821,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -844,7 +844,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: customGetter
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -876,7 +876,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -899,7 +899,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmNameOnGetter
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -928,10 +928,13 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: KtReceiverParameterSymbol:
+    receiverParameter: KtReceiverParameterSymbol:
       annotationsList: []
       origin: SOURCE
+      owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver)
       type: kotlin/Int
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -954,10 +957,13 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: propertyWithReceiver
   origin: SOURCE
-  receiver: KtReceiverParameterSymbol:
+  receiverParameter: KtReceiverParameterSymbol:
     annotationsList: []
     origin: SOURCE
+    owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver)
     type: kotlin/Int
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -986,10 +992,13 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: KtReceiverParameterSymbol:
+    receiverParameter: KtReceiverParameterSymbol:
       annotationsList: []
       origin: SOURCE
+      owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver)
       type: T
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -1012,10 +1021,13 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: propertyWithGenericReceiver
   origin: SOURCE
-  receiver: KtReceiverParameterSymbol:
+  receiverParameter: KtReceiverParameterSymbol:
     annotationsList: []
     origin: SOURCE
+    owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver)
     type: T
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -1046,7 +1058,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -1069,7 +1081,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: constant
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -1098,7 +1110,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Long
     symbolKind: ACCESSOR
     typeParameters: []
@@ -1121,7 +1133,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmField
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Long
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -1148,13 +1160,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Long
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -1172,7 +1184,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/Long
         symbolKind: LOCAL
         typeParameters: []

analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt

@@ -26,7 +26,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: function
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -55,7 +55,7 @@ KtFunctionSymbol:
   modality: FINAL
   name: functionWithDefault
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -73,7 +73,7 @@ KtFunctionSymbol:
       isVararg: false
       name: par1
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
@@ -100,7 +100,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -123,7 +123,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: testVal
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -152,7 +152,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -175,7 +175,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: initializedVariable
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -202,13 +202,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -226,7 +226,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/Int
         symbolKind: LOCAL
         typeParameters: []
@@ -262,7 +262,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Long
     symbolKind: ACCESSOR
     typeParameters: []
@@ -285,7 +285,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: unitializedVariable
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Long
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -312,13 +312,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Long
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -336,7 +336,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/Long
         symbolKind: LOCAL
         typeParameters: []
@@ -372,7 +372,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/String
     symbolKind: ACCESSOR
     typeParameters: []
@@ -395,7 +395,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: lateinitVariable
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/String
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -422,13 +422,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/String
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -446,7 +446,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/String
         symbolKind: LOCAL
         typeParameters: []
@@ -482,7 +482,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Long
     symbolKind: ACCESSOR
     typeParameters: []
@@ -505,7 +505,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: variableWithBackingField
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Long
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -532,13 +532,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Long
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -556,7 +556,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/Long
         symbolKind: LOCAL
         typeParameters: []
@@ -592,7 +592,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/String
     symbolKind: ACCESSOR
     typeParameters: []
@@ -615,7 +615,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: privateSetter
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/String
   setter: KtPropertySetterSymbol:
     annotationsList: [
@@ -645,13 +645,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/String
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -669,7 +669,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/String
         symbolKind: LOCAL
         typeParameters: []
@@ -705,7 +705,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/String
     symbolKind: ACCESSOR
     typeParameters: []
@@ -728,7 +728,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmNameOnSetter
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/String
   setter: KtPropertySetterSymbol:
     annotationsList: [
@@ -758,13 +758,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/String
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -782,7 +782,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/String
         symbolKind: LOCAL
         typeParameters: []
@@ -821,7 +821,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -844,7 +844,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: customGetter
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -876,7 +876,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -899,7 +899,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmNameOnGetter
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -928,10 +928,13 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: KtReceiverParameterSymbol:
+    receiverParameter: KtReceiverParameterSymbol:
       annotationsList: []
       origin: SOURCE
+      owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver)
       type: kotlin/Int
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -954,10 +957,13 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: propertyWithReceiver
   origin: SOURCE
-  receiver: KtReceiverParameterSymbol:
+  receiverParameter: KtReceiverParameterSymbol:
     annotationsList: []
     origin: SOURCE
+    owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver)
     type: kotlin/Int
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -986,10 +992,13 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: KtReceiverParameterSymbol:
+    receiverParameter: KtReceiverParameterSymbol:
       annotationsList: []
       origin: SOURCE
+      owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver)
       type: T
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -1012,10 +1021,13 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: propertyWithGenericReceiver
   origin: SOURCE
-  receiver: KtReceiverParameterSymbol:
+  receiverParameter: KtReceiverParameterSymbol:
     annotationsList: []
     origin: SOURCE
+    owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver)
     type: T
+    getContainingModule: KtSourceModule "Sources of main"
+    deprecationStatus: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -1046,7 +1058,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
@@ -1069,7 +1081,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: constant
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
@@ -1101,7 +1113,7 @@ KtKotlinPropertySymbol:
     isOverride: false
     modality: FINAL
     origin: SOURCE
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Long
     symbolKind: ACCESSOR
     typeParameters: []
@@ -1124,7 +1136,7 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: jvmField
   origin: SOURCE
-  receiver: null
+  receiverParameter: null
   returnType: kotlin/Long
   setter: KtPropertySetterSymbol:
     annotationsList: []
@@ -1151,13 +1163,13 @@ KtKotlinPropertySymbol:
       isVararg: false
       name: value
       origin: SOURCE
-      receiver: null
+      receiverParameter: null
       returnType: kotlin/Long
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    receiver: null
+    receiverParameter: null
     returnType: kotlin/Unit
     symbolKind: ACCESSOR
     typeParameters: []
@@ -1175,7 +1187,7 @@ KtKotlinPropertySymbol:
         isVararg: false
         name: value
         origin: SOURCE
-        receiver: null
+        receiverParameter: null
         returnType: kotlin/Long
         symbolKind: LOCAL
         typeParameters: []

analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.txt

@@ -8,7 +8,7 @@ KtJavaFieldSymbol:
   modality: OPEN
   name: field
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -27,7 +27,7 @@ KtJavaFieldSymbol:
   modality: OPEN
   name: field2
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -53,7 +53,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: equals
   origin: LIBRARY
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -71,7 +71,7 @@ KtFunctionSymbol:
       isVararg: false
       name: other
       origin: LIBRARY
-      receiverType: null
+      receiverParameter: null
       returnType: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
@@ -100,7 +100,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: hashCode
   origin: LIBRARY
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -127,7 +127,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: toString
   origin: LIBRARY
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/String
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -146,7 +146,7 @@ KtConstructorSymbol:
   isExtension: false
   isPrimary: true
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: JavaClass
   symbolKind: CLASS_MEMBER
   typeParameters: []

analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.txt

@@ -8,7 +8,7 @@ KtJavaFieldSymbol:
   modality: OPEN
   name: field
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -27,7 +27,7 @@ KtJavaFieldSymbol:
   modality: OPEN
   name: field
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -53,7 +53,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: equals
   origin: LIBRARY
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -71,7 +71,7 @@ KtFunctionSymbol:
       isVararg: false
       name: other
       origin: LIBRARY
-      receiverType: null
+      receiverParameter: null
       returnType: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
@@ -100,7 +100,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: hashCode
   origin: LIBRARY
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -127,7 +127,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: toString
   origin: LIBRARY
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/String
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -146,7 +146,7 @@ KtConstructorSymbol:
   isExtension: false
   isPrimary: true
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: JavaClass
   symbolKind: CLASS_MEMBER
   typeParameters: []

analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.txt

@@ -15,7 +15,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: foo
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -42,7 +42,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: doo
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -60,7 +60,7 @@ KtFunctionSymbol:
       isVararg: false
       name: i
       origin: JAVA
-      receiverType: null
+      receiverParameter: null
       returnType: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
@@ -89,7 +89,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: getStringValue
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -116,7 +116,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: equals
   origin: LIBRARY
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -134,7 +134,7 @@ KtFunctionSymbol:
       isVararg: false
       name: other
       origin: LIBRARY
-      receiverType: null
+      receiverParameter: null
       returnType: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
@@ -163,7 +163,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: hashCode
   origin: LIBRARY
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -190,7 +190,7 @@ KtFunctionSymbol:
   modality: OPEN
   name: toString
   origin: LIBRARY
-  receiverType: null
+  receiverParameter: null
   returnType: kotlin/String
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -209,7 +209,7 @@ KtConstructorSymbol:
   isExtension: false
   isPrimary: true
   origin: JAVA
-  receiverType: null
+  receiverParameter: null
   returnType: JavaClass
   symbolKind: CLASS_MEMBER
   typeParameters: []