--- a/DebugView.st Wed Feb 20 12:23:30 2019 +0100
+++ b/DebugView.st Wed Feb 20 22:49:43 2019 +0100
@@ -3104,6 +3104,15 @@
^ self
!
+additionalLocationInfo
+ "subclasses may provide additional info for the executionInfoLabel
+ (such as repreat count of an activity)"
+
+ ^ ''
+
+ "Created: / 20-02-2019 / 22:22:52 / Claus Gittinger"
+!
+
destroy
"closing the debugger implies an abort or continue"
@@ -3976,7 +3985,7 @@
setLabelFor:errorDescriptionMessage in:aProcessOrNil orElseInLocation:aLocationString
"set the window-title and the exceptionInfo label's string"
- |l lines processNameOrNil pidOrNil osPidString colorUsed|
+ |l lines processNameOrNil pidOrNil osPidString colorUsed messageLine|
lines := errorDescriptionMessage asStringCollection.
lines size > 1 ifTrue:[
@@ -4011,21 +4020,31 @@
ifFalse:[ Color red ].
colorUsed := colorUsed contrastingColorFor:exceptionInfoLabel backgroundColor.
+ messageLine := lines first.
processNameOrNil notNil ifTrue:[
exceptionInfoLabel
label:(resources
string:'%1 in process %2 [%3]%4'
- with:(lines first withColor:colorUsed)
+ with:(messageLine withColor:colorUsed)
with:(processNameOrNil ? '')
with:(pidOrNil ? '')
with:(osPidString ? '')).
] ifFalse:[
- exceptionInfoLabel
- label:(resources
- string:'%1 in %2%3'
- with:(lines first withColor:colorUsed)
- with:aLocationString
- with:(osPidString ? '')).
+ (messageLine includesString:aLocationString) ifTrue:[
+ exceptionInfoLabel
+ label:(resources
+ string:'%1%2'
+ with:(messageLine withColor:colorUsed)
+ with:(self additionalLocationInfo)).
+ ] ifFalse:[
+ exceptionInfoLabel
+ label:(resources
+ string:'%1 in %2%3%4'
+ with:(messageLine withColor:colorUsed)
+ with:aLocationString
+ with:(self additionalLocationInfo)
+ with:(osPidString ? '')).
+ ].
].
exceptionInfoLabel
@@ -4034,6 +4053,7 @@
].
"Created: / 18-02-2019 / 12:02:11 / Claus Gittinger"
+ "Modified: / 20-02-2019 / 22:25:11 / Claus Gittinger"
! !
!DebugView methodsFor:'interrupt handling'!
@@ -7174,9 +7194,12 @@
!
haltSelectors
- ^ #( #'halt' #'halt:' #'breakPoint:' #'breakPoint:info:' #'break').
+ ^ #( #'halt' #'halt:'
+ #'breakPoint:' #'breakPoint:info:' #'break'
+ ).
"Modified (format): / 27-01-2012 / 11:10:00 / cg"
+ "Modified (format): / 20-02-2019 / 21:50:16 / Claus Gittinger"
!
interruptProcessWith:aBlock