Update methods to check for psd1 file

Author: Kapil Borle

src/PowerShellEditorServices/Language/AstOperations.cs

@@ -209,12 +209,7 @@ static public IEnumerable<SymbolReference> FindSymbolsInDocument(Ast scriptAst,
 //            }
 //            else
             {
-                // sometimes we don't have reliable access to the filename
-                // so we employ heuristics to check if the contents are
-                // part of a psd1 file.
-                if ((scriptAst.Extent.File != null
-                        && scriptAst.Extent.File.EndsWith(".psd1", StringComparison.OrdinalIgnoreCase))
-                    || IsPowerShellDataFile(scriptAst))
+                if (IsPowerShellDataFileAst(scriptAst))
                 {
                     var findHashtableSymbolsVisitor = new FindHashtabeSymbolsVisitor();
                     scriptAst.Visit(findHashtableSymbolsVisitor);
@@ -231,26 +226,25 @@ static public IEnumerable<SymbolReference> FindSymbolsInDocument(Ast scriptAst,
             return symbolReferences;
         }
 
-        static private bool IsPowerShellDataFile(Ast ast)
+        static private bool IsPowerShellDataFileAst(Ast ast)
         {
-            //var node = new { Item = ast, Children = new List<dynamic>() };
-            //GenerateTree(node);
-            //return node.Children.Count == 1 && node.Children[0].Item is NamedBlockAst
-            //    && node.Children[0].Children.Count == 1 && node.Children[0].Children[0].Item is PipelineAst
-            //    && node.Children[0].Children[0].Children.Count == 1 && ;
-
-            return IsPowerShellDataFile(
-                new { Item = ast, Children = new List<dynamic>() },
-                new Type[] {
-                    typeof(ScriptBlockAst),
-                    typeof(NamedBlockAst),
-                    typeof(PipelineAst),
-                    typeof(CommandExpressionAst),
-                    typeof(HashtableAst) },
-                0);
+            // sometimes we don't have reliable access to the filename
+            // so we employ heuristics to check if the contents are
+            // part of a psd1 file.
+            return (ast.Extent.File != null
+                        && ast.Extent.File.EndsWith(".psd1", StringComparison.OrdinalIgnoreCase))
+                    || IsPowerShellDataFileAstNode(
+                        new { Item = ast, Children = new List<dynamic>() },
+                        new Type[] {
+                            typeof(ScriptBlockAst),
+                            typeof(NamedBlockAst),
+                            typeof(PipelineAst),
+                            typeof(CommandExpressionAst),
+                            typeof(HashtableAst) },
+                        0);
         }
 
-        static private bool IsPowerShellDataFile(dynamic node, Type[] levelAstMap, int level)
+        static private bool IsPowerShellDataFileAstNode(dynamic node, Type[] levelAstMap, int level)
         {
             var levelAstTypeMatch = node.Item.GetType().Equals(levelAstMap[level]);
             if (!levelAstTypeMatch)
@@ -268,39 +262,21 @@ static private bool IsPowerShellDataFile(dynamic node, Type[] levelAstMap, int l
             {
                 foreach (var astFound in astsFound)
                 {
-                    if (!astFound.Equals(node.Item) && node.Item.Equals(astFound.Parent))
+                    if (!astFound.Equals(node.Item)
+                        && node.Item.Equals(astFound.Parent)
+                        && IsPowerShellDataFileAstNode(
+                            new { Item = astFound, Children = new List<dynamic>() },
+                            levelAstMap,
+                            level + 1))
                     {
-                        if (IsPowerShellDataFile(new { Item = astFound, Children = new List<dynamic>() }, levelAstMap, level + 1))
-                        {
-                            return true;
-                        }
+                        return true;
                     }
                 }
             }
 
             return false;
         }
 
-        static private void GenerateTree(dynamic node)
-        {
-            var astsFound = (node.Item as Ast).FindAll(a => a is Ast, false);
-            if (astsFound != null)
-            {
-                foreach (var astFound in astsFound)
-                {
-                    if (!astFound.Equals(node.Item) && node.Item.Equals(astFound.Parent))
-                    {
-                        node.Children.Add(new { Item = astFound, Children = new List<dynamic>() });
-                    }
-                }
-            }
-
-            foreach (var child in node.Children)
-            {
-                GenerateTree(child);
-            }
-        }
-
         /// <summary>
         /// Finds all files dot sourced in a script
         /// </summary>