Merge pull request #726 from adri09070/dp-browser-refactorings

Fix code highlighting in debug points browser, for debug points set on AST node
pharo-spec · Apr 15, 2024 · b4cea87 · b4cea87
2 parents c41bce7 + 1a4f66e
commit b4cea87
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/NewTools-DebugPointsBrowser/DebugPointCodePresenter.class.st b/src/NewTools-DebugPointsBrowser/DebugPointCodePresenter.class.st
@@ -8,14 +8,24 @@ Class {
 	#package : 'NewTools-DebugPointsBrowser'
 }
 
+{ #category : 'adding' }
+DebugPointCodePresenter >> addHighlightForNode: aDebugPointNodeTarget [
+
+	self addTextSegmentDecoration:
+		(SpTextPresenterDecorator forHighlight
+			 interval: (aDebugPointNodeTarget node start to: aDebugPointNodeTarget node stop + 1);
+			 yourself)
+]
+
 { #category : 'updating - presenters' }
 DebugPointCodePresenter >> updateCode: aDebugPointNodeTarget [
 	"updates the code window with the code of the selected debug point"
-	aDebugPointNodeTarget ifNil:[self text: ''.^self].
-	self text: aDebugPointNodeTarget sourceCode;
+
+	aDebugPointNodeTarget ifNil: [
+		self text: ''.
+		^ self ].
+	self
+		text: aDebugPointNodeTarget sourceCode;
 		beForMethod: aDebugPointNodeTarget method;
-		addTextSegmentDecoration: 
-			(SpTextPresenterDecorator forHighlight
-         		interval: (aDebugPointNodeTarget node start to: ((aDebugPointNodeTarget node stop) +1));
-            yourself) .
+		addHighlightForNode: aDebugPointNodeTarget
 ]
diff --git a/src/NewTools-DebugPointsBrowser/DebugPointNodeTarget.extension.st b/src/NewTools-DebugPointsBrowser/DebugPointNodeTarget.extension.st
@@ -3,6 +3,6 @@ Extension { #name : 'DebugPointNodeTarget' }
 { #category : '*NewTools-DebugPointsBrowser' }
 DebugPointNodeTarget >> updateDebugPointUIManager: aDebugPointUIManager [
 
-	aDebugPointUIManager updateCode: self.
-	aDebugPointUIManager switchToNodeTargetView
+	aDebugPointUIManager switchToNodeTargetView.
+	aDebugPointUIManager updateCode: self
 ]