Add variable serializer to repl state; fixed some tests

Kotlin · Jul 23, 2021 · 0e78ed1 · 0e78ed1
1 parent f20216b
commit 0e78ed1
Show file tree

Hide file tree

Showing 5 changed files with 286 additions and 132 deletions.
diff --git a/...r/src/main/kotlin/org/jetbrains/kotlinx/jupyter/compiler/util/serializedCompiledScript.kt b/...r/src/main/kotlin/org/jetbrains/kotlinx/jupyter/compiler/util/serializedCompiledScript.kt
@@ -36,7 +36,7 @@ class EvaluatedSnippetMetadata(
     val newClasspath: Classpath = emptyList(),
     val compiledData: SerializedCompiledScriptsData = SerializedCompiledScriptsData.EMPTY,
     val newImports: List<String> = emptyList(),
-    val evaluatedVariablesState: SerializedVariablesState = SerializedVariablesState()
+    val evaluatedVariablesState: Map<String, SerializedVariablesState> = emptyMap()
 ) {
     companion object {
         val EMPTY = EvaluatedSnippetMetadata()

diff --git a/src/main/kotlin/org/jetbrains/kotlinx/jupyter/repl.kt b/src/main/kotlin/org/jetbrains/kotlinx/jupyter/repl.kt
@@ -136,6 +136,8 @@ interface ReplForJupyter {
 
     val notebook: NotebookImpl
 
+    val variablesSerializer: VariablesSerializer
+
     val fileExtension: String
 
     val isEmbedded: Boolean
@@ -187,6 +189,8 @@ class ReplForJupyterImpl(
 
     override val notebook = NotebookImpl(runtimeProperties)
 
+    override val variablesSerializer = VariablesSerializer()
+
     private val librariesScanner = LibrariesScanner(notebook)
     private val resourcesProcessor = LibraryResourcesProcessorImpl()
 
@@ -420,10 +424,11 @@ class ReplForJupyterImpl(
             notebook.updateVariablesState(internalEvaluator)
             // printVars()
             // printUsagesInfo(jupyterId, cellVariables[jupyterId - 1])
-            val entry = notebook.variablesState.entries.last()
-            val serializedVarsState = serializeVariableState(entry.key, entry.value)
+            val entry = notebook.variablesState.entries.lastOrNull()
+            val serializedVarsState =  variablesSerializer.serializeVariableState(jupyterId - 1, entry?.key, entry?.value)
+            val serializedData = variablesSerializer.serializeVariables(jupyterId - 1, notebook.variablesState)
 
-            EvalResult(rendered, EvaluatedSnippetMetadata(newClasspath, compiledData, newImports, serializedVarsState))
+            EvalResult(rendered, EvaluatedSnippetMetadata(newClasspath, compiledData, newImports, serializedData))
         }
     }