Resolved some ScriptAnalyzer related issues

This commit is contained in:
KevinMarquette
2017-02-07 23:09:49 -08:00
parent 3d23b08124
commit 8366fccffd
4 changed files with 23 additions and 19 deletions

View File

@@ -4,12 +4,15 @@ class Chronometer
$Breakpoint = @() $Breakpoint = @()
[void]AddBreakpoint([string[]]$Path, [int[]]$LineNumber) [void]AddBreakpoint([string[]]$Path, [int[]]$LineNumber)
{
if(-not [string]::IsNullOrEmpty($Path))
{ {
foreach($file in (Resolve-Path $Path -ea 0)) foreach($file in (Resolve-Path $Path -ea 0))
{ {
$script = [MonitoredScript]@{Path=$file.Path} $script = [MonitoredScript]@{Path=$file.Path}
$lines = $script.SetScript($file) $lines = $script.SetScript($file)
if($null -eq $LineNumber)
if($null -ne $LineNumber)
{ {
$bpLine = $LineNumber $bpLine = $LineNumber
} }
@@ -28,6 +31,7 @@ class Chronometer
$this.breakPoint += Set-PSBreakpoint @breakpointParam $this.breakPoint += Set-PSBreakpoint @breakpointParam
} }
} }
}
[void]ClearBreakpoint() [void]ClearBreakpoint()
{ {

View File

@@ -1,7 +1,7 @@
function Write-ScriptLine function Write-ScriptLine
{ {
[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost")] [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost","")]
[cmdletbinding()] [cmdletbinding()]
param( param(
[scriptline] [scriptline]

View File

@@ -11,7 +11,7 @@ function Format-Chronometer
$resultes = Get-Chronometer -Path $script.fullname -ScriptBlock {Invoke-Pester C:\workspace\PSGraph} $resultes = Get-Chronometer -Path $script.fullname -ScriptBlock {Invoke-Pester C:\workspace\PSGraph}
$results | Format-Chronometer -WarnAt 20 -ErrorAt 200 $results | Format-Chronometer -WarnAt 20 -ErrorAt 200
#> #>
[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost")] [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost","")]
[cmdletbinding(DefaultParameterSetName='Script')] [cmdletbinding(DefaultParameterSetName='Script')]
param( param(
# This is a MonitoredScript object from Get-Chronometer # This is a MonitoredScript object from Get-Chronometer

View File

@@ -32,7 +32,7 @@ function Get-Chronometer
Write-Verbose "Setting breapoints" Write-Verbose "Setting breapoints"
$Chronometer.AddBreakpoint($Path,$LineNumber) $Chronometer.AddBreakpoint($Path,$LineNumber)
if($null -ne $Chronometer.breakPoint) if($null -ne $Chronometer.breakPoint -and $null -ne $ScriptBlock)
{ {
Write-Verbose "Executing Script" Write-Verbose "Executing Script"
[ScriptProfiler]::Start() [ScriptProfiler]::Start()