admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use PositionMessage for the line context information for ConciseView (#11398)

Browse Source
This commit is contained in:
Steve Lee
2019-12-19 09:42:37 -08:00
committed by Dongbo Wang
parent a24a5c7c5b
commit a1066ac0ac
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
+10 -5
View File
@@ -1091,16 +1091,18 @@ namespace System.Management.Automation.Runspaces
$verticalBar = '|'
$posmsg += ""${accentColor}${headerWhitespace}Line ${verticalBar}${newline}""
$highlightLine = ''
if ($useTargetObject) {
$line = $_.TargetObject.LineText.Trim()
$offsetLength = 0
$offsetInLine = 0
}
else {
$line = $myinv.Line
$highlightLine = $myinv.PositionMessage.Split('+').Count - 1
$offsetLength = $myinv.PositionMessage.split('+')[$highlightLine].Trim().Length
$offsetInLine = $myinv.OffsetInLine - 1
$positionMessage = $myinv.PositionMessage.Split('+')
$line = $positionMessage[1]
$highlightLine = $positionMessage[$positionMessage.Count - 1]
$offsetLength = $highlightLine.Trim().Length
$offsetInLine = $highlightLine.IndexOf('~')
}
if (-not $line.EndsWith(""`n"")) {
@@ -1115,7 +1117,10 @@ namespace System.Management.Automation.Runspaces
$posmsg += ""${accentColor}${lineWhitespace}${ScriptLineNumber} ${verticalBar} ${resetcolor}${line}""
$offsetWhitespace = ' ' * $offsetInLine
$prefix = ""${accentColor}${headerWhitespace} ${verticalBar} ${errorColor}""
$message = ""${prefix}${offsetWhitespace}^ ""
if ($highlightLine -ne '') {
$posMsg += ""${newline}${prefix}${highlightLine}${newline}""
}
$message = ""${prefix}""
}
if (! $err.ErrorDetails -or ! $err.ErrorDetails.Message) {