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

SteveL-MSFT · daxian-dbw · commit c9d64597af5d · 2020-01-09T15:57:25.000-08:00
diff --git a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
@@ -1058,7 +1058,13 @@ function Get-ConciseViewPositionMessage {
                                                 $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}""
diff --git a/test/powershell/engine/Formatting/ErrorView.Tests.ps1 b/test/powershell/engine/Formatting/ErrorView.Tests.ps1
@@ -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 *'
         }

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