Code cleanup for AvoidPositionalParameter rule fix.

Author: kalgiz

Engine/Helper.cs

@@ -622,26 +622,36 @@ public bool PositionalParameterUsed(CommandAst cmdAst, bool moreThanThreePositio
 
             IEnumerable<ParameterMetadata> switchParams = null;
 
+        /// <summary>
+        /// Given a commandast, checks whether positional parameters are used or not.
+        /// </summary>
+        /// <param name="cmdAst"></param>
+        /// <param name="moreThanTwoPositional">only return true if more than three positional parameters are used</param>
+        /// <returns></returns>
+        public bool PositionalParameterUsed(CommandAst cmdAst, bool moreThanTwoPositional = false)
+        {
             if (HasSplattedVariable(cmdAst))
             {
                 return false;
             }
 
             // Because of the way we count, we will also count the cmdlet as an argument so we have to -1
-            int argumentsWithoutParameters = -1;
-            bool wasParameter = false;
+            int argumentsWithoutProcedingParameters = -1;
+            bool parameterPreceding = false;
 
             foreach (CommandElementAst ceAst in cmdAst.CommandElements)
             {
                 var cmdParamAst = ceAst as CommandParameterAst;
                 if (cmdParamAst != null)
                 {
-                    wasParameter = true;
-                } else {
-                    if (!wasParameter) {
-                        argumentsWithoutParameters += 1;
+                    parameterPreceding = true;
+                } else
+                {
+                    if (!parameterPreceding)
+                    {
+                        argumentsWithoutProcedingParameters += 1;
                     }
-                    wasParameter = false;
+                    parameterPreceding = false;
                 }
             }
 
@@ -650,10 +660,10 @@ public bool PositionalParameterUsed(CommandAst cmdAst, bool moreThanThreePositio
 
             if (parent != null && parent.PipelineElements.Count > 1 && parent.PipelineElements[0] != cmdAst)
             {
-                argumentsWithoutParameters += 1;
+                argumentsWithoutProcedingParameters += 1;
             }
 
-            return moreThanThreePositional ? argumentsWithoutParameters >= 3 : argumentsWithoutParameters > 0;
+            return moreThanTwoPositional ? argumentsWithoutProcedingParameters >= 3 : argumentsWithoutProcedingParameters > 0;
         }
 
 

Rules/AvoidPositionalParameters.cs

@@ -27,6 +27,18 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
         {
             if (ast == null) throw new ArgumentNullException(Strings.NullAstErrorMessage);
 
+            // Find all function definitions in the script and add them to the set.
+            IEnumerable<Ast> functionDefinitionAsts = ast.FindAll(testAst => testAst is FunctionDefinitionAst, true);
+            HashSet<String> declaredFunctionNames = new HashSet<String>();
+
+            foreach (FunctionDefinitionAst functionDefinitionAst in functionDefinitionAsts)
+            {
+                if (string.IsNullOrEmpty(functionDefinitionAst.Name))
+                {
+                    continue;
+                }
+                declaredFunctionNames.Add(functionDefinitionAst.Name);
+            }
             // Finds all CommandAsts.
             IEnumerable<Ast> foundAsts = ast.FindAll(testAst => testAst is CommandAst, true);
 

Rules/UseCmdletCorrectly.cs

@@ -129,7 +129,11 @@ private bool MandatoryParameterExists(CommandAst cmdAst)
                 return true;
             }
 
+<<<<<<< HEAD
             if (mandParams.Count() == 0 || Helper.Instance.PositionalParameterUsed(cmdAst))
+=======
+            if (mandParams.Count == 0 || (Helper.Instance.IsCmdlet(cmdAst) && Helper.Instance.PositionalParameterUsed(cmdAst)))
+>>>>>>> d0541d2... Code cleanup for AvoidPositionalParameter rule fix.
             {
                 returnValue = true;
             }

Tests/Rules/AvoidPositionalParameters.tests.ps1

@@ -42,7 +42,7 @@ Describe "AvoidPositionalParameters" {
             }
             $warnings = Invoke-ScriptAnalyzer -ScriptDefinition "$sb"
             $warnings.Count | Should -BeGreaterThan 0
-            $warnings.RuleName | Should -Contain "PSAvoidUsingPositionalParameters"
+            $warnings.RuleName | Should -Contain $violationName
             $warnings.Message | Should -Contain "Cmdlet 'Foo' has positional parameter. Please use named parameters instead of positional parameters when calling a command."
         }
     }