maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add trailing line number to filename for ConciseView (#11391)

Browse source
This commit is contained in:
Steve Lee 2019-12-18 14:05:56 -08:00 committed by Andrew
parent 384a7ba2d7
commit 563b1cba83
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
View file

@ -1058,7 +1058,13 @@ namespace System.Management.Automation.Runspaces
$useTargetObject = $true
}
elseif ($myinv.ScriptName) {
$posmsg = ""${resetcolor}$($myinv.ScriptName)${newline}""
if ($env:TERM_PROGRAM -eq 'vscode') {
# If we are running in vscode, we know the file:line:col links are clickable so we use this format
$posmsg = ""${resetcolor}$($myinv.ScriptName):$($myinv.ScriptLineNumber):$($myinv.OffsetInLine)${newline}""
}
else {
$posmsg = ""${resetcolor}$($myinv.ScriptName):$($myinv.ScriptLineNumber)${newline}""
}
}
else {
$posmsg = ""${newline}""

2
test/powershell/engine/Formatting/ErrorView.Tests.ps1
View file

@ -32,7 +32,7 @@ Describe 'Tests for $ErrorView' -Tag CI {
$testScriptPath = Join-Path -Path $TestDrive -ChildPath 'test.ps1'
Set-Content -Path $testScriptPath -Value $testScript
$e = { & $testScriptPath } | Should -Throw -ErrorId 'UnexpectedToken' -PassThru
$e | Out-String | Should -BeLike "*$testScriptPath*"
$e | Out-String | Should -BeLike "*${testScriptPath}:4*"
# validate line number is shown
$e | Out-String | Should -BeLike '* 4 *'
}