Fix update of variables using debug info

Author: guillep

src/NewTools-Debugger/StDebugger.class.st

@@ -87,7 +87,7 @@ Class {
 		'programmaticallyClosed',
 		'stackAndCodeContainer',
 		'toolbarPresenter',
-		'previousASTScope'
+		'namesVisibleInPreviousScope'
 	],
 	#classVars : [
 		'EnableStackColoring'
@@ -847,6 +847,7 @@ StDebugger >> initializeInspector [
 	inspector := self
 		instantiate: self debuggerInspectorClass
 		on: (self debuggerInspectorModelClass on: self newDebuggerContext).
+	namesVisibleInPreviousScope := self newDebuggerContext context temporaryVariableNames.
 	inspector label: 'Receiver'
 ]
 
@@ -1602,25 +1603,26 @@ StDebugger >> updateStackFromSession: aSession [
 { #category : 'updating' }
 StDebugger >> updateStep [
 
-	| previousContext currentASTScope currentContext |
+	| previousContext currentlyVisibleNames currentContext |
 	previousContext := self currentContext.
 	self updateStackFromSession: self session.
 	self updateWindowTitle.
 	self updateExtensionsFromSession: self session.
 	self updateToolbar.
-
+1haltOnce.
 	currentContext := self currentContext.
-	currentASTScope := currentContext temporaryVariables.
+	currentlyVisibleNames := currentContext temporaryVariableNames.
 	self flag: #DBG_INSPECTOR_UPDATE_BUG.
+
 	inspector getRawInspectorPresenterOrNil ifNotNil: [ :p |
 			previousContext == currentContext ifTrue: [ "otherwise, if contexts have changed, updating the stack has already updated all nodes.""Here it is necessary to update temporary nodes if we are still in the same context but in a different scope. This is possible when leaving or entering an optimized block scope."
 					p
 						updateNodesFromScope:
-						(previousASTScope ifNil: [ currentASTScope ])
-						to: currentASTScope ].
+						(namesVisibleInPreviousScope ifNil: [ currentlyVisibleNames ])
+						to: currentlyVisibleNames ].
 			p update ].
 
-	previousASTScope := currentASTScope
+	namesVisibleInPreviousScope := currentlyVisibleNames
 ]
 
 { #category : 'toolbar' }

src/NewTools-Debugger/StDebuggerContext.class.st

@@ -161,8 +161,8 @@ StDebuggerContext >> stackTopNode [
 { #category : 'nodes' }
 StDebuggerContext >> temporaryVariablesNodes [
 
-	^ self context temporaryVariables collect: [ :temp | 
-		  (StInspectorNewTempNode hostObject: self context) tempDescriptor: temp ]
+	^ self context temporaryVariableNames collect: [ :arg1 |
+		  (StInspectorNewTempNode hostObject: self context) tempName: arg1 ]
 ]
 
 { #category : 'nodes' }

src/NewTools-Debugger/StRawInspectionPresenter.extension.st

@@ -50,15 +50,14 @@ StRawInspectionPresenter >> updateNodesFromScope: oldTemps to: newTemps [
 	tempsToRemove := oldTemps difference: newTemps.
 	tempsToAdd := newTemps difference: oldTemps.
 	nodes := self attributeTable roots.
-
 	nodes removeAllSuchThat: [ :node |
-		node class = StInspectorTempNode and: [
-			tempsToRemove includes: node tempVariable ] ].
+		node class = StInspectorNewTempNode and: [
+			tempsToRemove includes: node tempName ] ].
 	tempsToAdd do: [ :temp |
 		nodes add:
-			((StInspectorTempNode hostObject:
+			((StInspectorNewTempNode hostObject:
 					  self model inspectedObject context)
-				 tempVariable: temp;
+				 tempName: temp;
 				 yourself) ].
 
 	self attributeTable roots: nodes

src/NewTools-Inspector/StInspectorNewTempNode.class.st

@@ -7,7 +7,7 @@ Class {
 	#superclass : 'StInspectorNode',
 	#instVars : [
 		'debugInfo',
-		'tempDescriptor'
+		'tempName'
 	],
 	#category : 'NewTools-Inspector-Model',
 	#package : 'NewTools-Inspector',
@@ -17,12 +17,10 @@ Class {
 { #category : 'comparing' }
 StInspectorNewTempNode >> = anObject [
 
-	"Answer whether the receiver and anObject represent the same object."
-
 	self == anObject ifTrue: [ ^ true ].
+	nil.
 	self class = anObject class ifFalse: [ ^ false ].
-	^ tempDescriptor = anObject name and: [ 
-		  hostObject = anObject hostObject ]
+	^ tempName = anObject tempName and: [ hostObject = anObject hostObject ]
 ]
 
 { #category : 'accessing' }
@@ -42,12 +40,19 @@ StInspectorNewTempNode >> debugInfo: anObject [
 	debugInfo := anObject
 ]
 
+{ #category : 'accessing' }
+StInspectorNewTempNode >> debugScope [
+
+	^ debugInfo debugScopeAt:
+		  (self hostObject executedPC max: self hostObject method initialPC)
+]
+
 { #category : 'comparing' }
 StInspectorNewTempNode >> hash [
 
 	"Answer an integer value that is related to the identity of the receiver."
 
-	^ tempDescriptor hash bitXor: (hostObject hash)
+	^ tempName hash bitXor: (hostObject hash)
 ]
 
 { #category : 'accessing' }
@@ -60,7 +65,7 @@ StInspectorNewTempNode >> hostObject: aContext [
 { #category : 'accessing' }
 StInspectorNewTempNode >> isArgumentVariable [
 
-	^ tempDescriptor second
+	^ self debugScope isArgumentNamed: tempName
 ]
 
 { #category : 'accessing' }
@@ -71,28 +76,28 @@ StInspectorNewTempNode >> isTempVariable [
 
 { #category : 'accessing' }
 StInspectorNewTempNode >> key [
-	^ tempDescriptor first
+
+	^ tempName
 ]
 
 { #category : 'accessing' }
 StInspectorNewTempNode >> rawValue [
-	"Answer the object value of this object variable (slot, indexed attribute, computed value)."
 
-	| scope |
-	scope := (debugInfo debugScopeAt: (self hostObject executedPC max: self hostObject method initialPC)).
-	^ scope readVariableNamed: tempDescriptor first at: self hostObject
+	^ self debugScope
+		  readVariableNamed: tempName
+		  fromContext: self hostObject
 ]
 
 { #category : 'accessing' }
-StInspectorNewTempNode >> tempDescriptor [
+StInspectorNewTempNode >> tempName [
 
-	^ tempDescriptor
+	^ tempName
 ]
 
 { #category : 'accessing' }
-StInspectorNewTempNode >> tempDescriptor: anObject [
+StInspectorNewTempNode >> tempName: anObject [
 
-	tempDescriptor := anObject
+	tempName := anObject
 ]
 
 { #category : 'accessing' }