Display watches which are not reached and watches not open in world i…

…n exploriants
hpi-swa · Jan 18, 2024 · dfc3477 · dfc3477
1 parent 8d83232
commit dfc3477
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/packages/Sandblocks-Babylonian/SBInactiveExampleWatch.class.st b/packages/Sandblocks-Babylonian/SBInactiveExampleWatch.class.st
@@ -23,6 +23,12 @@ SBInactiveExampleWatch class >> registerWatch: aWatch [
 	"we do not want the inactive watches in the registry"
 ]
 
+{ #category : #'event handling' }
+SBInactiveExampleWatch class >> unregisterWatch: aWatch [
+
+	"we do not want the inactive watches in the registry"
+]
+
 { #category : #callbacks }
 SBInactiveExampleWatch >> artefactSaved: aBlock [
 

diff --git a/packages/Sandblocks-Babylonian/SBMultiverse.class.st b/packages/Sandblocks-Babylonian/SBMultiverse.class.st
@@ -89,13 +89,6 @@ SBMultiverse >> allMethodBlocksContainingWatches [
 
 ]
 
-{ #category : #collecting }
-SBMultiverse >> copyWatches [
-
-	^ (self allMethodBlocksContainingWatches collect: [:aMethodBlock | 
-		aMethodBlock containedExampleWatches collect: #asInactiveCopy]) flatten
-]
-
 { #category : #converting }
 SBMultiverse >> createUniverseFomPermutation: aSBPermutation [ 
 
@@ -136,17 +129,23 @@ SBMultiverse >> gatherElements [
 { #category : #'initialize-release' }
 SBMultiverse >> initialize [ 
 
-	| permutations |
+	| permutations watches outOfWorldWatches |
 	super initialize.
 
 	self gatherElements.
 
 	permutations := SBPermutation allPermutationsOf: variants.
 	universes := OrderedCollection new.
+
+	watches := (self allMethodBlocksContainingWatches collect: #containedExampleWatches) flatten.
+	"Only open watches display values when examples are run. We want to show them too"
+	(outOfWorldWatches := watches reject: #isInEditor) do: [:aWatch | self sandblockEditor openMorph: aWatch].
+
 	[permutations do: [:aPermutation |
 			SBActiveVariantPermutation value: aPermutation.
 			activeExamples do: #runSynchronouslyIgnoreReturn.
-			universes add: (self createUniverseFomPermutation: aPermutation)].
+			universes add: (SBUniverse newActive: aPermutation watches: (watches collect: #asInactiveCopy))].
+		outOfWorldWatches copy do: #delete.
 		self resetWatchesToOriginalPermutationRunning: activeExamples.
 		self triggerEvent: #updated] forkAt: Processor userSchedulingPriority.
 

diff --git a/packages/Sandblocks-Babylonian/SBResultsView.class.st b/packages/Sandblocks-Babylonian/SBResultsView.class.st
@@ -21,13 +21,6 @@ SBResultsView >> initialize [
 	morphResizer := SBMorphResizer newThumbmail.
 ]
 
-{ #category : #building }
-SBResultsView >> resetWatchesToOriginalPermutationRunning: activeExamples [
-
-	SBActiveVariantPermutation value: nil.
-	activeExamples do: #runSynchronouslyIgnoreReturn
-]
-
 { #category : #actions }
 SBResultsView >> visualize [ 
 

diff --git a/packages/Sandblocks-Watch/SBWatchView.class.st b/packages/Sandblocks-Watch/SBWatchView.class.st
@@ -142,7 +142,11 @@ SBWatchView >> displayWatchValues [
 { #category : #accessing }
 SBWatchView >> displayedMorphs [
 
-	^ self scroller submorphs first "container for scrolling" submorphs 
+	^ self scroller submorphs 
+			ifEmpty: [{}]
+			ifNotEmpty: [:valueContainer | valueContainer first "container for scrolling" submorphs ]
+
+
 ]
 
 { #category : #'event handling' }