fix: Handle functions with scopes

Author: liamjpeters

Rules/AvoidReservedWordsAsFunctionNames.cs

@@ -65,13 +65,15 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
 
             foreach (var function in functionDefinitions)
             {
-                if (reservedWords.Contains(function.Name))
+                if (reservedWords.Contains(
+                    Helper.Instance.FunctionNameWithoutScope(function.Name)
+                ))
                 {
                     yield return new DiagnosticRecord(
                         string.Format(
                             CultureInfo.CurrentCulture,
                             Strings.AvoidReservedWordsAsFunctionNamesError,
-                            function.Name),
+                            Helper.Instance.FunctionNameWithoutScope(function.Name)),
                         Helper.Instance.GetScriptExtentForFunctionName(function) ?? function.Extent,
                         GetName(),
                         DiagnosticSeverity.Warning,

Tests/Rules/AvoidReservedWordsAsFunctionNames.tests.ps1

@@ -30,6 +30,20 @@ $randomCasedReservedWords = @(
     'uNtIl','UsInG','VaR','wHiLe','wOrKfLoW'
 )
 
+$functionScopes = @(
+	"global", "local", "script", "private"
+)
+
+# Generate all combinations of reserved words and function scopes
+$scopedReservedWordCases = foreach ($scope in $functionScopes) {
+    foreach ($word in $reservedWords) {
+        @{
+            Scope = $scope
+            Name  = $word
+        }
+    }
+}
+
 $substringReservedWords = $reservedWords | ForEach-Object {
     "$($_)Func"
 }
@@ -58,6 +72,22 @@ Describe 'AvoidReservedWordsAsFunctionNames' {
 			$violations[0].Extent.Text | Should -Be $_
 		}
 
+		# Functions can have scopes. So function global:function {} should still
+		# alert.
+		It 'flags reserved word "<Name>" with scope "<Scope>" as a violation' -TestCases $scopedReservedWordCases {
+			param($Scope, $Name)
+
+			$scriptDefinition = "function $($Scope):$($Name) { 'test' }"
+			$violations = Invoke-ScriptAnalyzer -ScriptDefinition $scriptDefinition -IncludeRule @($ruleName)
+
+			$violations.Count | Should -Be 1
+			$violations[0].Severity | Should -Be 'Warning'
+			$violations[0].RuleName | Should -Be $ruleName
+			$violations[0].Message | Should -Be "The reserved word '$Name' was used as a function name. This should be avoided."
+			$violations[0].Extent.Text | Should -Be "$($Scope):$($Name)"
+		}
+
+
 		It 'detects case-insensitively for "<_>"' -TestCases $randomCasedReservedWords {
 			$scriptDefinition = "function $_ { }"
 			$violations = Invoke-ScriptAnalyzer -ScriptDefinition $scriptDefinition -IncludeRule @($ruleName)