Strip qualifier from variable name in symbol identifier

Author: andyleejordan

src/PowerShellEditorServices/Services/Symbols/Visitors/SymbolVisitor.cs

@@ -94,11 +94,11 @@ public override AstVisitAction VisitVariableExpression(VariableExpressionAst var
             return AstVisitAction.Continue;
         }
 
-        // TODO: Consider tracking unscoped variable references only when they declared within
+        // TODO: Consider tracking unscoped variable references only when they're declared within
         // the same function definition.
         return _action(new SymbolReference(
             SymbolType.Variable,
-            "var " + variableExpressionAst.VariablePath.UserPath,
+            "var " + VisitorUtils.GetUnqualifiedVariableName(variableExpressionAst.VariablePath),
             "$" + variableExpressionAst.VariablePath.UserPath,
             variableExpressionAst.Extent,
             variableExpressionAst.Extent, // TODO: Maybe parent?

src/PowerShellEditorServices/Utility/VisitorUtils.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Management.Automation;
 using System.Management.Automation.Language;
 using System.Text;
 using PSESSymbols = Microsoft.PowerShell.EditorServices.Services.Symbols;
@@ -32,6 +33,14 @@ internal static class VisitorUtils
             return PSESSymbols.AstOperations.TryGetInferredValue(expandableStringExpressionAst, out string value) ? value : null;
         }
 
+        // Strip the qualification, if there is any, so $var is a reference of $script:var etc.
+        internal static string GetUnqualifiedVariableName(VariablePath variablePath)
+        {
+            return variablePath.IsUnqualified
+                ? variablePath.UserPath
+                : variablePath.UserPath.Substring(variablePath.UserPath.IndexOf(':') + 1);
+        }
+
         /// <summary>
         /// Calculates the start line and column of the actual symbol name in a AST.
         /// </summary>