Process paths before settings discovery

Author: Kapil Borle

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -38,6 +38,10 @@ namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Commands
         HelpUri = "http://go.microsoft.com/fwlink/?LinkId=525914")]
     public class InvokeScriptAnalyzerCommand : PSCmdlet, IOutputWriter
     {
+        #region Private variables
+        List<string> processedPaths;
+        #endregion // Private variables
+
         #region Parameters
         /// <summary>
         /// Path: The path to the file or folder to invoke PSScriptAnalyzer on.
@@ -218,12 +222,24 @@ protected override void BeginProcessing()
 
             string[] rulePaths = Helper.ProcessCustomRulePaths(customRulePath,
                 this.SessionState, recurseCustomRulePath);
+            if (IsFileParameterSet())
+            {
+                ProcessPath();
+            }
 
             var settingFileHasErrors = false;
-            if (settings == null)
+            if (settings == null
+                && processedPaths != null
+                && processedPaths.Count == 1)
             {
                 // add a directory separator character because if there is no trailing separator character, it will return the parent
-                var directory = System.IO.Path.GetDirectoryName(path + System.IO.Path.DirectorySeparatorChar);
+                var directory = processedPaths[0].TrimEnd(System.IO.Path.DirectorySeparatorChar);
+                if (File.Exists(directory))
+                {
+                    // if given path is a file, get its directory
+                    directory = System.IO.Path.GetDirectoryName(directory);
+                }
+
                 this.WriteVerbose(
                     String.Format(
                         "Settings not provided. Will look for settings file in the given path {0}.",
@@ -244,7 +260,6 @@ protected override void BeginProcessing()
                                 settingsFilename,
                                 directory));
                         settingFileHasErrors = !ScriptAnalyzer.Instance.ParseProfile(settingsFilepath, this.SessionState.Path, this);
-
                     }
                 }
 
@@ -330,15 +345,11 @@ protected override void StopProcessing()
         private void ProcessInput()
         {
             IEnumerable<DiagnosticRecord> diagnosticsList = Enumerable.Empty<DiagnosticRecord>();
-            if (String.Equals(this.ParameterSetName, "File", StringComparison.OrdinalIgnoreCase))
+            if (IsFileParameterSet())
             {
-                // throws Item Not Found Exception
-                Collection<PathInfo> paths = this.SessionState.Path.GetResolvedPSPathFromPSPath(path);
-                foreach (PathInfo p in paths)
+                foreach (var p in processedPaths)
                 {
-                    diagnosticsList = ScriptAnalyzer.Instance.AnalyzePath(
-                        this.SessionState.Path.GetUnresolvedProviderPathFromPSPath(p.Path),
-                        this.recurse);
+                    diagnosticsList = ScriptAnalyzer.Instance.AnalyzePath(p, this.recurse);
                     WriteToOutput(diagnosticsList);
                 }
             }
@@ -359,6 +370,21 @@ private void WriteToOutput(IEnumerable<DiagnosticRecord> diagnosticRecords)
                 }
             }
         }
+
+        private void ProcessPath()
+        {
+            Collection<PathInfo> paths = this.SessionState.Path.GetResolvedPSPathFromPSPath(path);
+            processedPaths = new List<string>();
+            foreach (PathInfo p in paths)
+            {
+                processedPaths.Add(this.SessionState.Path.GetUnresolvedProviderPathFromPSPath(p.Path));
+            }
+        }
+
+        private bool IsFileParameterSet()
+        {
+            return String.Equals(this.ParameterSetName, "File", StringComparison.OrdinalIgnoreCase);
+        }
 #endregion
     }
 }