Skip to content

Commit c2e8937

Browse files
committed
Clean up PSScriptAnalyzer
1 parent 76e474a commit c2e8937

6 files changed

+19
-16
lines changed

Reference/default.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function Get-ConciseViewPositionMessage {
150150
$message = $message.Replace($newline, ' ').Replace("`n", ' ').Replace("`t", ' ')
151151

152152
$windowWidth = 120
153-
if ($Host.UI.RawUI -ne $null) {
153+
if ($null -ne $Host.UI.RawUI) {
154154
$windowWidth = $Host.UI.RawUI.WindowSize.Width
155155
}
156156

ScriptAnalyzerSettings.psd1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@{
2+
Severity = @('Error', 'Warning')
3+
ExcludeRules = @('PSAvoidGlobalVars')
4+
}

source/private/GetConciseMessage.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ filter GetConciseMessage {
88
$err = $InputObject
99
$posmsg = ''
1010
$headerWhitespace = ''
11-
$offsetWhitespace = ''
1211
$message = ''
1312
$prefix = ''
1413

@@ -90,7 +89,6 @@ filter GetConciseMessage {
9089
}
9190

9291
$posmsg += "${accentColor}${lineWhitespace}${ScriptLineNumber} ${verticalBar} ${resetcolor}${line}"
93-
$offsetWhitespace = ' ' * $offsetInLine
9492
$prefix = "${accentColor}${headerWhitespace} ${verticalBar} ${errorColor}"
9593
if ($highlightLine -ne '') {
9694
$posMsg += "${prefix}${highlightLine}${newline}"
@@ -122,7 +120,7 @@ filter GetConciseMessage {
122120
$message = $message.Replace($newline, ' ').Replace("`n", ' ').Replace("`t", ' ')
123121

124122
$windowWidth = 120
125-
if ($Host.UI.RawUI -ne $null) {
123+
if ($null -ne $Host.UI.RawUI) {
126124
$windowWidth = $Host.UI.RawUI.WindowSize.Width
127125
}
128126

source/private/GetErrorMessage.ps1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ filter GetErrorTitle {
66
[System.Management.Automation.ErrorRecord]
77
$InputObject
88
)
9-
if (! $err.ErrorDetails -or ! $err.ErrorDetails.Message) {
10-
if ($err.CategoryInfo.Category -eq 'ParserError' -and $err.Exception.Message.Contains("~$newline")) {
9+
if ($InputObject.ErrorDetails -and $InputObject.ErrorDetails.Message) {
10+
$InputObject.ErrorDetails.Message
11+
} else {
12+
if ($InputObject.CategoryInfo.Category -eq 'ParserError' -and $InputObject.Exception.Message.Contains("~$newline")) {
1113
# need to parse out the relevant part of the pre-rendered positionmessage
12-
$err.Exception.Message.split("~$newline")[1].split("${newline}${newline}")[0]
13-
} elseif ($err.Exception) {
14-
$err.Exception.Message
15-
} elseif ($err.Message) {
16-
$err.Message
14+
$InputObject.Exception.Message.split("~$newline")[1].split("${newline}${newline}")[0]
15+
} elseif ($InputObject.Exception) {
16+
$InputObject.Exception.Message
17+
} elseif ($InputObject.Message) {
18+
$InputObject.Message
1719
} else {
18-
$err.ToString()
20+
$InputObject.ToString()
1921
}
20-
} else {
21-
$err.ErrorDetails.Message
2222
}
2323
}

source/public/ConvertTo-DetailedErrorView.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ filter ConvertTo-DetailedErrorView {
2323
process {
2424
$newline + (GetListRecursive $InputObject) + $newline
2525
if ($Env:GITHUB_ACTIONS) {
26-
Write-Host "::error $(GetGoogleWorkflowPositionMesage),title=$(GetErrorTitle $InputObject)::$(GetErrorMessage $InputObject)"
26+
"::error $(GetGoogleWorkflowPositionMesage),title=$(GetErrorTitle $InputObject)::$(GetErrorMessage $InputObject)"
2727
} elseif ($Env:TF_BUILD) {
28-
Write-Host "##vso[task.logissue type=error;$(GetAzurePipelinesPositionMesage)]$(GetErrorTitle $InputObject): $(GetErrorMessage $InputObject)"
28+
"##vso[task.logissue type=error;$(GetAzurePipelinesPositionMesage)]$(GetErrorTitle $InputObject): $(GetErrorMessage $InputObject)"
2929
}
3030
}
3131
}

source/public/ConvertTo-YamlErrorView.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.DESCRIPTION
66
This produces valid Yaml output from ErrorRecord you pass to it, recursively.
77
#>
8+
[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSReviewUnusedParameter', 'maxDepth')]
89
[CmdletBinding()]
910
param(
1011
# The object that you want to convert to YAML

0 commit comments

Comments
 (0)