Commitce76ae1

and

authored

Fix debug tracing error with magic extents (#25726)

Co-authored-by: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>

1 parentc6329dd commitce76ae1Copy full SHA for ce76ae1

File tree

+21

-1

lines changed

+21

-1

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1536,7 +1536,16 @@ private List<Breakpoint> TriggerBreakpoints(List<Breakpoint> breakpoints)`
`1536`	`1536`
`1537`	`1537`	`internalvoidOnSequencePointHit(FunctionContextfunctionContext)`
`1538`	`1538`	`{`
`1539`		`-if(_context.ShouldTraceStatement&&!_callStack.Last().IsFrameHidden&&!functionContext._debuggerStepThrough)`
	`1539`	`+// TraceLine uses ColumnNumber and expects it to be 1 based. For`
	`1540`	`+// extents added by the engine and not user code the value can be`
	`1541`	`+// set to 0 causing an exception. This skips those types of extents`
	`1542`	`+// as tracing them wouldn't be useful for the end user anyway.`
	`1543`	`+if(_context.ShouldTraceStatement&&`
	`1544`	`+!_callStack.Last().IsFrameHidden&&`
	`1545`	`+!functionContext._debuggerStepThrough&&`
	`1546`	`+functionContext.CurrentPositionis notEmptyScriptExtent&&`
	`1547`	`+(functionContext.CurrentPositionisInternalScriptExtent\|\|`
	`1548`	`+functionContext.CurrentPosition.StartColumnNumber>0))`
`1540`	`1549`	`{`
`1541`	`1550`	`TraceLine(functionContext.CurrentPosition);`
`1542`	`1551`	`}`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,16 @@ Describe "Set-PSDebug" -Tags "CI" {`
`15`	`15`	`It"Should be able to set strict" {`
`16`	`16`	`{Set-PSDebug-Strict }\| Should-Not-Throw`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ It"Should skip magic extents created by pwsh" {`
	`20`	`+classClassWithDefaultCtor {`
	`21`	`+ MyMethod() { }`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ {`
	`25`	`+Set-PSDebug-Trace1`
	`26`	`+ [ClassWithDefaultCtor]::new()`
	`27`	`+ }\| Should-Not-Throw`
	`28`	`+ }`
`18`	`29`	`}`
`19`	`30`	`}`

Comments

(0)