tdb: fix robust context selection with pc

hpi-swa-lab · Dec 31, 2023 · 22f0828 · 22f0828 · github-actions · Dec 31, 2023
1 parent 581dfd3
commit 22f0828
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/TraceDebugger.package/TraceDebugger.class/instance/doStep..st b/packages/TraceDebugger.package/TraceDebugger.class/instance/doStep..st
@@ -9,11 +9,17 @@ doStep: aBlock
 
 	interruptedContext := self interruptedContext.
 	interruptedTimeIndex := self cursor timeIndex.
-	self selectAndExpandContext: interruptedContext.
-	(self selectedContext tdbIdentical: interruptedContext) ifFalse:
-		[self flag: #coroutines. "Selection 'did not work'! The new context path may no longer contain the interrupted context at the expected position from the trace. Select it again without updating the context path."
-		self cursor timeIndex: interruptedTimeIndex.
-		self basicSelectContext: interruptedContext].
+	self cacheSourcesDuring:
+		[self selectContext: interruptedContext.
+
+		self flag: #brittle. "if there are multiple slices with the same name..."
+		self changed: #(openPath) , (self treeSelectedContextPath collect: [:context | context asString]).
+
+		(self selectedContext tdbIdentical: interruptedContext) ifFalse:
+			[self flag: #coroutines. "Selection 'did not work'! The new context path may no longer contain the interrupted context at the expected position from the trace. Select it again without updating the context path."
+			self selectContext: interruptedContext.
+			self cursor timeIndex: interruptedTimeIndex.
+			self basicSelectContext: interruptedContext]].
 
 	self shrinkBorderContexts.
 

diff --git a/packages/TraceDebugger.package/TraceDebugger.class/methodProperties.json b/packages/TraceDebugger.package/TraceDebugger.class/methodProperties.json
@@ -141,7 +141,7 @@
 		"doItContext" : "ct 3/15/2022 17:49",
 		"doItReceiver" : "ct 3/15/2022 17:26",
 		"doSelfUpdate" : "ct 3/12/2022 18:02",
-		"doStep:" : "ct 12/29/2023 01:15",
+		"doStep:" : "ct 12/31/2023 02:10",
 		"doStepBackward:" : "ct 1/26/2022 18:47",
 		"doStepForward:" : "ct 1/26/2022 18:47",
 		"dragContext:" : "ct 3/15/2022 20:50",