Fix error formatting to remove the unneeded leading newline for concise view (PowerShell#19080)

daxian-dbw · web-flow · commit 4756506d22bb · 2023-02-08T09:54:08.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
@@ -1284,7 +1284,6 @@ function Get-ConciseViewPositionMessage {
                                         return ""${errorColor}$($err.Exception.Message)${resetcolor}""
                                     }
 
-                                    $myinv = $err.InvocationInfo
                                     if ($ErrorView -eq 'DetailedView') {
                                         $message = Get-Error | Out-String
                                         return ""${errorColor}${message}${resetcolor}""
@@ -1301,10 +1300,9 @@ function Get-ConciseViewPositionMessage {
                                     }
                                     elseif ($myinv -and ($myinv.MyCommand -or ($err.CategoryInfo.Category -ne 'ParserError'))) {
                                         $posmsg = $myinv.PositionMessage
-                                    }
-
-                                    if ($posmsg -ne '') {
-                                        $posmsg = $newline + $posmsg
+                                        if ($posmsg -ne '') {
+                                            $posmsg = $newline + $posmsg
+                                        }
                                     }
 
                                     if ($err.PSMessageDetails) {

Original file line number	Diff line number	Diff line change
`@@ -1284,7 +1284,6 @@ function Get-ConciseViewPositionMessage {`
`1284`	`1284`	`return ""${errorColor}$($err.Exception.Message)${resetcolor}""`
`1285`	`1285`	`}`
`1286`	`1286`
`1287`		`- $myinv = $err.InvocationInfo`
`1288`	`1287`	`if ($ErrorView -eq 'DetailedView') {`
`1289`	`1288`	`$message = Get-Error \| Out-String`
`1290`	`1289`	`return ""${errorColor}${message}${resetcolor}""`
`@@ -1301,10 +1300,9 @@ function Get-ConciseViewPositionMessage {`
`1301`	`1300`	`}`
`1302`	`1301`	`elseif ($myinv -and ($myinv.MyCommand -or ($err.CategoryInfo.Category -ne 'ParserError'))) {`
`1303`	`1302`	`$posmsg = $myinv.PositionMessage`
`1304`		`- }`
`1305`		`-`
`1306`		`- if ($posmsg -ne '') {`
`1307`		`- $posmsg = $newline + $posmsg`
	`1303`	`+ if ($posmsg -ne '') {`
	`1304`	`+ $posmsg = $newline + $posmsg`
	`1305`	`+ }`
`1308`	`1306`	`}`
`1309`	`1307`
`1310`	`1308`	`if ($err.PSMessageDetails) {`