Rename: this object, receiver argument -> dispatch receiver, extension receiver

compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.txt

@@ -12,8 +12,8 @@ Candidate descriptor: fun <T, S, R> foo(t: T, f: (T) -> S, g: (S) -> R): Unit de
 Resulting descriptor: fun <T, S, R> foo(t: Int, f: (Int) -> String, g: (String) -> Int): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.txt

@@ -11,8 +11,8 @@ Candidate descriptor: fun <T> foo(f: () -> T): Unit defined in root package
 Resulting descriptor: fun <T> foo(f: () -> ???): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.txt

@@ -11,8 +11,8 @@ Candidate descriptor: fun <T> foo(f: (T) -> String): Unit defined in root packag
 Resulting descriptor: fun <T> foo(f: (???) -> String): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.txt

@@ -11,8 +11,8 @@ Candidate descriptor: fun <T> foo(f: (T) -> String): Unit defined in root packag
 Resulting descriptor: fun <T> foo(f: (Int) -> String): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.txt

@@ -10,8 +10,8 @@ Resolved call:
 Resulting descriptor: fun foo(f: (Int) -> String): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.txt

@@ -10,8 +10,8 @@ Resolved call:
 Resulting descriptor: fun foo(): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.txt

@@ -13,8 +13,8 @@ Candidate descriptor: fun <T> foo(t: T, l: List<T>): Unit defined in root packag
 Resulting descriptor: fun <T> foo(t: Comparable<out Any?>, l: List<Comparable<out Any?>>): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.txt

@@ -13,8 +13,8 @@ Candidate descriptor: fun <T> foo(t: T): Unit defined in root package
 Resulting descriptor: fun <T> foo(t: A): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.txt

@@ -13,8 +13,8 @@ Candidate descriptor: fun <T> foo(t: T, l: MutableList<T>): Unit defined in root
 Resulting descriptor: fun <T> foo(t: ???, l: MutableList<???>): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.txt

@@ -11,8 +11,8 @@ Candidate descriptor: fun <T> foo(l: List<T>): Unit defined in root package
 Resulting descriptor: fun <T> foo(l: List<???>): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.txt

@@ -13,8 +13,8 @@ Resolved call:
 Resulting descriptor: fun foo(a: A, b: B): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.txt

@@ -13,8 +13,8 @@ Resolved call:
 Resulting descriptor: fun foo(a: A, b: B): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.txt

@@ -12,8 +12,8 @@ Resolved call:
 Resulting descriptor: fun foo(a: A): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.txt

@@ -12,8 +12,8 @@ Resolved call:
 Resulting descriptor: fun foo(a: A): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.txt

@@ -12,8 +12,8 @@ Resolved call:
 Resulting descriptor: fun foo(a: A): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.txt

@@ -10,8 +10,8 @@ Resolved call:
 Resulting descriptor: fun foo(): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/realExamples/emptyList.txt

@@ -15,8 +15,8 @@ Candidate descriptor: fun <T> foo(t: T): Unit defined in root package
 Resulting descriptor: fun <T> foo(t: List<???>): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.txt

@@ -15,8 +15,8 @@ Candidate descriptor: fun <T> foo(t: T): Unit defined in root package
 Resulting descriptor: fun <T> foo(t: MutableList<???>): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.txt

@@ -14,8 +14,8 @@ Resolved call:
 Resulting descriptor: fun foo(a: A, s: String): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/differentCallElements/annotationCall.txt

@@ -8,8 +8,8 @@ Resolved call:
 Resulting descriptor: constructor MyA(i: Int) defined in MyA
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.txt

@@ -8,5 +8,5 @@ Resolved call:
 Resulting descriptor: constructor A() defined in A
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.txt

@@ -7,9 +7,9 @@ Resolved call:
 
 Resulting descriptor: fun get(index: Int): Int defined in kotlin.Array
 
-Explicit receiver kind = THIS_OBJECT
-This object = array {Array<Int>}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = array {Array<Int>}
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/explicitReceiverIsDispatchReceiver.txt

@@ -11,6 +11,6 @@ Resolved call:
 
 Resulting descriptor: fun foo(): Unit defined in A
 
-Explicit receiver kind = THIS_OBJECT
-This object = a {A}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = a {A}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/explicitReceiverIsExtensionReceiver.txt

@@ -11,6 +11,6 @@ Resolved call:
 
 Resulting descriptor: fun A.foo(): Unit defined in root package
 
-Explicit receiver kind = RECEIVER_ARGUMENT
-This object = NO_RECEIVER
-Receiver argument = a {A}
+Explicit receiver kind = EXTENSION_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = a {A}

compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt

@@ -8,5 +8,5 @@ Resolved call:
 Resulting descriptor: fun Int.invoke(): Unit defined in kotlin.ExtensionFunction0
 
 Explicit receiver kind = BOTH_RECEIVERS
