Merge pull request #153 from MarcusDenker/Merge-StInspectorTempNode-S…

…tDebuggerInspectorTempNode Merge-StInspectorTempNode-StDebuggerInspectorTempNode
pharo-spec · Jan 6, 2021 · 49afd3f · 49afd3f
2 parents 481f690 + 614b800
commit 49afd3f
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 59 deletions.
diff --git a/src/NewTools-Debugger/ArgumentVariable.extension.st b/src/NewTools-Debugger/ArgumentVariable.extension.st
@@ -0,0 +1,11 @@
+Extension { #name : #ArgumentVariable }
+
+{ #category : #'*NewTools-Debugger' }
+ArgumentVariable >> debuggerColor [
+	^(SHRBTextStyler new attributesFor: #true) first color
+]
+
+{ #category : #'*NewTools-Debugger' }
+ArgumentVariable >> variableTag [
+	^ 'arg'
+]
diff --git a/src/NewTools-Debugger/StDebuggerContext.class.st b/src/NewTools-Debugger/StDebuggerContext.class.st
@@ -74,7 +74,7 @@ StDebuggerContext >> stackTopNode [
 StDebuggerContext >> temporaryVariablesNodes [
 
 	^ self context astScope allTemps collect: [ :temp | 
-		  (StDebuggerInspectorTempNode hostObject: self context) tempVariable: temp ]
+		  (StInspectorTempNode hostObject: self context) tempVariable: temp ]
 ]
 
 { #category : #nodes }

diff --git a/src/NewTools-Debugger/StDebuggerInspectorTempNode.class.st b/src/NewTools-Debugger/StDebuggerInspectorTempNode.class.st
diff --git a/src/NewTools-Debugger/TemporaryVariable.extension.st b/src/NewTools-Debugger/TemporaryVariable.extension.st
@@ -0,0 +1,11 @@
+Extension { #name : #TemporaryVariable }
+
+{ #category : #'*NewTools-Debugger' }
+TemporaryVariable >> debuggerColor [
+	^(SHRBTextStyler new attributesFor: #string) first color
+]
+
+{ #category : #'*NewTools-Debugger' }
+TemporaryVariable >> variableTag [
+	^ 'temp'
+]
diff --git a/src/NewTools-Inspector/StInspectorTempNode.class.st b/src/NewTools-Inspector/StInspectorTempNode.class.st
@@ -11,6 +11,35 @@ Class {
 	#category : #'NewTools-Inspector-Model'
 }
 
+{ #category : #comparing }
+StInspectorTempNode >> = anObject [
+
+	"Answer whether the receiver and anObject represent the same object."
+
+	self == anObject ifTrue: [ ^ true ].
+	self class = anObject class ifFalse: [ ^ false ].
+	^ tempVariable = anObject tempVariable and: [ 
+		  hostObject = anObject hostObject ]
+]
+
+{ #category : #accessing }
+StInspectorTempNode >> children [
+	^ #()
+]
+
+{ #category : #accessing }
+StInspectorTempNode >> debuggerColor [
+	^ tempVariable debuggerColors
+]
+
+{ #category : #comparing }
+StInspectorTempNode >> hash [
+
+	"Answer an integer value that is related to the identity of the receiver."
+
+	^ tempVariable hash bitXor: (hostObject hash)
+]
+
 { #category : #accessing }
 StInspectorTempNode >> key [
 	^ tempVariable name
@@ -34,3 +63,9 @@ StInspectorTempNode >> tempVariable [
 StInspectorTempNode >> tempVariable: anObject [
 	tempVariable := anObject
 ]
+
+{ #category : #accessing }
+StInspectorTempNode >> variableTag [
+
+	^ tempVariable variableTag
+]
diff --git a/src/NewTools-Inspector/StNodeCollector.class.st b/src/NewTools-Inspector/StNodeCollector.class.st
@@ -91,7 +91,7 @@ StNodeCollector >> slotNodes [
 
 { #category : #building }
 StNodeCollector >> tempNodesForContext: aContext [
-^ aContext astScope allTemps collect: [ :temp |
-(StInspectorTempNode hostObject: aContext) tempVariable: temp]
 
+	^ aContext astScope allTemps collect: [ :temp | 
+		  (StInspectorTempNode hostObject: aContext) tempVariable: temp ]
 ]