Delegates graphical probe value representation to the objects themselves, records identity hash to allow for consistent representation of identity in probes

codeZeilen · codeZeilen · commit 6b7db5431d74 · 2020-10-12T18:07:26.000+02:00
diff --git a/packages/Babylonian-Core.package/BPTrace.class/instance/newTracedAssignmentValue.previousValues.expression.stackFrom..st b/packages/Babylonian-Core.package/BPTrace.class/instance/newTracedAssignmentValue.previousValues.expression.stackFrom..st
@@ -3,5 +3,6 @@ newTracedAssignmentValue: aValue previousValues: variableAndValuesTuples express
 	
 	^ BPTraceAssignmentValue
 			value: aValue bpSnapshot
+			identityHash: aValue identityHash
 			previousValues: variableAndValuesTuples
 			stack: (self stackFrom: aContext)
diff --git a/packages/Babylonian-Core.package/BPTrace.class/instance/newTracedValue.expression.stackFrom..st b/packages/Babylonian-Core.package/BPTrace.class/instance/newTracedValue.expression.stackFrom..st
@@ -3,4 +3,5 @@ newTracedValue: aValue expression: expressionSource stackFrom: aContext
 	
 	^ BPTraceValue
 			value: aValue bpSnapshot
+			identityHash: aValue identityHash
 			stack: (self stackFrom: aContext)
diff --git a/packages/Babylonian-Core.package/BPTrace.class/methodProperties.json b/packages/Babylonian-Core.package/BPTrace.class/methodProperties.json
@@ -15,8 +15,8 @@
 		"includesValuesForProbeId:" : "pre 7/24/2019 11:30",
 		"initialize" : "pre 9/25/2020 17:05",
 		"mementoFor:" : "pre 9/28/2020 10:29",
-		"newTracedAssignmentValue:previousValues:expression:stackFrom:" : "pre 9/25/2020 17:07",
-		"newTracedValue:expression:stackFrom:" : "pre 9/25/2020 17:07",
+		"newTracedAssignmentValue:previousValues:expression:stackFrom:" : "pre 10/12/2020 17:58",
+		"newTracedValue:expression:stackFrom:" : "pre 10/12/2020 17:57",
 		"probes" : "pre 5/8/2019 16:44",
 		"recordedException" : "pre 7/25/2019 12:28",
 		"recordedException:" : "pre 7/25/2019 12:29",