-This object = f {ExtensionFunction0<Int, Unit>}
-Receiver argument = 1 {Int}
+Dispatch receiver = f {ExtensionFunction0<Int, Unit>}
+Extension receiver = 1 {Int}

compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.txt

@@ -7,6 +7,6 @@ Resolved call:
 
 Resulting descriptor: fun invoke(): Unit defined in kotlin.Function0
 
-Explicit receiver kind = THIS_OBJECT
-This object = f {Function0<Unit>}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = f {Function0<Unit>}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.txt

@@ -12,5 +12,5 @@ Resolved call:
 Resulting descriptor: val foo: Int.() -> Unit defined in A
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = Class{A}
-Receiver argument = NO_RECEIVER
+Dispatch receiver = Class{A}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt

@@ -12,5 +12,5 @@ Resolved call:
 Resulting descriptor: fun Int.invoke(): Unit defined in kotlin.ExtensionFunction0
 
 Explicit receiver kind = BOTH_RECEIVERS
-This object = foo {ExtensionFunction0<Int, Unit>}
-Receiver argument = 1 {Int}
+Dispatch receiver = foo {ExtensionFunction0<Int, Unit>}
+Extension receiver = 1 {Int}

compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.txt

@@ -11,6 +11,6 @@ Resolved call:
 
 Resulting descriptor: val foo: (Int) -> Int defined in A
 
-Explicit receiver kind = THIS_OBJECT
-This object = a {A}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = a {A}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.txt

@@ -11,9 +11,9 @@ Resolved call:
 
 Resulting descriptor: fun invoke(p1: Int): Int defined in kotlin.Function1
 
-Explicit receiver kind = THIS_OBJECT
-This object = foo {Function1<Int, Int>}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = foo {Function1<Int, Int>}
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceivers.kt

@@ -8,4 +8,4 @@ fun bar(a: A, b: B) {
     with (a) {
         b.<caret>foo()
     }
-}
+}

compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceivers.txt

@@ -15,6 +15,6 @@ Resolved call:
 
 Resulting descriptor: fun B.foo(): Unit defined in A
 
-Explicit receiver kind = RECEIVER_ARGUMENT
-This object = AExt{fun A.<anonymous>(): Unit defined in bar}
-Receiver argument = b {B}
+Explicit receiver kind = EXTENSION_RECEIVER
+Dispatch receiver = AExt{fun A.<anonymous>(): Unit defined in bar}
+Extension receiver = b {B}

compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.kt

@@ -10,4 +10,4 @@ fun bar(a: A, b: B) {
             <caret>foo()
         }
     }
-}
+}

compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt

@@ -18,5 +18,5 @@ Resolved call:
 Resulting descriptor: fun B.foo(): Unit defined in A
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = AExt{fun A.<anonymous>(): Unit defined in bar}
-Receiver argument = BExt{fun B.<anonymous>(): Unit defined in bar.<anonymous>}
+Dispatch receiver = AExt{fun A.<anonymous>(): Unit defined in bar}
+Extension receiver = BExt{fun B.<anonymous>(): Unit defined in bar.<anonymous>}

compiler/testData/resolvedCalls/implicitReceiverIsDispatchReceiver.txt

@@ -12,5 +12,5 @@ Resolved call:
 Resulting descriptor: fun foo(): Unit defined in A
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = AExt{fun A.bar(): Unit defined in root package}
-Receiver argument = NO_RECEIVER
+Dispatch receiver = AExt{fun A.bar(): Unit defined in root package}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/implicitReceiverIsExtensionReceiver.txt

@@ -12,5 +12,5 @@ Resolved call:
 Resulting descriptor: fun A.foo(): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = AExt{fun A.bar(): Unit defined in root package}
+Dispatch receiver = NO_RECEIVER
+Extension receiver = AExt{fun A.bar(): Unit defined in root package}

compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.txt

@@ -11,5 +11,5 @@ Resolved call:
 Resulting descriptor: fun foo(): Unit defined in A
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = Class{A}
-Receiver argument = NO_RECEIVER
+Dispatch receiver = Class{A}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/invoke/bothReceivers.txt

@@ -12,5 +12,5 @@ Resolved call:
 Resulting descriptor: fun Int.invoke(): Unit defined in Foo
 
 Explicit receiver kind = BOTH_RECEIVERS
-This object = f {Foo}
-Receiver argument = 1 {Int}
+Dispatch receiver = f {Foo}
+Extension receiver = 1 {Int}

compiler/testData/resolvedCalls/invoke/dispatchReceiverAsReceiverForInvoke.txt

@@ -11,6 +11,6 @@ Resolved call:
 
 Resulting descriptor: fun invoke(): Unit defined in Foo
 
-Explicit receiver kind = THIS_OBJECT
-This object = f {Foo}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = f {Foo}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/invoke/extensionReceiverAsReceiverForInvoke.txt

@@ -10,6 +10,6 @@ Resolved call:
 
 Resulting descriptor: fun Foo.invoke(): Unit defined in root package
 
