From 086a4d048f7cac3e538953c6a91bcd1a88e5bcef Mon Sep 17 00:00:00 2001 From: Joana Be Date: Sat, 7 Oct 2023 20:31:11 +0200 Subject: [PATCH] Resolve merge conflict in step method --- .../instance/wantsMethodReference.st | 4 ++++ .../BPInstanceVariableProbeMorph.class/methodProperties.json | 3 ++- .../BPTraceBasedMorph.class/instance/updateTraces.st | 2 +- .../BPTraceBasedMorph.class/instance/wantsMethodReference.st | 4 ++++ .../BPTraceBasedMorph.class/methodProperties.json | 5 +++-- 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/wantsMethodReference.st create mode 100644 packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/wantsMethodReference.st diff --git a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/wantsMethodReference.st b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/wantsMethodReference.st new file mode 100644 index 00000000..ce142ede --- /dev/null +++ b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/instance/wantsMethodReference.st @@ -0,0 +1,4 @@ +accessing +wantsMethodReference + + ^ false \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPInstanceVariableProbeMorph.class/methodProperties.json index 51640f17..47b7eae5 100644 --- 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 index fe2f10e2..abb8355e 100644 --- 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 new file mode 100644 index 00000000..15b8d846 --- /dev/null +++ b/packages/Babylonian-UI.package/BPTraceBasedMorph.class/instance/wantsMethodReference.st @@ -0,0 +1,4 @@ +accessing +wantsMethodReference + + ^ true \ No newline at end of file diff --git a/packages/Babylonian-UI.package/BPTraceBasedMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPTraceBasedMorph.class/methodProperties.json index bdab324e..25c8df6d 100644 --- 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" } }