- Implement #rangeForPC:contextIsActive: in CompiledCode, calling #debuggerMap

- implement versions on Context: pcRange, pcRangeContextIsActive: 
- push up #debuggerMap to CompiledCode
- fix senders

fixes pharo-project#4704

Author: MarcusDenker

src/Debugger-Model/DebugSession.class.st

@@ -270,9 +270,7 @@ DebugSession >> pcRangeForContext: aContext [
 
 	(aContext isNil or: [ aContext isDead ])
 		ifTrue: [ ^ 1 to: 0 ].
-	^ aContext debuggerMap
-		rangeForPC: aContext pc
-		contextIsActiveContext: (self isLatestContext: aContext)
+	^ aContext pcRangeContextIsActive: (self isLatestContext: aContext)
 ]
 
 { #category : #'debugging actions' }

src/Debugging-Core/CompiledBlock.extension.st

@@ -1,10 +1,5 @@
 Extension { #name : #CompiledBlock }
 
-{ #category : #'*Debugging-Core' }
-CompiledBlock >> debuggerMap [
-	^self compilerClass debuggerMethodMapForMethod: self.
-]
-
 { #category : #'*Debugging-Core' }
 CompiledBlock >> pcInOuter [
 	| outer end instructionStream |

src/Debugging-Core/CompiledCode.extension.st

@@ -41,6 +41,11 @@ CompiledCode >> abstractBytecodeMessagesFrom: startpc to: endpc do: aBlock [
 	 msgs"
 ]
 
+{ #category : #'*Debugging-Core' }
+CompiledCode >> debuggerMap [
+	^self compilerClass debuggerMethodMapForMethod: self.
+]
+
 { #category : #'*Debugging-Core' }
 CompiledCode >> hasInstVarRef [
 	self localHasInstVarRef ifTrue: [ ^ true ].
@@ -97,6 +102,11 @@ CompiledCode >> pcPreviousTo: pc [
 	^prevPc
 ]
 
+{ #category : #'*Debugging-Core' }
+CompiledCode >> rangeForPC: aPC contextIsActive: contextIsActive [
+	^self debuggerMap rangeForPC: aPC contextIsActiveContext: contextIsActive
+]
+
 { #category : #'*Debugging-Core' }
 CompiledCode >> symbolicBytecodes [
 	"Answer Collection that contains of all the byte codes in a method as an instance of SymbolicInstruction"

src/Debugging-Core/CompiledMethod.extension.st

@@ -55,6 +55,16 @@ Context >> namedTempAt: index put: aValue [
 	^self debuggerMap namedTempAt: index put: aValue in: self
 ]
 
+{ #category : #'*Debugging-Core' }
+Context >> pcRange [
+	^self pcRangeContextIsActive: false
+]
+
+{ #category : #'*Debugging-Core' }
+Context >> pcRangeContextIsActive: aBoolean [
+	^self method rangeForPC: pc contextIsActive: aBoolean
+]
+
 { #category : #'*Debugging-Core' }
 Context >> previousPcWithCorrectMapping [
 	"Answer a pc inside the enclosing block or mathod that is correctly mapped to an AST node"

src/Debugging-Core/Context.extension.st

@@ -64,8 +64,7 @@ DebuggerMethodMapOpal >> rangeForPC: aPC contextIsActiveContext: contextIsActive
 	IR instruction, which means we can just go back one"
 
 	pc := contextIsActive ifTrue: [aPC] ifFalse: [aPC - 1].
-	^(methodNode sourceNodeForPC:  pc) debugHighlightRange
-	
+	^(methodNode sourceNodeForPC: pc) debugHighlightRange
 ]
 
 { #category : #public }

src/OpalCompiler-Core/DebuggerMethodMapOpal.class.st

@@ -71,7 +71,8 @@ RBPushUpPreview >> classes [
 { #category : #initialization }
 RBPushUpPreview >> initializeDropList [
 	classDropList := self newDropList.
-	classDropList displayBlock: [ :scope | scope name ];
+	classDropList
+		display: [ :scope | scope name ];
 		iconBlock: [ :e | e systemIcon ]
 ]
 

src/SystemCommands-RefactoringSupport/RBPushUpPreview.class.st

@@ -809,9 +809,9 @@ ProcessBrowser >> pcRange [
 	the selected context's program counter value."
 	(selectedContext isNil or: [methodText isEmptyOrNil])
 		ifTrue: [^ 1 to: 0].
-	^selectedContext debuggerMap
+	^selectedContext method
 		rangeForPC: (selectedContext pc ifNotNil: [:pc| pc] ifNil: [selectedContext method endPC])
-		contextIsActiveContext: stackListIndex = 1
+		contextIsActive: stackListIndex = 1
 ]
 
 { #category : #'process list' }