Merge 3f92932

feenkcom · May 14, 2024 · 7d16efa · 7d16efa
2 parents 0652399 + 3f92932
commit 7d16efa
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/src/GToolkit-Debugger/BlBlocUIManager.extension.st b/src/GToolkit-Debugger/BlBlocUIManager.extension.st
@@ -1,7 +1,7 @@
 Extension { #name : #BlBlocUIManager }
 
 { #category : #'*GToolkit-Debugger' }
-BlBlocUIManager >> gtDebugProcess: process context: context withEmbeddedDebuggerIn: aCoderRequesterObject withSourceString: aSourceString withSourceInterval: aSourceInterval forException: exception [
+BlBlocUIManager >> gtDebugProcess: process context: context withEmbeddedDebuggerIn: aCoderRequesterObject withSourceString: aSourceString withSourceInterval: aSourceInterval forException: exception evaluationInfo: anEvaluationInfo [
 	"Open a dedicated debugger as a result of an error that happened when executing code 
 	in an editor. The debugger can decide if and how to embed itself within the editor."
 
@@ -16,5 +16,6 @@ BlBlocUIManager >> gtDebugProcess: process context: context withEmbeddedDebugger
 				dueTo: exception
 				embeddedIn: aCoderRequesterObject
 				withSourceString: aSourceString
-				withSourceInterval: aSourceInterval ]
+				withSourceInterval: aSourceInterval
+				evaluationInfo: anEvaluationInfo ]
 ]
diff --git a/src/GToolkit-Debugger/GtCoderEmbeddedDebuggerElement.class.st b/src/GToolkit-Debugger/GtCoderEmbeddedDebuggerElement.class.st
@@ -30,15 +30,16 @@ GtCoderEmbeddedDebuggerElement class >> isEmbeddedDebuggerEnabled [
 ]
 
 { #category : #opening }
-GtCoderEmbeddedDebuggerElement class >> openOn: debugSession dueTo: anException embeddedIn: aCoderRequesterObject withSourceString: aSourceString withSourceInterval: aSourceInterval [
+GtCoderEmbeddedDebuggerElement class >> openOn: debugSession dueTo: anException embeddedIn: aCoderRequesterObject withSourceString: aSourceString withSourceInterval: aSourceInterval evaluationInfo: anEvaluationInfo [
 	| isHandled |
 	isHandled := false.
-	self isEmbeddedDebuggerEnabled ifTrue: [ 
-		isHandled := aCoderRequesterObject
-			notifyShowDebuggerRequest: debugSession
-			dueTo: anException
-			sourceString: aSourceString
-			sourceInterval: aSourceInterval ].
+	self isEmbeddedDebuggerEnabled
+		ifTrue: [ isHandled := aCoderRequesterObject
+					notifyShowDebuggerRequest: debugSession
+					dueTo: anException
+					sourceString: aSourceString
+					sourceInterval: aSourceInterval
+					evaluationInfo: anEvaluationInfo ].
 
 	isHandled
 		ifFalse: [ ^ Smalltalk tools debugger openOn: debugSession withFullView: true ]

diff --git a/src/GToolkit-Debugger/GtEmbeddedDebuggerStyler.class.st b/src/GToolkit-Debugger/GtEmbeddedDebuggerStyler.class.st
@@ -6,7 +6,7 @@ Class {
 
 { #category : #'api - styling' }
 GtEmbeddedDebuggerStyler >> extraStyle: aText ast: theAst [
-	| aStatus anEvaluatedSource anEvaluatedInterval theSourceStartInText theSourceEndInText anAttribute |
+	| aStatus anEvaluatedSource anEvaluatedInterval theSourceStartInText theSourceEndInText anAttribute anAttributeIndex |
 	super extraStyle: aText ast: theAst.
 
 	self coderViewModel ifNil: [ ^ self ].
@@ -31,8 +31,13 @@ GtEmbeddedDebuggerStyler >> extraStyle: aText ast: theAst [
 	anAttribute := GtEmbeddedDebuggerAttribute new
 			signaledException: aStatus exception;
 			debugSession: aStatus sharedDebugSession.
+
+	anAttributeIndex := aStatus evaluatedCodeInterval 
+		ifNil: [ theSourceEndInText ] 
+		ifNotNil: [ :aContextInterval | (aContextInterval last + theSourceStartInText) min: aText size ].
+
 	aText
 		attribute: anAttribute
-		from: theSourceEndInText
-		to: theSourceEndInText
+		from: anAttributeIndex
+		to: anAttributeIndex
 ]
diff --git a/src/GToolkit-Debugger/MorphicUIManager.extension.st b/src/GToolkit-Debugger/MorphicUIManager.extension.st
@@ -38,27 +38,26 @@ MorphicUIManager >> gtDebugProcess: process context: context label: title fullVi
 ]
 
 { #category : #'*GToolkit-Debugger' }
-MorphicUIManager >> gtDebugProcess: process context: context withEmbeddedDebuggerIn: aCoderRequesterObject withSourceString: aSourceString withSourceInterval: aSourceInterval forException: exception [
+MorphicUIManager >> gtDebugProcess: process context: context withEmbeddedDebuggerIn: aCoderRequesterObject withSourceString: aSourceString withSourceInterval: aSourceInterval forException: exception evaluationInfo: anEvaluationInfo [
 	"This is a copy of the standard method for opening the debugger with the difference that
 	the embedeable debugger is opened instead of the standard one."
 
 	| debugSession |
 	debugSession := process
-		newDebugSessionNamed: exception description
-		startedAt: context.
+			newDebugSessionNamed: exception description
+			startedAt: context.
 	debugSession exception: exception.
 	debugSession logStackToFileIfNeeded.
 	debugSession isAboutUIProcess
-		ifTrue:
-			[ DefaultExecutionEnvironment beActiveDuring: [ self spawnNewProcess ] ].
+		ifTrue: [ DefaultExecutionEnvironment beActiveDuring: [ self spawnNewProcess ] ].
 	self
-		defer: [ "Opened the embeddeable debugger instead of the default one."
-			[ GtCoderEmbeddedDebuggerElement
+		defer: [  "Opened the embeddeable debugger instead of the default one."[ GtCoderEmbeddedDebuggerElement
 				openOn: debugSession
 				dueTo: exception
 				embeddedIn: aCoderRequesterObject
 				withSourceString: aSourceString
-				withSourceInterval: aSourceInterval ]
+				withSourceInterval: aSourceInterval
+				evaluationInfo: anEvaluationInfo ]
 				on: Error
 				do: [ :ex | debugSession signalDebuggerError: ex ] ].
 	process suspend