From 3943bd1b15165261601b8ce0574364a58a5a8a42 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 5 Feb 2019 12:04:12 +0100
Subject: [PATCH] Make toString for repl return function types nicer, drop
 obsolete `isFunctionType`

---
 .../src/org/jetbrains/kotlin/cli/common/repl/ReplApi.kt   | 8 +++++---
 .../jetbrains/kotlin/cli/jvm/repl/GenericReplCompiler.kt  | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/ReplApi.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/ReplApi.kt
index ecc02606308..6fb8d4ab110 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/ReplApi.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/ReplApi.kt
@@ -21,6 +21,7 @@ import java.io.File
 import java.io.Serializable
 import java.util.*
 import java.util.concurrent.locks.ReentrantReadWriteLock
+import kotlin.jvm.internal.TypeIntrinsics
 import kotlin.reflect.KClass
 
 const val REPL_CODE_LINE_FIRST_NO = 1
@@ -89,8 +90,8 @@ sealed class ReplCompileResult : Serializable {
                           val classes: List<CompiledClassData>,
                           val hasResult: Boolean,
                           val classpathAddendum: List<File>,
-                          val type: String?,
-                          val isFunctionType: Boolean) : ReplCompileResult() {
+                          val type: String?
+    ) : ReplCompileResult() {
         companion object { private val serialVersionUID: Long = 2L }
     }
 
@@ -124,7 +125,8 @@ interface ReplEvalAction {
 sealed class ReplEvalResult : Serializable {
     class ValueResult(val name: String, val value: Any?, val type: String?) : ReplEvalResult() {
         override fun toString(): String {
-           return "$name: $type = $value"
+            val v = if (value is Function<*>) "<function${TypeIntrinsics.getFunctionArity(value)}>" else value
+            return "$name: $type = $v"
         }
 
         companion object { private val serialVersionUID: Long = 1L }
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericReplCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericReplCompiler.kt
index d56fb5972ec..ae98c44a53a 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericReplCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericReplCompiler.kt
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.cli.jvm.repl
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.util.Disposer
-import org.jetbrains.kotlin.builtins.isFunctionType
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.repl.*
@@ -125,8 +124,7 @@ open class GenericReplCompiler(
                 classpathAddendum ?: emptyList(),
                 generationState.replSpecific.resultType?.let {
                     DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(it)
-                },
-                type?.isFunctionType ?: false
+                }
             )
         }
     }