From 67aad53db793c05f096e4468f1acf0f577edf2d0 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Mon, 18 Aug 2014 19:14:42 +0400 Subject: [PATCH] Render 'defined in' in resolved call tests --- .../arguments/functionLiterals/chainedLambdas.txt | 4 ++-- .../functionLiterals/notInferredLambdaReturnType.txt | 4 ++-- .../arguments/functionLiterals/notInferredLambdaType.txt | 4 ++-- .../arguments/functionLiterals/simpleGenericLambda.txt | 4 ++-- .../arguments/functionLiterals/simpleLambda.txt | 2 +- .../arguments/functionLiterals/unmappedLambda.txt | 2 +- .../arguments/genericCalls/inferredParameter.txt | 4 ++-- .../resolvedCalls/arguments/genericCalls/simpleGeneric.txt | 4 ++-- .../arguments/genericCalls/uninferredParameter.txt | 4 ++-- .../genericCalls/uninferredParameterTypeMismatch.txt | 4 ++-- .../arguments/namedArguments/positionedAfterNamed.txt | 2 +- .../arguments/namedArguments/shiftedArgsMatch.txt | 2 +- .../arguments/oneArgument/argumentHasNoType.txt | 2 +- .../resolvedCalls/arguments/oneArgument/simpleMatch.txt | 2 +- .../resolvedCalls/arguments/oneArgument/typeMismatch.txt | 2 +- .../arguments/oneArgument/unmappedArgument.txt | 2 +- .../resolvedCalls/arguments/realExamples/emptyList.txt | 4 ++-- .../arguments/realExamples/emptyMutableList.txt | 4 ++-- .../arguments/severalCandidates/mostSpecific.txt | 2 +- .../resolvedCalls/differentCallElements/annotationCall.txt | 2 +- .../differentCallElements/delegatorToSuperCall.txt | 4 ++-- .../differentCallElements/simpleArrayAccess.txt | 4 ++-- .../resolvedCalls/explicitReceiverIsReceiverArgument.txt | 4 ++-- .../testData/resolvedCalls/explicitReceiverIsThisObject.txt | 2 +- .../functionTypes/invokeForExtensionFunctionType.txt | 4 ++-- .../resolvedCalls/functionTypes/invokeForFunctionType.txt | 2 +- .../functionTypes/valOfExtensionFunctionType.txt | 2 +- .../functionTypes/valOfExtensionFunctionTypeInvoke.txt | 4 ++-- .../resolvedCalls/functionTypes/valOfFunctionType.txt | 2 +- .../resolvedCalls/functionTypes/valOfFunctionTypeInvoke.txt | 2 +- .../resolvedCalls/hasBothThisObjectAndReceiverArgument.txt | 6 +++--- ...ThisObjectAndReceiverArgumentWithoutExplicitReceiver.txt | 6 +++--- .../resolvedCalls/implicitReceiverIsReceiverArgument.txt | 4 ++-- .../testData/resolvedCalls/implicitReceiverIsThisObject.txt | 4 ++-- .../resolvedCalls/impliedThisNoExplicitReceiver.txt | 2 +- compiler/testData/resolvedCalls/invoke/bothReceivers.txt | 4 ++-- .../resolvedCalls/invoke/implicitReceiverForInvoke.txt | 4 ++-- .../testData/resolvedCalls/invoke/invokeOnClassObject1.txt | 2 +- .../testData/resolvedCalls/invoke/invokeOnClassObject2.txt | 2 +- .../testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt | 2 +- .../testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt | 2 +- compiler/testData/resolvedCalls/invoke/invokeOnObject1.txt | 2 +- compiler/testData/resolvedCalls/invoke/invokeOnObject2.txt | 2 +- .../invoke/receiverArgumentAsReceiverForInvoke.txt | 4 ++-- .../resolvedCalls/invoke/thisObjectAsReceiverForInvoke.txt | 2 +- .../resolvedCalls/objectsAndClassObjects/classObject.txt | 2 +- .../objectsAndClassObjects/kt5308IntRangeConstant.txt | 2 +- .../resolvedCalls/objectsAndClassObjects/object.txt | 2 +- .../resolvedCalls/realExamples/stringPlusInBuilders.txt | 6 +++--- .../resolvedCalls/resolve/mostSpecificUninferredParam.txt | 4 ++-- .../resolvedCalls/resolve/mostSpecificWithLambda.txt | 4 ++-- compiler/testData/resolvedCalls/simpleCall.txt | 2 +- compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt | 2 +- .../resolvedCalls/thisOrSuper/thisInExtensionFunction.txt | 2 +- .../src/org/jetbrains/jet/renderer/DescriptorRenderer.java | 1 - 55 files changed, 82 insertions(+), 83 deletions(-) diff --git a/compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.txt b/compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.txt index 27e44eef0da..56452e650a6 100644 --- a/compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.txt +++ b/compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.txt @@ -8,8 +8,8 @@ fun test() { Resolved call: -Candidate descriptor: fun foo(t: T, f: (T) -> S, g: (S) -> R): Unit -Resulting descriptor: fun foo(t: Int, f: (Int) -> String, g: (String) -> Int): Unit +Candidate descriptor: fun foo(t: T, f: (T) -> S, g: (S) -> R): Unit defined in root package +Resulting descriptor: fun foo(t: Int, f: (Int) -> String, g: (String) -> Int): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.txt b/compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.txt index cf2012097ec..95df33786b6 100644 --- a/compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.txt +++ b/compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.txt @@ -7,8 +7,8 @@ fun test() { Resolved call: -Candidate descriptor: fun foo(f: () -> T): Unit -Resulting descriptor: fun foo(f: () -> ???): Unit +Candidate descriptor: fun foo(f: () -> T): Unit defined in root package +Resulting descriptor: fun foo(f: () -> ???): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.txt b/compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.txt index 27c0624d4ce..ac7ac4998d8 100644 --- a/compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.txt +++ b/compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.txt @@ -7,8 +7,8 @@ fun test() { Resolved call: -Candidate descriptor: fun foo(f: (T) -> String): Unit -Resulting descriptor: fun foo(f: (???) -> String): Unit +Candidate descriptor: fun foo(f: (T) -> String): Unit defined in root package +Resulting descriptor: fun foo(f: (???) -> String): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.txt b/compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.txt index 5b6ecebc1d6..b8ed5969cef 100644 --- a/compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.txt +++ b/compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.txt @@ -7,8 +7,8 @@ fun test() { Resolved call: -Candidate descriptor: fun foo(f: (T) -> String): Unit -Resulting descriptor: fun foo(f: (Int) -> String): Unit +Candidate descriptor: fun foo(f: (T) -> String): Unit defined in root package +Resulting descriptor: fun foo(f: (Int) -> String): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.txt b/compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.txt index c5fbe8a0e65..3c7db3b251c 100644 --- a/compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.txt +++ b/compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.txt @@ -7,7 +7,7 @@ fun test() { Resolved call: -Resulting descriptor: fun foo(f: (Int) -> String): Unit +Resulting descriptor: fun foo(f: (Int) -> String): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.txt b/compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.txt index a4a66c9e292..7820841d111 100644 --- a/compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.txt +++ b/compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.txt @@ -7,7 +7,7 @@ fun test() { Resolved call: -Resulting descriptor: fun foo(): Unit +Resulting descriptor: fun foo(): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.txt b/compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.txt index a91d580f90a..ceb4968dd22 100644 --- a/compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.txt +++ b/compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.txt @@ -9,8 +9,8 @@ fun test(a: Any, ls: List) { Resolved call: -Candidate descriptor: fun foo(t: T, l: List): Unit -Resulting descriptor: fun foo(t: Comparable, l: List>): Unit +Candidate descriptor: fun foo(t: T, l: List): Unit defined in root package +Resulting descriptor: fun foo(t: Comparable, l: List>): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.txt b/compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.txt index 50e18eca011..e76109c01b6 100644 --- a/compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.txt +++ b/compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.txt @@ -9,8 +9,8 @@ fun bar() { Resolved call: -Candidate descriptor: fun foo(t: T): Unit -Resulting descriptor: fun foo(t: A): Unit +Candidate descriptor: fun foo(t: T): Unit defined in root package +Resulting descriptor: fun foo(t: A): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.txt b/compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.txt index a461469e91a..0daa607a209 100644 --- a/compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.txt +++ b/compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.txt @@ -9,8 +9,8 @@ fun test(ls: MutableList) { Resolved call: -Candidate descriptor: fun foo(t: T, l: MutableList): Unit -Resulting descriptor: fun foo(t: ???, l: MutableList): Unit +Candidate descriptor: fun foo(t: T, l: MutableList): Unit defined in root package +Resulting descriptor: fun foo(t: ???, l: MutableList): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.txt b/compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.txt index ddc1ba1e21e..b3d7b6b230c 100644 --- a/compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.txt +++ b/compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.txt @@ -7,8 +7,8 @@ fun test() { Resolved call: -Candidate descriptor: fun foo(l: List): Unit -Resulting descriptor: fun foo(l: List): Unit +Candidate descriptor: fun foo(l: List): Unit defined in root package +Resulting descriptor: fun foo(l: List): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.txt b/compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.txt index 12b54fa037e..2fe396e1b31 100644 --- a/compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.txt +++ b/compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.txt @@ -10,7 +10,7 @@ fun bar() { Resolved call: -Resulting descriptor: fun foo(a: A, b: B): Unit +Resulting descriptor: fun foo(a: A, b: B): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.txt b/compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.txt index 520a3668970..3a4984fb906 100644 --- a/compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.txt +++ b/compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.txt @@ -10,7 +10,7 @@ fun bar() { Resolved call: -Resulting descriptor: fun foo(a: A, b: B): Unit +Resulting descriptor: fun foo(a: A, b: B): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.txt b/compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.txt index 7197b79d371..ce59478dbf4 100644 --- a/compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.txt +++ b/compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.txt @@ -9,7 +9,7 @@ fun bar() { Resolved call: -Resulting descriptor: fun foo(a: A): Unit +Resulting descriptor: fun foo(a: A): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.txt b/compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.txt index 841740a940a..dcac37aa34a 100644 --- a/compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.txt +++ b/compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.txt @@ -9,7 +9,7 @@ fun bar() { Resolved call: -Resulting descriptor: fun foo(a: A): Unit +Resulting descriptor: fun foo(a: A): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.txt b/compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.txt index e488d69898c..61b993b936b 100644 --- a/compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.txt +++ b/compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.txt @@ -9,7 +9,7 @@ fun bar() { Resolved call: -Resulting descriptor: fun foo(a: A): Unit +Resulting descriptor: fun foo(a: A): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.txt b/compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.txt index 1630dfdabd4..d4c9bccdf18 100644 --- a/compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.txt +++ b/compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.txt @@ -7,7 +7,7 @@ fun bar() { Resolved call: -Resulting descriptor: fun foo(): Unit +Resulting descriptor: fun foo(): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/realExamples/emptyList.txt b/compiler/testData/resolvedCalls/arguments/realExamples/emptyList.txt index 7dcfea9586b..0931d001b06 100644 --- a/compiler/testData/resolvedCalls/arguments/realExamples/emptyList.txt +++ b/compiler/testData/resolvedCalls/arguments/realExamples/emptyList.txt @@ -11,8 +11,8 @@ fun bar() { Resolved call: -Candidate descriptor: fun foo(t: T): Unit -Resulting descriptor: fun foo(t: List): Unit +Candidate descriptor: fun foo(t: T): Unit defined in root package +Resulting descriptor: fun foo(t: List): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.txt b/compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.txt index 11b074adb75..6d606bb9552 100644 --- a/compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.txt +++ b/compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.txt @@ -11,8 +11,8 @@ fun bar() { Resolved call: -Candidate descriptor: fun foo(t: T): Unit -Resulting descriptor: fun foo(t: MutableList): Unit +Candidate descriptor: fun foo(t: T): Unit defined in root package +Resulting descriptor: fun foo(t: MutableList): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.txt b/compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.txt index a57f201cf65..faf76105df5 100644 --- a/compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.txt +++ b/compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.txt @@ -11,7 +11,7 @@ fun bar() { Resolved call: -Resulting descriptor: fun foo(a: A, s: String): Unit +Resulting descriptor: fun foo(a: A, s: String): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/differentCallElements/annotationCall.txt b/compiler/testData/resolvedCalls/differentCallElements/annotationCall.txt index 6abb5c1726b..8eaee8cc9b1 100644 --- a/compiler/testData/resolvedCalls/differentCallElements/annotationCall.txt +++ b/compiler/testData/resolvedCalls/differentCallElements/annotationCall.txt @@ -5,7 +5,7 @@ annotation class MyA(val i: Int) Resolved call: -Resulting descriptor: constructor MyA(i: Int) +Resulting descriptor: constructor MyA(i: Int) defined in MyA Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.txt b/compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.txt index 39b2338ba1f..b562f08552a 100644 --- a/compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.txt +++ b/compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.txt @@ -5,8 +5,8 @@ class B: A() {} Resolved call: -Resulting descriptor: constructor A() +Resulting descriptor: constructor A() defined in A Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER -Receiver argument = NO_RECEIVER +Receiver argument = NO_RECEIVER \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.txt b/compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.txt index ff35bc170e7..0aebfb58049 100644 --- a/compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.txt +++ b/compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.txt @@ -5,7 +5,7 @@ fun foo(array: Array) { Resolved call: -Resulting descriptor: fun get(index: Int): Int +Resulting descriptor: fun get(index: Int): Int defined in kotlin.Array Explicit receiver kind = THIS_OBJECT This object = array {Array} @@ -13,4 +13,4 @@ Receiver argument = NO_RECEIVER Value arguments mapping: -SUCCESS index : Int = 1 +SUCCESS index : Int = 1 \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/explicitReceiverIsReceiverArgument.txt b/compiler/testData/resolvedCalls/explicitReceiverIsReceiverArgument.txt index 296c440beb7..572ab66cf31 100644 --- a/compiler/testData/resolvedCalls/explicitReceiverIsReceiverArgument.txt +++ b/compiler/testData/resolvedCalls/explicitReceiverIsReceiverArgument.txt @@ -9,8 +9,8 @@ fun bar(a: A) { Resolved call: -Resulting descriptor: fun A.foo(): Unit +Resulting descriptor: fun A.foo(): Unit defined in root package Explicit receiver kind = RECEIVER_ARGUMENT This object = NO_RECEIVER -Receiver argument = a {A} +Receiver argument = a {A} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/explicitReceiverIsThisObject.txt b/compiler/testData/resolvedCalls/explicitReceiverIsThisObject.txt index 08c9ce0394b..b1a2e8a2809 100644 --- a/compiler/testData/resolvedCalls/explicitReceiverIsThisObject.txt +++ b/compiler/testData/resolvedCalls/explicitReceiverIsThisObject.txt @@ -9,7 +9,7 @@ fun bar(a: A) { Resolved call: -Resulting descriptor: fun foo(): Unit +Resulting descriptor: fun foo(): Unit defined in A Explicit receiver kind = THIS_OBJECT This object = a {A} diff --git a/compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt b/compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt index 9e4efda1d7c..561e96c7e1f 100644 --- a/compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt +++ b/compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt @@ -5,8 +5,8 @@ fun bar(f: Int.()->Unit) { Resolved call: -Resulting descriptor: fun Int.invoke(): Unit +Resulting descriptor: fun Int.invoke(): Unit defined in kotlin.ExtensionFunction0 Explicit receiver kind = BOTH_RECEIVERS This object = f {ExtensionFunction0} -Receiver argument = 1 {Int} +Receiver argument = 1 {Int} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.txt b/compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.txt index 0b39355eea3..0a17b4f39b4 100644 --- a/compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.txt +++ b/compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.txt @@ -5,7 +5,7 @@ fun bar(f: ()->Unit) { Resolved call: -Resulting descriptor: fun invoke(): Unit +Resulting descriptor: fun invoke(): Unit defined in kotlin.Function0 Explicit receiver kind = THIS_OBJECT This object = f {Function0} diff --git a/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.txt b/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.txt index c7d065e06c6..eb2aa75bd97 100644 --- a/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.txt +++ b/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.txt @@ -9,7 +9,7 @@ trait A { Resolved call: -Resulting descriptor: val foo: Int.() -> Unit +Resulting descriptor: val foo: Int.() -> Unit defined in A Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = Class{A} diff --git a/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt b/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt index d969989af64..8bc6ae6ef8d 100644 --- a/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt +++ b/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt @@ -9,8 +9,8 @@ trait A { Resolved call: -Resulting descriptor: fun Int.invoke(): Unit +Resulting descriptor: fun Int.invoke(): Unit defined in kotlin.ExtensionFunction0 Explicit receiver kind = BOTH_RECEIVERS This object = foo {ExtensionFunction0} -Receiver argument = 1 {Int} +Receiver argument = 1 {Int} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.txt b/compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.txt index 357cf17cdcb..6d3e0de1c89 100644 --- a/compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.txt +++ b/compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.txt @@ -9,7 +9,7 @@ fun test(a: A) { Resolved call: -Resulting descriptor: val foo: (Int) -> Int +Resulting descriptor: val foo: (Int) -> Int defined in A Explicit receiver kind = THIS_OBJECT This object = a {A} diff --git a/compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.txt b/compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.txt index 93ef70e670e..d69063050ad 100644 --- a/compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.txt +++ b/compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.txt @@ -9,7 +9,7 @@ fun test(a: A) { Resolved call: -Resulting descriptor: fun invoke(p1: Int): Int +Resulting descriptor: fun invoke(p1: Int): Int defined in kotlin.Function1 Explicit receiver kind = THIS_OBJECT This object = foo {Function1} diff --git a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.txt b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.txt index 57472a0b1c7..a531b703a5a 100644 --- a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.txt +++ b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.txt @@ -13,8 +13,8 @@ fun bar(a: A, b: B) { Resolved call: -Resulting descriptor: fun B.foo(): Unit +Resulting descriptor: fun B.foo(): Unit defined in A Explicit receiver kind = RECEIVER_ARGUMENT -This object = AExt{fun A.(): Unit} -Receiver argument = b {B} +This object = AExt{fun A.(): Unit defined in bar} +Receiver argument = b {B} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.txt b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.txt index c218f81b453..da37fce7f03 100644 --- a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.txt +++ b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.txt @@ -15,8 +15,8 @@ fun bar(a: A, b: B) { Resolved call: -Resulting descriptor: fun B.foo(): Unit +Resulting descriptor: fun B.foo(): Unit defined in A Explicit receiver kind = NO_EXPLICIT_RECEIVER -This object = AExt{fun A.(): Unit} -Receiver argument = BExt{fun B.(): Unit} +This object = AExt{fun A.(): Unit defined in bar} +Receiver argument = BExt{fun B.(): Unit defined in bar.} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/implicitReceiverIsReceiverArgument.txt b/compiler/testData/resolvedCalls/implicitReceiverIsReceiverArgument.txt index cc006c3d88c..e1ccd3f29be 100644 --- a/compiler/testData/resolvedCalls/implicitReceiverIsReceiverArgument.txt +++ b/compiler/testData/resolvedCalls/implicitReceiverIsReceiverArgument.txt @@ -9,8 +9,8 @@ fun A.bar() { Resolved call: -Resulting descriptor: fun A.foo(): Unit +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} +Receiver argument = AExt{fun A.bar(): Unit defined in root package} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/implicitReceiverIsThisObject.txt b/compiler/testData/resolvedCalls/implicitReceiverIsThisObject.txt index 17d0ede13d6..6ea9b8d638f 100644 --- a/compiler/testData/resolvedCalls/implicitReceiverIsThisObject.txt +++ b/compiler/testData/resolvedCalls/implicitReceiverIsThisObject.txt @@ -9,8 +9,8 @@ fun A.bar() { Resolved call: -Resulting descriptor: fun foo(): Unit +Resulting descriptor: fun foo(): Unit defined in A Explicit receiver kind = NO_EXPLICIT_RECEIVER -This object = AExt{fun A.bar(): Unit} +This object = AExt{fun A.bar(): Unit defined in root package} Receiver argument = NO_RECEIVER \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.txt b/compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.txt index 0666596a0ee..16ded7b26f1 100644 --- a/compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.txt +++ b/compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.txt @@ -8,7 +8,7 @@ class A { Resolved call: -Resulting descriptor: fun foo(): Unit +Resulting descriptor: fun foo(): Unit defined in A Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = Class{A} diff --git a/compiler/testData/resolvedCalls/invoke/bothReceivers.txt b/compiler/testData/resolvedCalls/invoke/bothReceivers.txt index 3caabfecdd9..5b5bba4ab7d 100644 --- a/compiler/testData/resolvedCalls/invoke/bothReceivers.txt +++ b/compiler/testData/resolvedCalls/invoke/bothReceivers.txt @@ -9,8 +9,8 @@ fun bar(f: Foo) { Resolved call: -Resulting descriptor: fun Int.invoke(): Unit +Resulting descriptor: fun Int.invoke(): Unit defined in Foo Explicit receiver kind = BOTH_RECEIVERS This object = f {Foo} -Receiver argument = 1 {Int} +Receiver argument = 1 {Int} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt b/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt index 6048e3eb53e..5d93af8072a 100644 --- a/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt +++ b/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt @@ -11,8 +11,8 @@ fun bar(f: Foo, i: Int) { Resolved call: -Resulting descriptor: fun Int.invoke(): Unit +Resulting descriptor: fun Int.invoke(): Unit defined in Foo Explicit receiver kind = THIS_OBJECT This object = f {Foo} -Receiver argument = IntExt{fun Int.(): Unit} +Receiver argument = IntExt{fun Int.(): Unit defined in bar} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.txt b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.txt index 8b2fa62da73..8191305f7d6 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.txt @@ -9,7 +9,7 @@ fun test() = A(1) Resolved call: -Resulting descriptor: class object +Resulting descriptor: class object defined in A Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.txt b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.txt index d0f68b3745d..7548c654134 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.txt @@ -9,7 +9,7 @@ fun test() = A(1) Resolved call: -Resulting descriptor: fun invoke(i: Int): Int +Resulting descriptor: fun invoke(i: Int): Int defined in A. Explicit receiver kind = THIS_OBJECT This object = A {} diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt index a52c5ff7e98..d743965d187 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt @@ -10,7 +10,7 @@ fun test() = A.ONE(1) Resolved call: -Resulting descriptor: enum entry ONE : A +Resulting descriptor: enum entry ONE : A defined in A Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt index 7460bea668c..bad2fe35248 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt @@ -10,7 +10,7 @@ fun test() = A.ONE(1) Resolved call: -Resulting descriptor: fun invoke(i: Int): Int +Resulting descriptor: fun invoke(i: Int): Int defined in A Explicit receiver kind = THIS_OBJECT This object = ONE {A} diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnObject1.txt b/compiler/testData/resolvedCalls/invoke/invokeOnObject1.txt index 94215458511..0171fd9a221 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnObject1.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnObject1.txt @@ -7,7 +7,7 @@ fun test() = A(1) Resolved call: -Resulting descriptor: object A +Resulting descriptor: object A defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnObject2.txt b/compiler/testData/resolvedCalls/invoke/invokeOnObject2.txt index f2beb0d7b2a..a8a294dc0aa 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnObject2.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnObject2.txt @@ -7,7 +7,7 @@ fun test() = A(1) Resolved call: -Resulting descriptor: fun invoke(i: Int): Int +Resulting descriptor: fun invoke(i: Int): Int defined in A Explicit receiver kind = THIS_OBJECT This object = A {A} diff --git a/compiler/testData/resolvedCalls/invoke/receiverArgumentAsReceiverForInvoke.txt b/compiler/testData/resolvedCalls/invoke/receiverArgumentAsReceiverForInvoke.txt index 1dec4465301..8d36224ce21 100644 --- a/compiler/testData/resolvedCalls/invoke/receiverArgumentAsReceiverForInvoke.txt +++ b/compiler/testData/resolvedCalls/invoke/receiverArgumentAsReceiverForInvoke.txt @@ -8,8 +8,8 @@ fun bar(f: Foo) { Resolved call: -Resulting descriptor: fun Foo.invoke(): Unit +Resulting descriptor: fun Foo.invoke(): Unit defined in root package Explicit receiver kind = RECEIVER_ARGUMENT This object = NO_RECEIVER -Receiver argument = f {Foo} +Receiver argument = f {Foo} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/invoke/thisObjectAsReceiverForInvoke.txt b/compiler/testData/resolvedCalls/invoke/thisObjectAsReceiverForInvoke.txt index e3548d9510e..c3cbc2fad05 100644 --- a/compiler/testData/resolvedCalls/invoke/thisObjectAsReceiverForInvoke.txt +++ b/compiler/testData/resolvedCalls/invoke/thisObjectAsReceiverForInvoke.txt @@ -9,7 +9,7 @@ fun bar(f: Foo) { Resolved call: -Resulting descriptor: fun invoke(): Unit +Resulting descriptor: fun invoke(): Unit defined in Foo Explicit receiver kind = THIS_OBJECT This object = f {Foo} diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt index aff5500a574..4ec116d1e0d 100644 --- a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt +++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt @@ -11,7 +11,7 @@ fun test() { Resolved call: -Resulting descriptor: val baz: Foo +Resulting descriptor: val baz: Foo defined in Foo. Explicit receiver kind = THIS_OBJECT This object = Foo {} diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt b/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt index 836c2f90207..3538ec0a272 100644 --- a/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt +++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt @@ -6,7 +6,7 @@ fun test() { Resolved call: -Resulting descriptor: val EMPTY: IntRange +Resulting descriptor: val EMPTY: IntRange defined in kotlin.IntRange. Explicit receiver kind = THIS_OBJECT This object = IntRange {} diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/object.txt b/compiler/testData/resolvedCalls/objectsAndClassObjects/object.txt index 453e3443393..201605b3ee1 100644 --- a/compiler/testData/resolvedCalls/objectsAndClassObjects/object.txt +++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/object.txt @@ -9,7 +9,7 @@ fun test() { Resolved call: -Resulting descriptor: val baz: Int +Resulting descriptor: val baz: Int defined in Foo Explicit receiver kind = THIS_OBJECT This object = Foo {Foo} diff --git a/compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.txt b/compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.txt index 133db8cdacc..04f0907574e 100644 --- a/compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.txt +++ b/compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.txt @@ -41,8 +41,8 @@ val fail: Nothing get() = throw Exception() Resolved call: -Resulting descriptor: fun String.plus(): Unit +Resulting descriptor: fun String.plus(): Unit defined in Title Explicit receiver kind = RECEIVER_ARGUMENT -This object = TitleExt{fun Title.(): Unit} -Receiver argument = "Foo" {String} +This object = TitleExt{fun Title.(): Unit defined in result..} +Receiver argument = "Foo" {String} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.txt b/compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.txt index 31c8cbcd687..0c9dd5f07f8 100644 --- a/compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.txt +++ b/compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.txt @@ -10,8 +10,8 @@ fun bar() { Resolved call: -Candidate descriptor: fun doSmth(l: List): Unit -Resulting descriptor: fun doSmth(l: List): Unit +Candidate descriptor: fun doSmth(l: List): Unit defined in root package +Resulting descriptor: fun doSmth(l: List): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.txt b/compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.txt index bea03bf1427..cd304376a26 100644 --- a/compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.txt +++ b/compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.txt @@ -8,8 +8,8 @@ fun bar(f: () -> T): T = f() Resolved call: -Candidate descriptor: fun bar(f: () -> T): T -Resulting descriptor: fun bar(f: () -> Unit): Unit +Candidate descriptor: fun bar(f: () -> T): T defined in root package +Resulting descriptor: fun bar(f: () -> Unit): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/simpleCall.txt b/compiler/testData/resolvedCalls/simpleCall.txt index da7efadbaf9..1f63fab5ab4 100644 --- a/compiler/testData/resolvedCalls/simpleCall.txt +++ b/compiler/testData/resolvedCalls/simpleCall.txt @@ -7,7 +7,7 @@ fun bar() { Resolved call: -Resulting descriptor: fun foo(): Unit +Resulting descriptor: fun foo(): Unit defined in root package Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt b/compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt index d027fb9f00c..45c00b8f5fb 100644 --- a/compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt +++ b/compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt @@ -15,4 +15,4 @@ Resulting descriptor: Class{B}::this Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER -Receiver argument = NO_RECEIVER +Receiver argument = NO_RECEIVER \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.txt b/compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.txt index f40d6b1b943..156b0bb221e 100644 --- a/compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.txt +++ b/compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.txt @@ -7,7 +7,7 @@ fun A.bar() = this.foo() Resolved call: -Resulting descriptor: AExt{fun A.bar(): Unit}::this +Resulting descriptor: AExt{fun A.bar(): Unit defined in root package}::this Explicit receiver kind = NO_EXPLICIT_RECEIVER This object = NO_RECEIVER diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java index 26ab762b68a..3d528df488c 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java +++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java @@ -53,7 +53,6 @@ public interface DescriptorRenderer extends Renderer { .setModifiers().build(); DescriptorRenderer COMPACT_WITH_SHORT_TYPES = new DescriptorRendererBuilder() - .setWithDefinedIn(false) .setModifiers() .setShortNames(true) .setIncludeSynthesizedParameterNames(false).build();