Modifies scriptextent for UseToExporFieldsInModuleManifest

Author: Kapil Borle

Rules/UseToExportFieldsInManifest.cs

@@ -101,39 +101,25 @@ private bool HasAcceptableExportField(string key, HashtableAst hast, string scri
                 {
                     var arrayAst = pair.Item2.Find(x => x is ArrayLiteralAst || x is ArrayExpressionAst, true);
                     if (arrayAst == null)
-                    {
-                        extent = GetScriptExtent(pair, scriptText);
+                    {         
+                        extent = pair.Item2.Extent;
                         return false;
-                    }
+                    }                        
                     else
                     {
+                        var elementWithWildcard = arrayAst.Find(x => x is StringConstantExpressionAst 
+                                                                    && x.Extent.Text.Contains("*"), false);
+                        if (elementWithWildcard != null)
+                        {
+                            extent = elementWithWildcard.Extent;
+                            return false;
+                        }                            
                         return true;
                     }
                 }
             }
             return true;
-        }
-        
-        /// <summary>
-        /// Gets the script extent. 
-        /// </summary>
-        /// <param name="pair"></param>
-        /// <param name="scriptText"></param>
-        /// <returns></returns>
-        private ScriptExtent GetScriptExtent(Tuple<ExpressionAst, StatementAst> pair, string scriptText)
-        {
-            string[] scriptLines = Regex.Split(scriptText, "\r\n|\r|\n");
-            return new ScriptExtent(new ScriptPosition(pair.Item1.Extent.File,
-                                                            pair.Item1.Extent.StartLineNumber,
-                                                            pair.Item1.Extent.StartColumnNumber,
-                                                            scriptLines[pair.Item1.Extent.StartLineNumber - 1]), //line number begins with 1
-                                        new ScriptPosition(pair.Item2.Extent.File,
-                                                            pair.Item2.Extent.EndLineNumber,
-                                                            pair.Item2.Extent.EndColumnNumber,
-                                                            scriptLines[pair.Item2.Extent.EndLineNumber - 1]));   //line number begins with 1
-
-            
-        }
+        }       
 
         public string GetError(string field)
         {

Tests/Rules/UseToExportFieldsInManifest.tests.ps1

@@ -2,6 +2,7 @@ Import-Module PSScriptAnalyzer
 $directory = Split-Path -Parent $MyInvocation.MyCommand.Path
 $testManifestPath = Join-Path $directory "TestManifest"
 $testManifestBadFunctionsWildcardPath = "ManifestBadFunctionsWildcard.psd1"
+$testManifestBadFunctionsWildcardInArrayPath = "ManifestBadFunctionsWildcardInArray.psd1"
 $testManifestBadFunctionsNullPath = "ManifestBadFunctionsNull.psd1"
 $testManifestBadCmdletsWildcardPath = "ManifestBadCmdletsWildcard.psd1"
 $testManifestBadAliasesWildcardPath = "ManifestBadAliasesWildcard.psd1"
@@ -35,31 +36,42 @@ Describe "UseManifestExportFields" {
         It "detects FunctionsToExport with wildcard" {
             $results = Run-PSScriptAnalyzerRule $testManifestBadFunctionsWildcardPath
             $results.Count | Should be 1
-            $results[0].Extent.Text | Should be "FunctionsToExport = '*'"
+            $results[0].Extent.Text | Should be "'*'"
         }
 
         It "detects FunctionsToExport with null" {
             $results = Run-PSScriptAnalyzerRule $testManifestBadFunctionsNullPath
             $results.Count | Should be 1
-            $results[0].Extent.Text | Should be 'FunctionsToExport = $null'
+            $results[0].Extent.Text | Should be '$null'
         }
 
+        It "detects array element containing wildcard" {
+            $results = Run-PSScriptAnalyzerRule $testManifestBadFunctionsWildcardInArrayPath
+            $results.Count | Should be 3
+            $results.Where({$_.Message -match "FunctionsToExport"}).Extent.Text | Should be "'Get-*'"
+            $results.Where({$_.Message -match "CmdletsToExport"}).Extent.Text | Should be "'Update-*'"
+            
+            # if more than two elements contain wildcard we can show only the first one as of now.
+            $results.Where({$_.Message -match "VariablesToExport"}).Extent.Text | Should be "'foo*'"
+        }
+
+
         It "detects CmdletsToExport with wildcard" {
             $results = Run-PSScriptAnalyzerRule $testManifestBadCmdletsWildcardPath
             $results.Count | Should be 1
-            $results[0].Extent.Text | Should be "CmdletsToExport = '*'"
+            $results[0].Extent.Text | Should be "'*'"
         }
 
         It "detects AliasesToExport with wildcard" {
             $results = Run-PSScriptAnalyzerRule $testManifestBadAliasesWildcardPath
             $results.Count | Should be 1
-            $results[0].Extent.Text | Should be "AliasesToExport = '*'"
+            $results[0].Extent.Text | Should be "'*'"
         }
 
         It "detects VariablesToExport with wildcard" {
             $results = Run-PSScriptAnalyzerRule $testManifestBadVariablesWildcardPath
             $results.Count | Should be 1
-            $results[0].Extent.Text | Should be "VariablesToExport = '*'"
+            $results[0].Extent.Text | Should be "'*'"
         }
 
         It "detects all the *ToExport violations" {