Resolve merge conflict in step method

hpi-swa-lab · Oct 7, 2023 · 086a4d0 · 086a4d0
1 parent 9536103
commit 086a4d0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/...Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/wantsMethodReference.st b/...Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/wantsMethodReference.st
@@ -0,0 +1,4 @@
+accessing
+wantsMethodReference
+
+	^ false
diff --git a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/methodProperties.json
@@ -5,4 +5,5 @@
 		"linkedProbes" : "joabe 10/6/2023 11:13",
 		"removeButtonClicked" : "joabe 10/4/2023 16:22",
 		"updateExpressionMorphIfNecessary" : "joabe 10/6/2023 10:34",
-		"valuesMorphClass" : "joabe 10/6/2023 11:21" } }
+		"valuesMorphClass" : "joabe 10/6/2023 11:21",
+		"wantsMethodReference" : "joabe 10/7/2023 20:28" } }
diff --git a/packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/updateTraces.st b/packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/updateTraces.st
@@ -2,7 +2,7 @@ stepping and presenter
 updateTraces
 
 	| newTraces tracesChanged |
-	self methodReference ifNil: [^ false].
+	(self methodReference isNil and: [self wantsMethodReference]) ifTrue: [^false].
 	self resetHeight.
 
 	newTraces := self getTraces asIdentitySet.

diff --git a/packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/wantsMethodReference.st b/packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/wantsMethodReference.st
@@ -0,0 +1,4 @@
+accessing
+wantsMethodReference
+
+	^ true
diff --git a/packages/Babylonian-UI.package/BPTraceBasedMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPTraceBasedMorph.class/methodProperties.json
@@ -15,5 +15,6 @@
 		"update:" : "pre 8/23/2023 10:56",
 		"update:with:" : "pre 8/23/2023 10:49",
 		"updateFrom:" : "jb 12/7/2020 19:00",
-		"updateTraces" : "pre 8/23/2023 10:53",
-		"valuesMorphClass" : "joabe 10/6/2023 11:20" } }
+		"updateTraces" : "joabe 10/7/2023 20:30",
+		"valuesMorphClass" : "joabe 10/6/2023 11:20",
+		"wantsMethodReference" : "joabe 10/7/2023 20:28" } }