-Explicit receiver kind = RECEIVER_ARGUMENT
-This object = NO_RECEIVER
-Receiver argument = f {Foo}
+Explicit receiver kind = EXTENSION_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = f {Foo}

compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt

@@ -13,6 +13,6 @@ Resolved call:
 
 Resulting descriptor: fun Int.invoke(): Unit defined in Foo
 
-Explicit receiver kind = THIS_OBJECT
-This object = f {Foo}
-Receiver argument = IntExt{fun Int.<anonymous>(): Unit defined in bar}
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = f {Foo}
+Extension receiver = IntExt{fun Int.<anonymous>(): Unit defined in bar}

compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.txt

@@ -12,5 +12,5 @@ Resolved call:
 Resulting descriptor: class object defined in A
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.txt

@@ -11,9 +11,9 @@ Resolved call:
 
 Resulting descriptor: fun invoke(i: Int): Int defined in A.<class-object-for-A>
 
-Explicit receiver kind = THIS_OBJECT
-This object = A {<class-object-for-A>}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = A {<class-object-for-A>}
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt

@@ -13,5 +13,5 @@ Resolved call:
 Resulting descriptor: enum entry ONE : A defined in A
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt

@@ -12,9 +12,9 @@ Resolved call:
 
 Resulting descriptor: fun invoke(i: Int): Int defined in A
 
-Explicit receiver kind = THIS_OBJECT
-This object = ONE {A}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = ONE {A}
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/invoke/invokeOnObject1.txt

@@ -10,5 +10,5 @@ Resolved call:
 Resulting descriptor: object A defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/invoke/invokeOnObject2.txt

@@ -9,9 +9,9 @@ Resolved call:
 
 Resulting descriptor: fun invoke(i: Int): Int defined in A
 
-Explicit receiver kind = THIS_OBJECT
-This object = A {A}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = A {A}
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt

@@ -13,6 +13,6 @@ Resolved call:
 
 Resulting descriptor: val baz: Foo defined in Foo.<class-object-for-Foo>
 
-Explicit receiver kind = THIS_OBJECT
-This object = Foo {<class-object-for-Foo>}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = Foo {<class-object-for-Foo>}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt

@@ -8,6 +8,6 @@ Resolved call:
 
 Resulting descriptor: val EMPTY: IntRange defined in kotlin.IntRange.<class-object-for-IntRange>
 
-Explicit receiver kind = THIS_OBJECT
-This object = IntRange {<class-object-for-IntRange>}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = IntRange {<class-object-for-IntRange>}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/objectsAndClassObjects/object.txt

@@ -11,6 +11,6 @@ Resolved call:
 
 Resulting descriptor: val baz: Int defined in Foo
 
-Explicit receiver kind = THIS_OBJECT
-This object = Foo {Foo}
-Receiver argument = NO_RECEIVER
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = Foo {Foo}
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.txt

@@ -43,6 +43,6 @@ Resolved call:
 
 Resulting descriptor: fun String.plus(): Unit defined in Title
 
-Explicit receiver kind = RECEIVER_ARGUMENT
-This object = TitleExt{fun Title.<anonymous>(): Unit defined in result.<anonymous>.<anonymous>}
-Receiver argument = "Foo" {String}
+Explicit receiver kind = EXTENSION_RECEIVER
+Dispatch receiver = TitleExt{fun Title.<anonymous>(): Unit defined in result.<anonymous>.<anonymous>}
+Extension receiver = "Foo" {String}

compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.txt

@@ -14,8 +14,8 @@ Candidate descriptor: fun <T> doSmth(l: List<T>): Unit defined in root package
 Resulting descriptor: fun <T> doSmth(l: List<???>): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.txt

@@ -12,8 +12,8 @@ Candidate descriptor: fun <T> bar(f: () -> T): T defined in root package
 Resulting descriptor: fun <T> bar(f: () -> Unit): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER
 
 Value arguments mapping:
 

compiler/testData/resolvedCalls/simpleCall.txt

@@ -10,5 +10,5 @@ Resolved call:
 Resulting descriptor: fun foo(): Unit defined in root package
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/thisOrSuper/labeledSuper.txt

@@ -14,5 +14,5 @@ Resolved call:
 Resulting descriptor: Class{B}::this
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/thisOrSuper/labeledThis.txt

@@ -10,5 +10,5 @@ Resolved call:
 Resulting descriptor: Class{A}::this
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt

@@ -14,5 +14,5 @@ Resolved call:
 Resulting descriptor: Class{B}::this
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/thisOrSuper/simpleThis.txt

@@ -10,5 +10,5 @@ Resolved call:
 Resulting descriptor: Class{A}::this
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER

compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.txt

@@ -10,5 +10,5 @@ Resolved call:
 Resulting descriptor: AExt{fun A.bar(): Unit defined in root package}::this
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-This object = NO_RECEIVER
-Receiver argument = NO_RECEIVER
+Dispatch receiver = NO_RECEIVER
+Extension receiver = NO_RECEIVER