Skip to content

Commit 001534c

Browse files
ileasileileasile
committed
Fix post-rebase issues
1 parent e4984ae commit 001534c

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

Diff for: ‎src/main/kotlin/org/jetbrains/kotlinx/jupyter/apiImpl.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ class NotebookImpl(
128128
private var currentCellVariables = mapOf<Int, Set<String>>()
129129
private val history = arrayListOf<CodeCellImpl>()
130130
private var mainCellCreated = false
131-
private val unchangedVariables: MutableSet<String> = mutableSetOf()
131+
private val _unchangedVariables: MutableSet<String> = mutableSetOf()
132132

133+
val unchangedVariables: Set<String> get() = _unchangedVariables
133134
val displays = DisplayContainerImpl()
134135

135136
override fun getAllDisplays(): List<DisplayResultWithCell> {
@@ -148,16 +149,14 @@ class NotebookImpl(
148149
fun updateVariablesState(evaluator: InternalEvaluator) {
149150
variablesState += evaluator.variablesHolder
150151
currentCellVariables = evaluator.cellVariables
151-
unchangedVariables.clear()
152-
unchangedVariables.addAll(evaluator.getUnchangedVariables())
152+
_unchangedVariables.clear()
153+
_unchangedVariables.addAll(evaluator.getUnchangedVariables())
153154
}
154155

155156
fun updateVariablesState(varsStateUpdate: Map<String, VariableState>) {
156157
variablesState += varsStateUpdate
157158
}
158159

159-
fun unchangedVariables(): Set<String> = unchangedVariables
160-
161160
fun variablesReportAsHTML(): String {
162161
return generateHTMLVarsReport(variablesState)
163162
}

Diff for: ‎src/main/kotlin/org/jetbrains/kotlinx/jupyter/protocol.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ fun JupyterConnection.Socket.shellMessagesHandler(msg: Message, repl: ReplForJup
315315
val data = content.data ?: return sendWrapped(msg, makeReplyMessage(msg, MessageType.SERIALIZATION_REPLY))
316316

317317
val messageContent = getVariablesDescriptorsFromJson(data)
318-
GlobalScope.launch(Dispatchers.Default) {
318+
connection.launchJob {
319319
repl.serializeVariables(
320320
messageContent.topLevelDescriptorName,
321321
messageContent.descriptorsState,
@@ -340,7 +340,7 @@ fun JupyterConnection.Socket.shellMessagesHandler(msg: Message, repl: ReplForJup
340340
}
341341
}
342342
is SerializationRequest -> {
343-
GlobalScope.launch(Dispatchers.Default) {
343+
connection.launchJob {
344344
if (content.topLevelDescriptorName.isNotEmpty()) {
345345
repl.serializeVariables(content.topLevelDescriptorName, content.descriptorsState, content.pathToDescriptor) { result ->
346346
sendWrapped(msg, makeReplyMessage(msg, MessageType.SERIALIZATION_REPLY, content = result))

Diff for: ‎src/main/kotlin/org/jetbrains/kotlinx/jupyter/repl.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,10 @@ class ReplForJupyterImpl(
413413
val newImports: List<String>
414414
val oldDeclarations: MutableMap<String, Int> = mutableMapOf()
415415
oldDeclarations.putAll(internalEvaluator.getVariablesDeclarationInfo())
416+
val jupyterId = evalData.jupyterId
416417
val result = try {
417-
log.debug("Current cell id: ${evalData.jupyterId}")
418-
executor.execute(evalData.code, evalData.displayHandler, currentCellId = evalData.jupyterId - 1) { internalId, codeToExecute ->
418+
log.debug("Current cell id: $jupyterId")
419+
executor.execute(evalData.code, evalData.displayHandler, currentCellId = jupyterId - 1) { internalId, codeToExecute ->
419420
if (evalData.storeHistory) {
420421
cell = notebook.addCell(internalId, codeToExecute, EvalData(evalData))
421422
}
@@ -444,7 +445,7 @@ class ReplForJupyterImpl(
444445
// printVars()
445446
// printUsagesInfo(jupyterId, cellVariables[jupyterId - 1])
446447
val variablesCells: Map<String, Int> = notebook.variablesState.mapValues { internalEvaluator.findVariableCell(it.key) }
447-
val serializedData = variablesSerializer.serializeVariables(jupyterId - 1, notebook.variablesState, oldDeclarations, variablesCells, notebook.unchangedVariables())
448+
val serializedData = variablesSerializer.serializeVariables(jupyterId - 1, notebook.variablesState, oldDeclarations, variablesCells, notebook.unchangedVariables)
448449

449450
GlobalScope.launch(Dispatchers.Default) {
450451
variablesSerializer.tryValidateCache(jupyterId - 1, notebook.cellVariables)

Diff for: ‎src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/repl/ReplTests.kt

+16-16
Original file line numberDiff line numberDiff line change
@@ -834,14 +834,14 @@ class ReplVarsTest : AbstractSingleReplTest() {
834834
""".trimIndent(),
835835
jupyterId = 1
836836
)
837-
var state = repl.notebook.unchangedVariables()
837+
var state = repl.notebook.unchangedVariables
838838
val res = eval(
839839
"""
840840
l += 11111
841841
""".trimIndent(),
842842
jupyterId = 2
843843
).metadata.evaluatedVariablesState
844-
state = repl.notebook.unchangedVariables()
844+
state = repl.notebook.unchangedVariables
845845
assertEquals(1, state.size)
846846
assertTrue(state.contains("m"))
847847
}
@@ -911,7 +911,7 @@ class ReplVarsTest : AbstractSingleReplTest() {
911911
""".trimIndent(),
912912
jupyterId = 1
913913
)
914-
var state = repl.notebook.unchangedVariables()
914+
var state = repl.notebook.unchangedVariables
915915
assertEquals(3, state.size)
916916

917917
eval(
@@ -922,7 +922,7 @@ class ReplVarsTest : AbstractSingleReplTest() {
922922
""".trimIndent(),
923923
jupyterId = 2
924924
)
925-
state = repl.notebook.unchangedVariables()
925+
state = repl.notebook.unchangedVariables
926926
assertEquals(0, state.size)
927927

928928
eval(
@@ -931,7 +931,7 @@ class ReplVarsTest : AbstractSingleReplTest() {
931931
""".trimIndent(),
932932
jupyterId = 3
933933
)
934-
state = repl.notebook.unchangedVariables()
934+
state = repl.notebook.unchangedVariables
935935
assertEquals(1, state.size)
936936
}
937937
}
@@ -967,7 +967,7 @@ class ReplVarsSerializationTest : AbstractSingleReplTest() {
967967
assertEquals(listOf(1, 2, 3, 4).toString().substring(1, actualContainer.value!!.length + 1), actualContainer.value)
968968

969969
val serializer = repl.variablesSerializer
970-
val newData = serializer.doIncrementalSerialization(0, "x", "data", actualContainer)
970+
serializer.doIncrementalSerialization(0, "x", "data", actualContainer)
971971
}
972972

973973
@Test
@@ -983,7 +983,7 @@ class ReplVarsSerializationTest : AbstractSingleReplTest() {
983983
assertEquals(2, varsData.size)
984984
assertTrue(varsData.containsKey("x"))
985985
assertTrue(varsData.containsKey("f"))
986-
var unchangedVariables = repl.notebook.unchangedVariables()
986+
var unchangedVariables = repl.notebook.unchangedVariables
987987
assertTrue(unchangedVariables.isNotEmpty())
988988

989989
eval(
@@ -992,7 +992,7 @@ class ReplVarsSerializationTest : AbstractSingleReplTest() {
992992
""".trimIndent(),
993993
jupyterId = 1
994994
)
995-
unchangedVariables = repl.notebook.unchangedVariables()
995+
unchangedVariables = repl.notebook.unchangedVariables
996996
assertTrue(unchangedVariables.contains("x"))
997997
assertTrue(unchangedVariables.contains("f"))
998998
}
@@ -1056,7 +1056,7 @@ class ReplVarsSerializationTest : AbstractSingleReplTest() {
10561056

10571057
val serializer = repl.variablesSerializer
10581058

1059-
val newData = serializer.doIncrementalSerialization(0, "c", "i", descriptor["i"]!!)
1059+
serializer.doIncrementalSerialization(0, "c", "i", descriptor["i"]!!)
10601060
}
10611061

10621062
@Test
@@ -1345,7 +1345,7 @@ class ReplVarsSerializationTest : AbstractSingleReplTest() {
13451345
""".trimIndent(),
13461346
jupyterId = 1
13471347
)
1348-
var state = repl.notebook.unchangedVariables()
1348+
val state = repl.notebook.unchangedVariables
13491349
val setOfCell = setOf("x", "f", "z")
13501350
assertTrue(state.isNotEmpty())
13511351
assertEquals(setOfCell, state)
@@ -1372,7 +1372,7 @@ class ReplVarsSerializationTest : AbstractSingleReplTest() {
13721372
""".trimIndent(),
13731373
jupyterId = 1
13741374
)
1375-
val state = repl.notebook.unchangedVariables()
1375+
var state = repl.notebook.unchangedVariables
13761376
val setOfCell = setOf("x", "f", "z")
13771377
assertTrue(state.isNotEmpty())
13781378
assertEquals(setOfCell, state)
@@ -1396,7 +1396,7 @@ class ReplVarsSerializationTest : AbstractSingleReplTest() {
13961396
""".trimIndent(),
13971397
jupyterId = 3
13981398
)
1399-
state = repl.notebook.unchangedVariables()
1399+
state = repl.notebook.unchangedVariables
14001400
// assertTrue(state.isNotEmpty())
14011401
// assertEquals(state, setOfPrevCell)
14021402

@@ -1408,20 +1408,20 @@ class ReplVarsSerializationTest : AbstractSingleReplTest() {
14081408
""".trimIndent(),
14091409
jupyterId = 4
14101410
)
1411-
state = repl.notebook.unchangedVariables()
1411+
state = repl.notebook.unchangedVariables
14121412
assertTrue(state.isEmpty())
14131413
}
14141414

14151415
@Test
14161416
fun testSerializationClearInfo() {
1417-
var res = eval(
1417+
eval(
14181418
"""
14191419
val x = listOf(1, 2, 3, 4)
14201420
""".trimIndent(),
14211421
jupyterId = 1
14221422
).metadata.evaluatedVariablesState
1423-
var state = repl.notebook.unchangedVariables()
1424-
res = eval(
1423+
repl.notebook.unchangedVariables
1424+
eval(
14251425
"""
14261426
val x = listOf(1, 2, 3, 4)
14271427
""".trimIndent(),

0 commit comments

Comments
 (0)