Apply review suggestions

Author: dee-see

src/PowerShellEditorServices/Language/FindDotSourcedVisitor.cs

@@ -76,15 +76,13 @@ private string GetPathFromExpandableStringExpression(ExpandableStringExpressionA
             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.OrdinalIgnoreCase))
+                if (!(nestedExpression is VariableExpressionAst variableAst
+                    && variableAst.VariablePath.UserPath.Equals("PSScriptRoot", StringComparison.OrdinalIgnoreCase)))
                 {
-                    path = path.Replace(variableExpressionAst.ToString(), _psScriptRoot);
-                }
-                else
-                {
-                    return null; // We're going to get an invalid path anyway.
+                    return null; // We return null instead of a partially evaluated ExpandableStringExpression.
                 }
+
+                path = path.Replace(variableAst.ToString(), _psScriptRoot);
             }
 
             return path;

src/PowerShellEditorServices/Language/LanguageService.cs

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