Fix #328: apply workaround for KT-48636

Author: ileasile

build-plugin/src/build/BuildSettingsExtension.kt

@@ -49,6 +49,10 @@ class BuildSettingsExtension(private val project: Project) {
         fun skipPrereleaseCheck() = args.add("-Xskip-prerelease-check")
         fun requiresOptIn() = args.add("-Xopt-in=kotlin.RequiresOptIn")
         fun allowResultReturnType() = args.add("-Xallow-result-return-type")
+        fun useOldBackend() = args.add("-Xuse-old-backend")
+
+        fun samConversions(type: String) = args.add("-Xsam-conversions=$type")
+        fun samConversionsClass() = samConversions("class")
     }
 
     fun withCompilerArgs(configure: KotlinCompilerArgsBuilder.() -> Unit) {

build.gradle.kts

@@ -75,6 +75,7 @@ buildSettings {
     withLanguageLevel(rootSettings.kotlinLanguageLevel)
     withCompilerArgs {
         skipPrereleaseCheck()
+        samConversionsClass()
     }
     withTests()
 }

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

@@ -22,6 +22,11 @@ interface Notebook {
      */
     val cellVariables: Map<Int, Set<String>>
 
+    /**
+     * Returns the object that allows to access execution results
+     */
+    val resultsAccessor: ResultsAccessor
+
     /**
      * Mapping allowing to get cell by execution number
      */

jupyter-lib/lib/src/main/kotlin/jupyter/kotlin/ScriptTemplateWithDisplayHelpers.kt

@@ -30,9 +30,7 @@ abstract class ScriptTemplateWithDisplayHelpers(
         USE(o.getDefinitions(notebook).single())
     }
 
-    val Out: ResultsAccessor get() = ResultsAccessor { id ->
-        notebook.getResult(id)
-    }
+    val Out: ResultsAccessor get() = notebook.resultsAccessor
 
     val JavaRuntimeUtils get() = notebook.jreInfo
 }

src/main/kotlin/org/jetbrains/kotlinx/jupyter/apiImpl.kt

@@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.jupyter.api.JREInfoProvider
 import org.jetbrains.kotlinx.jupyter.api.KotlinKernelVersion
 import org.jetbrains.kotlinx.jupyter.api.Notebook
 import org.jetbrains.kotlinx.jupyter.api.RenderersProcessor
+import org.jetbrains.kotlinx.jupyter.api.ResultsAccessor
 import org.jetbrains.kotlinx.jupyter.api.VariableState
 import org.jetbrains.kotlinx.jupyter.repl.InternalEvaluator
 
@@ -110,6 +111,8 @@ class NotebookImpl(
     override val cellVariables: Map<Int, Set<String>>
         get() = currentCellVariables
 
+    override val resultsAccessor = ResultsAccessor { getResult(it) }
+
     override fun getCell(id: Int): CodeCellImpl {
         return cells[id] ?: throw ArrayIndexOutOfBoundsException(
             "There is no cell with number '$id'"

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/repl/ReplTests.kt

@@ -24,6 +24,7 @@ import kotlin.script.experimental.api.SourceCode
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
 import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
 import kotlin.test.fail
 
 class ReplTests : AbstractSingleReplTest() {
@@ -455,6 +456,12 @@ class ReplTests : AbstractSingleReplTest() {
         @Suppress("UNCHECKED_CAST")
         assertEquals(2, (res as (Int) -> Int)(1))
     }
+
+    @Test
+    fun testOutVarRendering() {
+        val res = eval("Out").resultValue
+        assertNotNull(res)
+    }
 }
 
 class ReplVarsTest : AbstractSingleReplTest() {

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/testUtil.kt

@@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.jupyter.api.JREInfoProvider
 import org.jetbrains.kotlinx.jupyter.api.KotlinKernelVersion
 import org.jetbrains.kotlinx.jupyter.api.Notebook
 import org.jetbrains.kotlinx.jupyter.api.RenderersProcessor
+import org.jetbrains.kotlinx.jupyter.api.ResultsAccessor
 import org.jetbrains.kotlinx.jupyter.api.VariableState
 import org.jetbrains.kotlinx.jupyter.api.VariableStateImpl
 import org.jetbrains.kotlinx.jupyter.api.libraries.ExecutionHost
@@ -162,6 +163,7 @@ object NotebookMock : Notebook {
         get() = emptyList()
     override val variablesState = mutableMapOf<String, VariableStateImpl>()
     override val cellVariables = mapOf<Int, Set<String>>()
+    override val resultsAccessor = ResultsAccessor { getResult(it) }
 
     override fun getCell(id: Int): CodeCellImpl {
         return cells[id] ?: throw ArrayIndexOutOfBoundsException(