Move settings method to Settings.cs

Author: Kapil Borle

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -238,7 +238,11 @@ protected override void BeginProcessing()
             }
 
             object settingsFound;
-            var settingsMode = FindSettingsMode(out settingsFound);
+            var settingsMode = Generic.Settings.FindSettingsMode(
+                this.settings,
+                processedPaths == null || processedPaths.Count == 0 ? null : processedPaths[0],
+                out settingsFound);
+
             switch (settingsMode)
             {
                 case SettingsMode.Auto:
@@ -253,9 +257,6 @@ protected override void BeginProcessing()
                     break;
 
                 case SettingsMode.Preset:
-                    settingsFound = Generic.Settings.GetSettingPresetFilePath(this.settings as string);
-                    goto case SettingsMode.File;
-
                 case SettingsMode.File:
                     this.WriteVerbose(String.Format("Using settings file at {0}", (string)settingsFound));
                     break;
@@ -344,17 +345,6 @@ protected override void StopProcessing()
 
         #region Private Methods
 
-        private static bool IsBuiltinSettingPreset(object settingPreset)
-        {
-            var preset = settingPreset as string;
-            if (preset != null)
-            {
-                return Generic.Settings.GetSettingPresets().Contains(preset, StringComparer.OrdinalIgnoreCase);
-            }
-
-            return false;
-        }
-
         private void ProcessInput()
         {
             IEnumerable<DiagnosticRecord> diagnosticsList = Enumerable.Empty<DiagnosticRecord>();
@@ -399,64 +389,6 @@ private bool IsFileParameterSet()
             return String.Equals(this.ParameterSetName, "File", StringComparison.OrdinalIgnoreCase);
         }
 
-        private SettingsMode FindSettingsMode(out object settingsFound)
-        {
-            var settingsMode = SettingsMode.None;
-            settingsFound = this.settings;
-            if (settingsFound == null)
-            {
-                if (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 = 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);
-                    }
-
-                    if (Directory.Exists(directory))
-                    {
-                        // if settings are not provided explicitly, look for it in the given path
-                        // check if pssasettings.psd1 exists
-                        var settingsFilename = "PSScriptAnalyzerSettings.psd1";
-                        var settingsFilePath = System.IO.Path.Combine(directory, settingsFilename);
-                        settingsFound = settingsFilePath;
-                        if (File.Exists(settingsFilePath))
-                        {
-                            settingsMode = SettingsMode.Auto;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                var settingsFilePath = settingsFound as String;
-                if (settingsFilePath != null)
-                {
-                    if (IsBuiltinSettingPreset(settingsFilePath))
-                    {
-                        settingsMode = SettingsMode.Preset;
-                        settingsFound = Generic.Settings.GetSettingPresetFilePath(settingsFilePath);
-                    }
-                    else
-                    {
-                        settingsMode = SettingsMode.File;
-                        settingsFound = settingsFilePath;
-                    }
-                }
-                else
-                {
-                    if (settingsFound is Hashtable)
-                    {
-                        settingsMode = SettingsMode.Hashtable;
-                    }
-                }
-            }
-
-            return settingsMode;
-        }
-
         #endregion // Private Methods
     }
 }

Engine/Generic/Settings.cs

@@ -546,5 +546,74 @@ private void ThrowInvalidDataException(IScriptExtent extent)
                                     extent.StartColumnNumber,
                                     extent.File ?? ""));
         }
+
+        private static bool IsBuiltinSettingPreset(object settingPreset)
+        {
+            var preset = settingPreset as string;
+            if (preset != null)
+            {
+                return Generic.Settings.GetSettingPresets().Contains(preset, StringComparer.OrdinalIgnoreCase);
+            }
+
+            return false;
+        }
+
+        internal static SettingsMode FindSettingsMode(object settings, string path, out object settingsFound)
+        {
+            var settingsMode = SettingsMode.None;
+            settingsFound = settings;
+            if (settingsFound == null)
+            {
+                if (path != null)
+                {
+                    // add a directory separator character because if there is no trailing separator character, it will return the parent
+                    var directory = path.TrimEnd(System.IO.Path.DirectorySeparatorChar);
+                    if (File.Exists(directory))
+                    {
+                        // if given path is a file, get its directory
+                        directory = Path.GetDirectoryName(directory);
+                    }
+
+                    if (Directory.Exists(directory))
+                    {
+                        // if settings are not provided explicitly, look for it in the given path
+                        // check if pssasettings.psd1 exists
+                        var settingsFilename = "PSScriptAnalyzerSettings.psd1";
+                        var settingsFilePath = Path.Combine(directory, settingsFilename);
+                        settingsFound = settingsFilePath;
+                        if (File.Exists(settingsFilePath))
+                        {
+                            settingsMode = SettingsMode.Auto;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                var settingsFilePath = settingsFound as String;
+                if (settingsFilePath != null)
+                {
+                    if (IsBuiltinSettingPreset(settingsFilePath))
+                    {
+                        settingsMode = SettingsMode.Preset;
+                        settingsFound = GetSettingPresetFilePath(settingsFilePath);
+                    }
+                    else
+                    {
+                        settingsMode = SettingsMode.File;
+                        settingsFound = settingsFilePath;
+                    }
+                }
+                else
+                {
+                    if (settingsFound is Hashtable)
+                    {
+                        settingsMode = SettingsMode.Hashtable;
+                    }
+                }
+            }
+
+            return settingsMode;
+        }
     }
 }