Resolve IncludeDefaultRules and RecurseCustomRulePath params

Author: Kapil Borle

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -280,8 +280,12 @@ protected override void BeginProcessing()
 
                     // For includeDefaultRules and RecurseCustomRulePath we override the value in the settings file by
                     // command line argument.
-                    combRecurseCustomRulePath = combRecurseCustomRulePath || settingsObj.RecurseCustomRulePath;
-                    combIncludeDefaultRules = combIncludeDefaultRules || settingsObj.IncludeDefaultRules;
+                    combRecurseCustomRulePath = OverrideSwitchParam(
+                        settingsObj.RecurseCustomRulePath,
+                        "RecurseCustomRulePath");
+                    combIncludeDefaultRules = OverrideSwitchParam(
+                        settingsObj.IncludeDefaultRules,
+                        "IncludeDefaultRules");
                 }
 
                 // Ideally we should not allow the parameter to be set from settings and command line
@@ -410,6 +414,13 @@ private bool IsFileParameterSet()
             return String.Equals(this.ParameterSetName, "File", StringComparison.OrdinalIgnoreCase);
         }
 
+        private bool OverrideSwitchParam(bool paramValue, string paramName)
+        {
+            return MyInvocation.BoundParameters.ContainsKey(paramName)
+                ? ((SwitchParameter)MyInvocation.BoundParameters[paramName]).ToBool()
+                : paramValue;
+        }
+
         #endregion // Private Methods
     }
 }

Tests/Engine/InvokeScriptAnalyzer.tests.ps1

@@ -418,6 +418,35 @@ Describe "Test CustomizedRulePath" {
                 $v.Count | Should Be 3
             }
         }
+
+        Context "When used from settings file and command line simulataneusly" {
+            BeforeAll {
+                $settings = @{
+                    CustomRulePath        = "$directory\samplerule"
+                    IncludeDefaultRules   = $false
+                    RecurseCustomRulePath = $false
+                }
+                $isaParams = @{
+                    Path     = "$directory\TestScript.ps1"
+                    Settings = $settings
+                }
+            }
+
+            It "Should combine CustomRulePaths" {
+                $v = Invoke-ScriptAnalyzer @isaParams -CustomRulePath "$directory\CommunityAnalyzerRules"
+                $v.Count | Should Be 2
+            }
+
+            It "Should override the settings IncludeDefaultRules parameter" {
+                $v = Invoke-ScriptAnalyzer @isaParams -IncludeDefaultRules
+                $v.Count | Should Be 2
+            }
+
+            It "Should override the settings RecurseCustomRulePath parameter" {
+                $v = Invoke-ScriptAnalyzer @isaParams -RecurseCustomRulePath
+                $v.Count | Should Be 3
+            }
+        }
     }
 
     Context "When used incorrectly" {