From 89e377763ab8fe3309b30f3a21aa52fa83616318 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 18 Feb 2020 11:21:38 +0300
Subject: [PATCH] [FIR] Change rendering for captured types and stub types

---
 .../src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt    | 4 ++--
 .../inference/capturedTypeForJavaTypeParameter.txt        | 2 +-
 .../resolve/inference/receiverWithCapturedType.txt        | 6 +++---
 .../testData/resolve/inference/simpleCapturedTypes.txt    | 8 ++++----
 .../testData/resolveWithStdlib/j+k/capturedFlexible.txt   | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt
index e2edfb5caf4..f61c5f0a9e3 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt
@@ -15,7 +15,7 @@ fun ConeKotlinType.render(): String {
         is ConeTypeVariableType -> "TypeVariable(${this.lookupTag.name})"
         is ConeDefinitelyNotNullType -> "${original.render()}!!"
         is ConeClassErrorType -> "ERROR CLASS: $reason"
-        is ConeCapturedType -> "captured type: lowerType = ${lowerType?.render()}"
+        is ConeCapturedType -> "CapturedType(${constructor.projection.render()})"
         is ConeClassLikeType -> {
             buildString {
                 append(lookupTag.classId.asString())
@@ -45,7 +45,7 @@ fun ConeKotlinType.render(): String {
                 postfix = ")"
             )
         }
-        is ConeStubType -> "stub type: $variable"
+        is ConeStubType -> "Stub: $variable"
         is ConeIntegerLiteralType -> "ILT: $value"
     } + nullabilitySuffix
 }
diff --git a/compiler/fir/resolve/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt b/compiler/fir/resolve/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt
index e5f96a4db19..05d95fd8eca 100644
--- a/compiler/fir/resolve/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt
+++ b/compiler/fir/resolve/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt
@@ -4,5 +4,5 @@ FILE: main.kt
     public final fun <D : R|A|> foo(b: R|B<D>|): R|kotlin/Unit| {
     }
     public final fun main(b: R|B<*>|): R|kotlin/Unit| {
-        R|/foo|<R|captured type: lowerType = null|>(R|<local>/b|)
+        R|/foo|<R|CapturedType(*)|>(R|<local>/b|)
     }
diff --git a/compiler/fir/resolve/testData/resolve/inference/receiverWithCapturedType.txt b/compiler/fir/resolve/testData/resolve/inference/receiverWithCapturedType.txt
index c9589ba47f9..cffd9ee6a46 100644
--- a/compiler/fir/resolve/testData/resolve/inference/receiverWithCapturedType.txt
+++ b/compiler/fir/resolve/testData/resolve/inference/receiverWithCapturedType.txt
@@ -15,10 +15,10 @@ FILE: receiverWithCapturedType.kt
         ^updateD R|<local>/d|
     }
     public final fun test_1_1(resolvedCall: R|ResolvedCall<out CallableDescriptor>|): R|kotlin/Unit| {
-        R|<local>/resolvedCall|.R|/getParameterForArgument|<R|captured type: lowerType = null|>()
+        R|<local>/resolvedCall|.R|/getParameterForArgument|<R|CapturedType(out CallableDescriptor)|>()
     }
     public final fun test_1_2(resolvedCall: R|ResolvedCall<in CallableDescriptor>|): R|kotlin/Unit| {
-        R|<local>/resolvedCall|.R|/getParameterForArgument|<R|captured type: lowerType = CallableDescriptor|>()
+        R|<local>/resolvedCall|.R|/getParameterForArgument|<R|CapturedType(in CallableDescriptor)|>()
     }
     public final fun test_1_3(resolvedCall: R|ResolvedCall<CallableDescriptor>|): R|kotlin/Unit| {
         R|<local>/resolvedCall|.R|/getParameterForArgument|<R|CallableDescriptor|>()
@@ -27,7 +27,7 @@ FILE: receiverWithCapturedType.kt
         lval x: <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/updateD]> = R|<local>/resolvedCall|.<Inapplicable(INAPPLICABLE): [/updateD]>#(R|<local>/d|)
     }
     public final fun test_2_2(resolvedCall: R|ResolvedCall<in CallableDescriptor>|, d: R|CallableDescriptor|): R|kotlin/Unit| {
-        lval x: R|CallableDescriptor| = R|<local>/resolvedCall|.R|/updateD|<R|captured type: lowerType = CallableDescriptor|>(R|<local>/d|)
+        lval x: R|CallableDescriptor| = R|<local>/resolvedCall|.R|/updateD|<R|CapturedType(in CallableDescriptor)|>(R|<local>/d|)
     }
     public final fun test_2_3(resolvedCall: R|ResolvedCall<CallableDescriptor>|, d: R|CallableDescriptor|): R|kotlin/Unit| {
         lval x: R|CallableDescriptor| = R|<local>/resolvedCall|.R|/updateD|<R|CallableDescriptor|>(R|<local>/d|)
diff --git a/compiler/fir/resolve/testData/resolve/inference/simpleCapturedTypes.txt b/compiler/fir/resolve/testData/resolve/inference/simpleCapturedTypes.txt
index 7a44b661a74..1ce4882d956 100644
--- a/compiler/fir/resolve/testData/resolve/inference/simpleCapturedTypes.txt
+++ b/compiler/fir/resolve/testData/resolve/inference/simpleCapturedTypes.txt
@@ -19,10 +19,10 @@ FILE: simpleCapturedTypes.kt
             ^ this@R|/idP|
         }
     private final fun getSetterInfos(kc: R|KC<out Ann>|): R|kotlin/Unit| {
-        R|/id|<R|captured type: lowerType = null|>(R|<local>/kc|).R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|()
-        R|<local>/kc|.R|/idR|<R|captured type: lowerType = null|>().R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|()
+        R|/id|<R|CapturedType(out Ann)|>(R|<local>/kc|).R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|()
+        R|<local>/kc|.R|/idR|<R|CapturedType(out Ann)|>().R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|()
         R|<local>/kc|.R|/idP|.R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|()
-        lval x1: R|KC<out Ann>| = R|/id|<R|captured type: lowerType = null|>(R|<local>/kc|)
-        lval x2: R|KC<out Ann>| = R|<local>/kc|.R|/idR|<R|captured type: lowerType = null|>()
+        lval x1: R|KC<out Ann>| = R|/id|<R|CapturedType(out Ann)|>(R|<local>/kc|)
+        lval x2: R|KC<out Ann>| = R|<local>/kc|.R|/idR|<R|CapturedType(out Ann)|>()
         lval x3: R|KC<out Ann>| = R|<local>/kc|.R|/idP|
     }
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.txt
index 2af7e3f7089..ddb7d313c91 100644
--- a/compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.txt
+++ b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.txt
@@ -1,4 +1,4 @@
 FILE: capturedFlexible.kt
     public final fun foo(z: R|java/util/zip/ZipFile|): R|kotlin/Unit| {
-        R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|captured type: lowerType = null|>()
+        R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|CapturedType(out java/util/zip/ZipEntry)|>()
     }