diff --git a/packages/Babylonian-Core.package/BPTraceAssignmentValue.class/class/value.identityHash.previousValues.stack..st b/packages/Babylonian-Core.package/BPTraceAssignmentValue.class/class/value.identityHash.previousValues.stack..st
@@ -0,0 +1,6 @@
+instance creation
+value: anObject identityHash: identityHash previousValues: variableAndValuesTuples stack: arrayOfContexts
+	
+	^ (self value: anObject identityHash: identityHash stack: arrayOfContexts)
+		previousValues: variableAndValuesTuples;
+		yourself
diff --git a/packages/Babylonian-Core.package/BPTraceAssignmentValue.class/class/value.previousValues.stack..st b/packages/Babylonian-Core.package/BPTraceAssignmentValue.class/class/value.previousValues.stack..st
diff --git a/packages/Babylonian-Core.package/BPTraceAssignmentValue.class/methodProperties.json b/packages/Babylonian-Core.package/BPTraceAssignmentValue.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"value:previousValues:stack:" : "pre 7/6/2020 18:23" },
+		"value:identityHash:previousValues:stack:" : "pre 10/12/2020 17:58" },
 	"instance" : {
 		"assignedVariableNames" : "pre 7/6/2020 18:41",
 		"initialize" : "pre 7/6/2020 18:23",
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/class/value.identityHash.stack..st b/packages/Babylonian-Core.package/BPTraceValue.class/class/value.identityHash.stack..st
@@ -0,0 +1,8 @@
+instance creation
+value: aValue identityHash: tracedValueIdentityHash stack: aCollection
+	
+	^ self new
+		tracedValue: aValue;
+		tracedValueIdentityHash: tracedValueIdentityHash;
+		stack: aCollection;
+		yourself 
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/class/value.stack..st b/packages/Babylonian-Core.package/BPTraceValue.class/class/value.stack..st
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/tracedValueIdentityHash..st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/tracedValueIdentityHash..st
@@ -0,0 +1,4 @@
+accessing
+tracedValueIdentityHash: anObject
+	
+	tracedValueIdentityHash := anObject.
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/tracedValueIdentityHash.st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/tracedValueIdentityHash.st
@@ -0,0 +1,4 @@
+accessing
+tracedValueIdentityHash
+	
+	^ tracedValueIdentityHash
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/methodProperties.json b/packages/Babylonian-Core.package/BPTraceValue.class/methodProperties.json
@@ -1,10 +1,12 @@
 {
 	"class" : {
-		"value:stack:" : "pre 5/14/2019 16:57" },
+		"value:identityHash:stack:" : "pre 10/12/2020 17:57" },
 	"instance" : {
 		"printOn:" : "pre 5/13/2019 12:05",
 		"stack" : "pre 5/8/2019 18:36",
 		"stack:" : "pre 5/8/2019 18:36",
 		"traceHasFailedBefore" : "pre 7/10/2020 15:52",
 		"tracedValue" : "pre 5/8/2019 16:42",
-		"tracedValue:" : "pre 5/8/2019 16:42" } }
+		"tracedValue:" : "pre 5/8/2019 16:42",
+		"tracedValueIdentityHash" : "pre 10/12/2020 17:57",
+		"tracedValueIdentityHash:" : "pre 10/12/2020 17:57" } }
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/properties.json b/packages/Babylonian-Core.package/BPTraceValue.class/properties.json
@@ -7,6 +7,7 @@
 	"commentStamp" : "",
 	"instvars" : [
 		"tracedValue",
+		"tracedValueIdentityHash",
 		"stack" ],
 	"name" : "BPTraceValue",
 	"pools" : [
diff --git a/packages/Babylonian-UI.package/BPAnnotationMorph.class/class/newContainerMorph.st b/packages/Babylonian-UI.package/BPAnnotationMorph.class/class/newContainerMorph.st
@@ -0,0 +1,11 @@
+utility
+newContainerMorph
+
+	^ Morph new
+		color: Color transparent;
+		vResizing: #shrinkWrap;
+		hResizing: #shrinkWrap;
+		changeTableLayout;
+		listDirection: #leftToRight;
+		borderWidth: 0;
+		yourself
diff --git a/packages/Babylonian-UI.package/BPAnnotationMorph.class/instance/newContainerMorph.st b/packages/Babylonian-UI.package/BPAnnotationMorph.class/instance/newContainerMorph.st
@@ -1,11 +1,4 @@
 private - ui
 newContainerMorph
 	
-	^ Morph new
-		color: Color transparent;
-		vResizing: #shrinkWrap;
-		hResizing: #shrinkWrap;
-		changeTableLayout;
-		listDirection: #leftToRight;
-		borderWidth: 0;
-		yourself
+	^ self class newContainerMorph
diff --git a/packages/Babylonian-UI.package/BPAnnotationMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPAnnotationMorph.class/methodProperties.json
@@ -2,6 +2,7 @@
 	"class" : {
 		"fontHeight" : "pre 11/18/2019 10:40",
 		"fontWidth" : "pre 11/18/2019 10:44",
+		"newContainerMorph" : "pre 10/12/2020 17:47",
 		"smallFontHeight" : "pre 10/6/2020 11:54" },
 	"instance" : {
 		"annotation" : "pre 7/2/2019 16:39",
@@ -31,7 +32,7 @@
 		"isSlider" : "pre 1/24/2020 16:15",
 		"methodReference" : "pre 11/18/2019 12:28",
 		"methodReference:" : "pre 11/18/2019 12:28",
-		"newContainerMorph" : "pre 10/12/2020 17:19",
+		"newContainerMorph" : "pre 10/12/2020 17:47",
 		"newRemoveButton" : "pre 8/21/2020 10:32",
 		"removeButtonClicked" : "pre 11/18/2019 12:29",
 		"scrollBarSize" : "pre 7/23/2019 11:18",
diff --git a/packages/Babylonian-UI.package/BPProbeMorph.class/instance/updateFrom..st b/packages/Babylonian-UI.package/BPProbeMorph.class/instance/updateFrom..st
@@ -21,7 +21,6 @@ updateFrom: traces
 			scrollPane scroller removeAllMorphs.				
 		
 			valuesMorph := (self valuesMorphFor: t)
-				lock;
 				hResizing: #shrinkWrap;
 				yourself.
 		
diff --git a/packages/Babylonian-UI.package/BPProbeMorph.class/instance/valueMorphFor..st b/packages/Babylonian-UI.package/BPProbeMorph.class/instance/valueMorphFor..st
@@ -1,15 +1,7 @@
 private
 valueMorphFor: traceValue
 	
-	| value valueContainer morph |
-	value := traceValue tracedValue.
-	valueContainer := self newContainerMorph.
-	morph := (value isCollection or: [value isNumber])
-		ifTrue: [valueContainer addMorphBack: value printString asText asMorph]
-		ifFalse: [
-			valueContainer 
-				addMorphBack: (self iconForValue: value);
-				addMorphBack:	 (' ' , value printString) asText asMorph].
-			
-	morph on: #click send: #value to: [value explore].
+	| morph |
+	morph := traceValue tracedValue bpProbeValueMorphIn: traceValue.
+	morph on: #click send: #value to: [traceValue tracedValue explore].
 	^ morph 
diff --git a/packages/Babylonian-UI.package/BPProbeMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPProbeMorph.class/methodProperties.json
@@ -18,6 +18,6 @@
 		"relevantTracesOf:do:" : "pre 11/18/2019 12:47",
 		"setExpressionButtonClicked" : "pre 9/22/2020 10:05",
 		"updateExpressionMorphIfNecessary" : "pre 9/22/2020 10:04",
-		"updateFrom:" : "pre 10/12/2020 17:28",
-		"valueMorphFor:" : "pre 10/12/2020 17:39",
-		"valuesMorphFor:" : "pre 10/12/2020 17:37" } }
+		"updateFrom:" : "pre 10/12/2020 18:02",
+		"valueMorphFor:" : "pre 10/12/2020 18:00",
+		"valuesMorphFor:" : "pre 10/12/2020 17:51" } }
diff --git a/packages/Babylonian-UI.package/Collection.extension/instance/bpProbeValueMorphIn..st b/packages/Babylonian-UI.package/Collection.extension/instance/bpProbeValueMorphIn..st
@@ -0,0 +1,4 @@
+*Babylonian-UI
+bpProbeValueMorphIn: traceValue
+	
+	^ (' ' , self printString) asMorph
diff --git a/packages/Babylonian-UI.package/Collection.extension/methodProperties.json b/packages/Babylonian-UI.package/Collection.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"bpProbeValueMorphIn:" : "pre 10/12/2020 18:05" } }
diff --git a/packages/Babylonian-UI.package/Collection.extension/properties.json b/packages/Babylonian-UI.package/Collection.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "Collection" }
diff --git a/packages/Babylonian-UI.package/Color.extension/instance/bpProbeValueMorphIn..st b/packages/Babylonian-UI.package/Color.extension/instance/bpProbeValueMorphIn..st
@@ -0,0 +1,8 @@
+*Babylonian-UI
+bpProbeValueMorphIn: traceValue
+	
+	^ RectangleMorph new 
+		height: BPAnnotationMorph fontHeight;
+		width: BPAnnotationMorph fontHeight;
+		color: self;
+		yourself
diff --git a/packages/Babylonian-UI.package/Color.extension/methodProperties.json b/packages/Babylonian-UI.package/Color.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"bpProbeValueMorphIn:" : "pre 10/12/2020 17:59" } }
diff --git a/packages/Babylonian-UI.package/Color.extension/properties.json b/packages/Babylonian-UI.package/Color.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "Color" }
diff --git a/packages/Babylonian-UI.package/Morph.extension/instance/bpProbeValueMorphIn..st b/packages/Babylonian-UI.package/Morph.extension/instance/bpProbeValueMorphIn..st
@@ -0,0 +1,10 @@
+*Babylonian-UI
+bpProbeValueMorphIn: traceValue
+	
+	| container |
+	container := BPAnnotationMorph newContainerMorph.
+		
+	^ container 
+		addMorphBack: ((BPEmojis emojiFor: traceValue tracedValueIdentityHash) scaledToSize: BPAnnotationMorph fontHeight) asMorph;
+		addMorphBack: (self imageForm scaledToSize: BPAnnotationMorph fontHeight * 3) asMorph;
+		yourself
diff --git a/packages/Babylonian-UI.package/Morph.extension/methodProperties.json b/packages/Babylonian-UI.package/Morph.extension/methodProperties.json
@@ -2,4 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
+		"bpProbeValueMorphIn:" : "pre 10/12/2020 18:00",
 		"isBPAnnotationMorph" : "pre 7/3/2019 11:10" } }
