#UI_ENHANCEMENT by cg
class: DebugView
changed:
#isHaltToBeIgnoredIn:atLineNr:context:modifyEntryCount:
#stepOrNext
--- a/DebugView.st Mon May 02 14:10:36 2016 +0200
+++ b/DebugView.st Mon May 02 14:12:52 2016 +0200
@@ -445,17 +445,16 @@
"/ Transcript showCR:'halt/break in ',haltingMethod printString,' at ',lineNrInHaltingMethod printString.
IgnoredHalts do:[:ign |
- (ign isHaltIgnoredInMethod:haltingMethod line:lineNrInHaltingMethod context:aContext) ifTrue:[
- Transcript show:'Debugger [info]: halt/break ignored in ', haltingMethod whoString.
- Transcript show:' ('; show:ign; showCR:')'.
-
- modifyCount ifTrue:[ ign decrementIgnoreCount ].
- ign isHaltIgnored ifFalse:[
- Transcript showCR:'Debugger [info]: no longer ignore halt in ', haltingMethod whoString.
- IgnoredHalts remove:ign ifAbsent:[].
- ].
- ^ true.
- ].
+ (ign isHaltIgnoredInMethod:haltingMethod line:lineNrInHaltingMethod context:aContext) ifTrue:[
+ Transcript showCR:'Debugger [info]: halt/break ignored: %1' with:ign.
+
+ modifyCount ifTrue:[ ign decrementIgnoreCount ].
+ ign isHaltIgnored ifFalse:[
+ Transcript showCR:'Debugger [info]: no longer ignored (rest count=0)'.
+ IgnoredHalts remove:ign ifAbsent:[].
+ ].
+ ^ true.
+ ].
].
IgnoredHalts := (IgnoredHalts reject:[:ign | ign isActive not]) asNilIfEmpty.
@@ -3755,7 +3754,7 @@
"/ when single stepping, ignore breakpoints
inBreakPointHandlingCode ifTrue:[
- (bpntReceiver isKindOf:Breakpoint) ifTrue:[
+ (bpntReceiver notNil and:[ bpntReceiver isKindOf:Breakpoint ]) ifTrue:[
false "here receiver isEnabled" ifFalse:[
con := nil.
where := nil. here := nil.
@@ -4239,15 +4238,11 @@
].
inBlock ifTrue:[
- DebuggingDebugger2 == true ifTrue:[
- 'inBlock' printCR.
- ].
+ DebuggingDebugger2 == true ifTrue:[ 'inBlock' printCR ].
s := 'Debugger: in block'.
].
inBlockBelow ifTrue:[
- DebuggingDebugger2 == true ifTrue:[
- 'inBlockBelow' printCR.
- ].
+ DebuggingDebugger2 == true ifTrue:[ 'inBlockBelow' printCR ].
ignore := true
].