From 8366fccffd4958aba0a3e1b004ba1f4f8f9b4f8f Mon Sep 17 00:00:00 2001
From: KevinMarquette <kevmar@gmail.com>
Date: Tue, 7 Feb 2017 23:09:49 -0800
Subject: [PATCH] Resolved some ScriptAnalyzer related issues

---
 Chronometer/Classes/Chronometer.ps1       | 36 +++++++++++++----------
 Chronometer/Private/Write-ScriptLine.ps1  |  2 +-
 Chronometer/Public/Format-Chronometer.ps1 |  2 +-
 Chronometer/Public/Get-Chronometer.ps1    |  2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Chronometer/Classes/Chronometer.ps1 b/Chronometer/Classes/Chronometer.ps1
index b852f4f..0e05ff7 100644
--- a/Chronometer/Classes/Chronometer.ps1
+++ b/Chronometer/Classes/Chronometer.ps1
@@ -5,27 +5,31 @@ class Chronometer
 
     [void]AddBreakpoint([string[]]$Path, [int[]]$LineNumber)
     {
-        foreach($file in (Resolve-Path $Path -ea 0))
+        if(-not [string]::IsNullOrEmpty($Path))
         {
-            $script = [MonitoredScript]@{Path=$file.Path}
-            $lines = $script.SetScript($file)
-            if($null -eq $LineNumber)
+            foreach($file in (Resolve-Path $Path -ea 0))
             {
-                $bpLine = $LineNumber
-            }
-            else 
-            {
-                $bpLine = (1..$lines)
-            }
+                $script = [MonitoredScript]@{Path=$file.Path}
+                $lines = $script.SetScript($file)
+                
+                if($null -ne $LineNumber)
+                {
+                    $bpLine = $LineNumber
+                }
+                else 
+                {
+                    $bpLine = (1..$lines)
+                }
 
-            $this.fileMap[$file.Path] = $script
+                $this.fileMap[$file.Path] = $script
 
-            $breakpointParam = @{
-                Script = $file
-                Line = $bpLine
-                Action = {[ScriptProfiler]::RecordExecution( $_) }
+                $breakpointParam = @{
+                    Script = $file
+                    Line = $bpLine
+                    Action = {[ScriptProfiler]::RecordExecution( $_) }
+                }
+                $this.breakPoint += Set-PSBreakpoint @breakpointParam
             }
-            $this.breakPoint += Set-PSBreakpoint @breakpointParam
         }
     }
 
diff --git a/Chronometer/Private/Write-ScriptLine.ps1 b/Chronometer/Private/Write-ScriptLine.ps1
index 39f729f..d8216d5 100644
--- a/Chronometer/Private/Write-ScriptLine.ps1
+++ b/Chronometer/Private/Write-ScriptLine.ps1
@@ -1,7 +1,7 @@
 
 function Write-ScriptLine
 {
-    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost","")]
     [cmdletbinding()]
     param(
         [scriptline]
diff --git a/Chronometer/Public/Format-Chronometer.ps1 b/Chronometer/Public/Format-Chronometer.ps1
index f67557c..18ba0db 100644
--- a/Chronometer/Public/Format-Chronometer.ps1
+++ b/Chronometer/Public/Format-Chronometer.ps1
@@ -11,7 +11,7 @@ function Format-Chronometer
         $resultes = Get-Chronometer -Path $script.fullname  -ScriptBlock {Invoke-Pester C:\workspace\PSGraph}
         $results | Format-Chronometer -WarnAt 20 -ErrorAt 200
     #>
-    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost","")]
     [cmdletbinding(DefaultParameterSetName='Script')]
     param(
         # This is a MonitoredScript object from Get-Chronometer
diff --git a/Chronometer/Public/Get-Chronometer.ps1 b/Chronometer/Public/Get-Chronometer.ps1
index 3cc7211..cc9d977 100644
--- a/Chronometer/Public/Get-Chronometer.ps1
+++ b/Chronometer/Public/Get-Chronometer.ps1
@@ -32,7 +32,7 @@ function Get-Chronometer
     Write-Verbose "Setting breapoints"
     $Chronometer.AddBreakpoint($Path,$LineNumber)
 
-    if($null -ne $Chronometer.breakPoint)
+    if($null -ne $Chronometer.breakPoint -and $null -ne $ScriptBlock)
     {
         Write-Verbose "Executing Script"
         [ScriptProfiler]::Start()