diff --git a/packages/Babylonian-UI.package/Number.extension/instance/bpProbeValueMorphIn..st b/packages/Babylonian-UI.package/Number.extension/instance/bpProbeValueMorphIn..st
@@ -0,0 +1,4 @@
+*Babylonian-UI
+bpProbeValueMorphIn: traceValue
+	
+	^ (' ' , self printString) asMorph
diff --git a/packages/Babylonian-UI.package/Number.extension/methodProperties.json b/packages/Babylonian-UI.package/Number.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"bpProbeValueMorphIn:" : "pre 10/12/2020 18:05" } }
diff --git a/packages/Babylonian-UI.package/Number.extension/properties.json b/packages/Babylonian-UI.package/Number.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "Number" }
diff --git a/packages/Babylonian-UI.package/Object.extension/instance/bpProbeValueMorphIn..st b/packages/Babylonian-UI.package/Object.extension/instance/bpProbeValueMorphIn..st
@@ -0,0 +1,10 @@
+*Babylonian-UI
+bpProbeValueMorphIn: traceValue
+	
+	| container |
+	container := BPAnnotationMorph newContainerMorph.
+		
+	^ container 
+		addMorphBack: ((BPEmojis emojiFor: traceValue tracedValue identityHash) scaledToSize: BPAnnotationMorph fontHeight) asMorph;
+		addMorphBack: (' ' , self printString) asMorph;
+		yourself
diff --git a/packages/Babylonian-UI.package/Object.extension/methodProperties.json b/packages/Babylonian-UI.package/Object.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"bpProbeValueMorphIn:" : "pre 10/12/2020 18:05" } }
diff --git a/packages/Babylonian-UI.package/Object.extension/properties.json b/packages/Babylonian-UI.package/Object.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "Object" }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"class" : {`
`3`		`- "value:previousValues:stack:" : "pre 7/6/2020 18:23" },`
	`3`	`+ "value:identityHash:previousValues:stack:" : "pre 10/12/2020 17:58" },`
`4`	`4`	`"instance" : {`
`5`	`5`	`"assignedVariableNames" : "pre 7/6/2020 18:41",`
`6`	`6`	`"initialize" : "pre 7/6/2020 18:23",`