Fix post-rebase errors

Author: ileasile

jupyter-lib/kotlin-jupyter-api/src/main/kotlin/org/jetbrains/kotlin/jupyter/api/results.kt

@@ -9,7 +9,7 @@ interface Renderable {
 interface DisplayResult: Renderable {
     val id: String? get() = null
 
-    fun toJson(): JsonObject
+    fun toJson(additionalMetadata: JsonObject = jsonObject()): JsonObject
 
     override fun render(notebook: Notebook<*>) = this
 }
@@ -23,6 +23,7 @@ interface DisplayContainer {
     fun getById(id: String?): List<DisplayResultWithCell>
 }
 
+@Suppress("unused")
 fun DisplayResult?.toJson(): JsonObject {
     if (this != null) return this.toJson()
     return jsonObject("data" to null, "metadata" to jsonObject())
@@ -48,9 +49,13 @@ class MimeTypedResult(
         var isolatedHtml: Boolean = false,
         override val id: String? = null
 ) : Map<String, String> by mimeData, DisplayResult {
-    override fun toJson(): JsonObject {
+    override fun toJson(additionalMetadata: JsonObject): JsonObject {
         val data = JsonObject(this)
         val metadata = if (isolatedHtml) jsonObject("text/html" to jsonObject("isolated" to true)) else jsonObject()
+        additionalMetadata.forEach { key, value ->
+            metadata[key] = value
+        }
+
         val result = jsonObject(
                 "data" to data,
                 "metadata" to metadata
@@ -60,7 +65,10 @@ class MimeTypedResult(
     }
 }
 
+@Suppress("unused", "FunctionName")
 fun MIME(vararg mimeToData: Pair<String, String>): MimeTypedResult = mimeResult(*mimeToData)
+
+@Suppress("unused", "FunctionName")
 fun HTML(text: String, isolated: Boolean = false) = htmlResult(text, isolated)
 
 fun mimeResult(vararg mimeToData: Pair<String, String>): MimeTypedResult = MimeTypedResult(mapOf(*mimeToData))

src/main/kotlin/org/jetbrains/kotlin/jupyter/protocol.kt

@@ -48,11 +48,38 @@ abstract class Response(
 }
 
 class OkResponseWithMessage(
-        private val result: MimeTypedResult?,
+        private val result: DisplayResult?,
         private val newClasspath: Classpath = emptyList(),
         stdOut: String? = null,
         stdErr: String? = null,
 ): Response(stdOut, stdErr){
+    override val state: ResponseState = ResponseState.Ok
+
+    override fun sendBody(socket: JupyterConnection.Socket, requestCount: Long, requestMsg: Message, startedTime: String) {
+        if (result != null) {
+            val metadata = jsonObject("new_classpath" to newClasspath)
+            val resultJson = result.toJson(metadata).also { it["execution_count"] = requestCount }
+
+            socket.connection.iopub.send(makeReplyMessage(requestMsg,
+                "execute_result",
+                content = resultJson))
+        }
+
+        socket.send(makeReplyMessage(requestMsg, "execute_reply",
+            metadata = jsonObject(
+                "dependencies_met" to true,
+                "engine" to requestMsg.header["session"],
+                "status" to "ok",
+                "started" to startedTime),
+            content = jsonObject(
+                "status" to "ok",
+                "execution_count" to requestCount,
+                "user_variables" to JsonObject(),
+                "payload" to listOf<String>(),
+                "user_expressions" to JsonObject())))
+    }
+
+}
 interface DisplayHandler {
     fun handleDisplay(value: Any)
     fun handleUpdate(value: Any, id: String? = null)
@@ -88,45 +115,8 @@ class SocketDisplayHandler(
     }
 }
 
-data class OkResponseWithMessage(
-        val result: DisplayResult?,
-        override val stdOut: String? = null,
-        override val stdErr: String? = null,
-): Response{
-    override val state: ResponseState = ResponseState.Ok
-
-    override fun sendBody(socket: JupyterConnection.Socket, requestCount: Long, requestMsg: Message, startedTime: String) {
-        if (result != null) {
-            val metadata = jsonObject()
-            if (result.isolatedHtml) metadata["text/html"] = jsonObject("isolated" to true)
-            metadata["new_classpath"] = newClasspath
-
-            socket.connection.iopub.send(makeReplyMessage(requestMsg,
-                "execute_result",
-                content = jsonObject(
-                    "execution_count" to requestCount,
-                    "data" to result,
-                    "metadata" to metadata
-                )))
-        }
-
-        socket.send(makeReplyMessage(requestMsg, "execute_reply",
-            metadata = jsonObject(
-                "dependencies_met" to true,
-                "engine" to requestMsg.header["session"],
-                "status" to "ok",
-                "started" to startedTime),
-            content = jsonObject(
-                "status" to "ok",
-                "execution_count" to requestCount,
-                "user_variables" to JsonObject(),
-                "payload" to listOf<String>(),
-                "user_expressions" to JsonObject())))
-    }
-}
 
 class AbortResponseWithMessage(
-        val result: MimeTypedResult?,
         stdErr: String? = null,
 ): Response(null, stdErr){
     override val state: ResponseState = ResponseState.Abort
@@ -142,7 +132,6 @@ class AbortResponseWithMessage(
 }
 
 class ErrorResponseWithMessage(
-        val result: MimeTypedResult?,
         stdErr: String? = null,
         private val errorName: String = "Unknown error",
         private var errorValue: String = "",

src/main/kotlin/org/jetbrains/kotlin/jupyter/repl.kt

@@ -459,17 +459,12 @@ class ReplForJupyterImpl(
                     executeScheduledCode()
                 }
 
-                log.catchAll {
-                    updateOutputList(jupyterId, result)
-                }
-
                 val newClasspath = log.catchAll {
                     updateClasspath()
                 } ?: emptyList()
 
                 result = renderResult(result, resultField)
 
-
                 return EvalResult(result, newClasspath)
 
             } finally {
@@ -483,13 +478,6 @@ class ReplForJupyterImpl(
         return shutdownCodes.map(::evalWithReturn)
     }
 
-    private fun updateOutputList(jupyterId: Int, result: Any?) {
-        if (jupyterId >= 0) {
-            while (ReplOutputs.count() <= jupyterId) ReplOutputs.add(null)
-            ReplOutputs[jupyterId] = result
-        }
-    }
-
     /**
      * Updates current classpath with newly resolved libraries paths
      * Also, prints information about resolved libraries to stdout if [trackClasspath] is true