Commit 25122e9

committed

When the built-in $null was watched its value was incorrect

This fixes the evaluation of `$null` itself and variables that don't exist such that they display correctly in the watched variables pane of the debugger. As noted, the issue was that we were doing a string join even for a single (potentially null) value. This also fixes the excess quotes bug around a single value.

1 parent 6133c79 commit 25122e9Copy full SHA for 25122e9

File tree

3 files changed

+10

-5

lines changed

src/PowerShellEditorServices/Services/DebugAdapter
- DebugService.cs
- Handlers
  - DebugEvaluateHandler.cs
test/PowerShellEditorServices.Test/Debugging
- DebugServiceTests.cs

3 files changed

+10

-5

lines changed

`‎src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs‎`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -527,11 +527,15 @@ public async Task<VariableDetails> EvaluateExpressionAsync(`
`527`	`527`	`return null;`
`528`	`528`	`}`
`529`	`529`
`530`		`- // If we didn't write output,`
`531`		`- // return a VariableDetails instance.`
	`530`	`+ // If we didn't write output, return a VariableDetails instance.`
`532`	`531`	`return new VariableDetails(`
`533`		`- expressionString,`
`534`		`- string.Join(Environment.NewLine, results));`
	`532`	`+ expressionString,`
	`533`	`+ // If there's only one result, we want its raw value (especially if it's null). For`
	`534`	`+ // a collection, since we're displaying these, we want to concatenante them.`
	`535`	`+ // However, doing that for one result caused null to be turned into an empty string.`
	`536`	`+ results.Count == 1`
	`537`	`+ ? results[0]`
	`538`	`+ : string.Join(Environment.NewLine, results));`
`535`	`539`	`}`
`536`	`540`
`537`	`541`	`/// <summary>`

`‎src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ internal class DebugEvaluateHandler : IEvaluateHandler`
`22`	`22`	`private readonly IInternalPowerShellExecutionService _executionService;`
`23`	`23`	`private readonly DebugService _debugService;`
`24`	`24`
	`25`	`+ // AKA Watch Variables`
`25`	`26`	`public DebugEvaluateHandler(`
`26`	`27`	`ILoggerFactory factory,`
`27`	`28`	`IPowerShellDebugContext debugContext,`

`‎test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ await debugService.SetCommandBreakpointsAsync(`
`529`	`529`	`AssertDebuggerStopped(testScript.FilePath, 11);`
`530`	`530`
`531`	`531`	`VariableDetails prompt = await debugService.EvaluateExpressionAsync("prompt", false, CancellationToken.None);`
`532`		`- Assert.Equal("\"True > \"", prompt.ValueString);`
	`532`	`+ Assert.Equal("True > ", prompt.ValueString);`
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`[SkippableFact]`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 25122e9

File tree

3 files changed

3 files changed

`‎src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs‎`

`‎src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs‎`

`‎test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs‎`

0 commit comments