Apply review suggestions

Author: dee-see

src/PowerShellEditorServices/Language/AstOperations.cs

@@ -320,12 +320,13 @@ static private bool IsPowerShellDataFileAstNode(dynamic node, Type[] levelAstMap
         /// <summary>
         /// Finds all files dot sourced in a script
         /// </summary>
-        /// <param name="scriptFile">The script file to use to find dot sourced files.</param>
+        /// <param name="scriptAst">The abstract syntax tree of the given script</param>
+        /// <param name="filePath">The path of the given script</param>
         /// <returns></returns>
-        static public string[] FindDotSourcedIncludes(ScriptFile scriptFile)
+        static public string[] FindDotSourcedIncludes(Ast scriptAst, string filePath)
         {
-            FindDotSourcedVisitor dotSourcedVisitor = new FindDotSourcedVisitor(scriptFile.FilePath);
-            scriptFile.ScriptAst.Visit(dotSourcedVisitor);
+            FindDotSourcedVisitor dotSourcedVisitor = new FindDotSourcedVisitor(filePath);
+            scriptAst.Visit(dotSourcedVisitor);
 
             return dotSourcedVisitor.DotSourcedFiles.ToArray();
         }

src/PowerShellEditorServices/Language/FindDotSourcedVisitor.cs

@@ -42,19 +42,23 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
             CommandElementAst commandElementAst = commandAst.CommandElements[0];
             if (commandAst.InvocationOperator.Equals(TokenKind.Dot))
             {
-                if (commandElementAst is StringConstantExpressionAst stringConstantExpressionAst)
+                string path;
+                switch (commandElementAst)
                 {
-                    // Strip any quote characters off of the string
-                    DotSourcedFiles.Add(PathUtils.NormalizePathSeparators(stringConstantExpressionAst.Value));
-                }
-                else if (commandElementAst is ExpandableStringExpressionAst expandableStringExpressionAst)
-                {
-                    var path = GetPathFromExpandableStringExpression(expandableStringExpressionAst);
-                    if (path != null)
-                    {
-                        DotSourcedFiles.Add(PathUtils.NormalizePathSeparators(path));
-                    }
+                    case StringConstantExpressionAst stringConstantExpressionAst:
+                        path = stringConstantExpressionAst.Value;
+                        break;
+
+                    case ExpandableStringExpressionAst expandableStringExpressionAst:
+                        path = GetPathFromExpandableStringExpression(expandableStringExpressionAst);
+                        break;
+
+                    default:
+                        path = null;
+                        break;
                 }
+
+                DotSourcedFiles.Add(PathUtils.NormalizePathSeparators(path));
             }
 
             return base.VisitCommand(commandAst);
@@ -65,6 +69,7 @@ private string GetPathFromExpandableStringExpression(ExpandableStringExpressionA
             var path = expandableStringExpressionAst.Value;
             foreach (var nestedExpression in expandableStringExpressionAst.NestedExpressions)
             {
+                // If the string contains the variable $PSScriptRoot, we replace it with the corresponding value.
                 if (nestedExpression is VariableExpressionAst variableExpressionAst
                     && variableExpressionAst.VariablePath.UserPath.Equals("PSScriptRoot", StringComparison.CurrentCultureIgnoreCase))
                 {

src/PowerShellEditorServices/Workspace/ScriptFile.cs

@@ -20,7 +20,7 @@ public class ScriptFile
     {
         #region Private Fields
 
-        private static readonly string[] s_newlines = new []
+        private static readonly string[] s_newlines = new[]
         {
             "\r\n",
             "\n"
@@ -649,8 +649,7 @@ private void ParseFileContents()
                     .ToArray();
 
             //Get all dot sourced referenced files and store  them
-            this.ReferencedFiles =
-                AstOperations.FindDotSourcedIncludes(this);
+            this.ReferencedFiles = AstOperations.FindDotSourcedIncludes(this.ScriptAst, this.FilePath);
         }
 
         #endregion