Resolves wrapper code in watches when variants or watches are nested

hpi-swa · Jan 5, 2024 · 0fe9f32 · 0fe9f32
1 parent 3ae5ff5
commit 0fe9f32
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/packages/Sandblocks-Babylonian/SBExampleWatch.class.st b/packages/Sandblocks-Babylonian/SBExampleWatch.class.st
@@ -127,6 +127,29 @@ SBExampleWatch >> asInactiveCopy [
  ^ SBInactiveExampleWatch newFromWatch: self
 ]
 
+{ #category : #accessing }
+SBExampleWatch >> cleanedExpression [
+
+ "ignores code wrappings for watches and variants"
+ | copy nextToRemove newOwner |
+ copy := self expression veryDeepCopy.
+ newOwner := SBStBlockBody new.
+ newOwner appendStatements: {copy}.
+ [copy allBlocksDo: [:subBlock | 
+ (subBlock isVariant or: [subBlock isWatch]) ifTrue: [nextToRemove := subBlock]]. nextToRemove]
+ whileNotNil: [
+ nextToRemove isWatch ifTrue: [nextToRemove replaceBy: nextToRemove cleanedExpression].
+ nextToRemove isVariant ifTrue:[
+ "when users play around with putting multiple statements in a nested variant inside a watch,
+ even though watches are only possible on single expressions, 
+ we are ok with them losing information here"
+ nextToRemove replaceBy: (nextToRemove statementsFor: nextToRemove active) first].
+ nextToRemove = copy ifTrue: [^newOwner].
+ nextToRemove := nil].
+
+ ^ newOwner statements first
+]
+
 { #category : #'colors and color policies' }
 SBExampleWatch >> color [
 

diff --git a/packages/Sandblocks-Babylonian/SBInactiveExampleWatch.class.st b/packages/Sandblocks-Babylonian/SBInactiveExampleWatch.class.st
@@ -12,7 +12,7 @@ SBInactiveExampleWatch class >> newFromWatch: anActiveWatch [
 
  ^ (anActiveWatch veryDeepCopy)
  primitiveChangeClassTo: self basicNew;
- expression: (SBTextBubble new contents: anActiveWatch expression sourceString);
+ expression: (SBTextBubble new contents: anActiveWatch cleanedExpression sourceString);
  saveObjectsActivePermutations;
  yourself 
 ]