Updates based on CR comments; Updated extent for Singlular Noun Rule also

Author: raghushantha

Engine/Helper.cs

@@ -646,21 +646,22 @@ public bool SkipBlock(string keyword, Ast namedBlockAst)
         }
 
         // Obtain script extent for the function - just around the function name
-        public IScriptExtent GetScriptExtentForFunctionName(string functionName)
+        public IScriptExtent GetScriptExtentForFunctionName(FunctionDefinitionAst functionDefinitionAst)
         {
-            if (String.IsNullOrEmpty(functionName))
+            if (null == functionDefinitionAst)
             {
                 return null;
             }
 
             // Obtain the index where the function name is in Tokens
             int funcTokenIndex = Tokens.Select((s, index) => new { s, index })
-                          .Where(x => x.s.Text == functionName)
+                          .Where(x => x.s.Extent.StartOffset == functionDefinitionAst.Extent.StartOffset)
                           .Select(x => x.index).FirstOrDefault();
 
-            if (funcTokenIndex > 0 && funcTokenIndex <= Helper.Instance.Tokens.Count())
+            if (funcTokenIndex > 0 && funcTokenIndex < Helper.Instance.Tokens.Count())
             {
-                return Tokens[funcTokenIndex].Extent;
+                // return the extent of the next token - this is the extent for the function name
+                return Tokens[++funcTokenIndex].Extent;
             }
 
             return null;

Rules/UseApprovedVerbs.cs

@@ -63,7 +63,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName) {
 
                     if (!approvedVerbs.Contains(verb, StringComparer.OrdinalIgnoreCase))
                     {
-                        IScriptExtent extent = Helper.Instance.GetScriptExtentForFunctionName(funcName);
+                        IScriptExtent extent = Helper.Instance.GetScriptExtentForFunctionName(funcAst);
 
                         if (null == extent)
                         {

Rules/UseSingularNouns.cs

@@ -56,8 +56,15 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName) {
 
                     if (!ps.IsSingular(noun) && ps.IsPlural(noun))
                     {
+                        IScriptExtent extent = Helper.Instance.GetScriptExtentForFunctionName(funcAst);
+
+                        if (null == extent)
+                        {
+                            extent = funcAst.Extent;
+                        }
+
                         yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseSingularNounsError, funcAst.Name),
-                            funcAst.Extent, GetName(), DiagnosticSeverity.Warning, fileName);
+                            extent, GetName(), DiagnosticSeverity.Warning, fileName);
                     }
                 }
             }