Fix review issues

Author: dee-see

src/PowerShellEditorServices/Language/AstOperations.cs

@@ -321,11 +321,11 @@ static private bool IsPowerShellDataFileAstNode(dynamic node, Type[] levelAstMap
         /// Finds all files dot sourced in a script
         /// </summary>
         /// <param name="scriptAst">The abstract syntax tree of the given script</param>
-        /// <param name="filePath">The path of the given script</param>
+        /// <param name="psScriptRoot">Pre-calculated value of $PSScriptRoot</param>
         /// <returns></returns>
-        static public string[] FindDotSourcedIncludes(Ast scriptAst, string filePath)
+        static public string[] FindDotSourcedIncludes(Ast scriptAst, string psScriptRoot)
         {
-            FindDotSourcedVisitor dotSourcedVisitor = new FindDotSourcedVisitor(filePath);
+            FindDotSourcedVisitor dotSourcedVisitor = new FindDotSourcedVisitor(psScriptRoot);
             scriptAst.Visit(dotSourcedVisitor);
 
             return dotSourcedVisitor.DotSourcedFiles.ToArray();

src/PowerShellEditorServices/Language/FindDotSourcedVisitor.cs

@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Management.Automation.Language;
 using System.Text.RegularExpressions;
 using Microsoft.PowerShell.EditorServices.Utility;
@@ -17,17 +16,21 @@ namespace Microsoft.PowerShell.EditorServices
     /// </summary>
     internal class FindDotSourcedVisitor : AstVisitor
     {
-        private readonly string _scriptDirectory;
+        private readonly string _psScriptRoot;
 
         /// <summary>
         /// A hash set of the dot sourced files (because we don't want duplicates)
         /// </summary>
         public HashSet<string> DotSourcedFiles { get; private set; }
 
-        public FindDotSourcedVisitor(string scriptPath)
+        /// <summary>
+        /// Creates a new instance of the FindDotSourcedVisitor class.
+        /// </summary>
+        /// <param name="psScriptRoot">Pre-calculated value of $PSScriptRoot</param>
+        public FindDotSourcedVisitor(string psScriptRoot)
         {
             DotSourcedFiles = new HashSet<string>(StringComparer.CurrentCultureIgnoreCase);
-            _scriptDirectory = Path.GetDirectoryName(scriptPath);
+            _psScriptRoot = psScriptRoot;
         }
 
         /// <summary>
@@ -58,7 +61,10 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
                         break;
                 }
 
-                DotSourcedFiles.Add(PathUtils.NormalizePathSeparators(path));
+                if (!string.IsNullOrWhiteSpace(path))
+                {
+                    DotSourcedFiles.Add(PathUtils.NormalizePathSeparators(path));
+                }
             }
 
             return base.VisitCommand(commandAst);
@@ -71,9 +77,9 @@ private string GetPathFromExpandableStringExpression(ExpandableStringExpressionA
             {
                 // 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))
+                    && variableExpressionAst.VariablePath.UserPath.Equals("PSScriptRoot", StringComparison.OrdinalIgnoreCase))
                 {
-                    path = path.Replace(variableExpressionAst.ToString(), _scriptDirectory);
+                    path = path.Replace(variableExpressionAst.ToString(), _psScriptRoot);
                 }
                 else
                 {

src/PowerShellEditorServices/Language/LanguageService.cs

@@ -498,7 +498,7 @@ private static string GetDotSourcedPath(SymbolReference symbol, Workspace worksp
         {
             string cleanedUpSymbol = PathUtils.NormalizePathSeparators(symbol.SymbolName.Trim('\'', '"'));
             return workspace.ResolveRelativeScriptPath(Path.GetDirectoryName(scriptFile.FilePath),
-                Regex.Replace(cleanedUpSymbol, @"\$PSScriptRoot", Path.GetDirectoryName(scriptFile.FilePath), RegexOptions.IgnoreCase));
+                Regex.Replace(cleanedUpSymbol, @"\$PSScriptRoot|\${PSScriptRoot}", Path.GetDirectoryName(scriptFile.FilePath), RegexOptions.IgnoreCase));
         }
 
         /// <summary>

src/PowerShellEditorServices/Workspace/ScriptFile.cs

@@ -649,7 +649,7 @@ private void ParseFileContents()
                     .ToArray();
 
             //Get all dot sourced referenced files and store  them
-            this.ReferencedFiles = AstOperations.FindDotSourcedIncludes(this.ScriptAst, this.FilePath);
+            this.ReferencedFiles = AstOperations.FindDotSourcedIncludes(this.ScriptAst, Path.GetDirectoryName(this.FilePath));
         }
 
         #endregion

test/PowerShellEditorServices.Test.Shared/References/DotSources.ps1

@@ -1,5 +1,6 @@
 . ./ReferenceFileE.ps1
 . "$PSScriptRoot/ReferenceFileE.ps1"
+. "${PSScriptRoot}/ReferenceFileE.ps1"
 . './ReferenceFileE.ps1'
 . "./ReferenceFileE.ps1"
 . .\ReferenceFileE.ps1