Fix FindsPropertyDefinition test

Name was wrong.

Author: andyleejordan

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

@@ -153,15 +153,12 @@ public override AstVisitAction VisitFunctionMember(FunctionMemberAst functionMem
             ? SymbolType.Constructor
             : SymbolType.Method;
 
-        IScriptExtent nameExtent = VisitorUtils.GetNameExtent(
-            functionMemberAst,
-            useQualifiedName: false,
-            includeReturnType: false);
+        IScriptExtent nameExtent = VisitorUtils.GetNameExtent(functionMemberAst);
 
         return _action(new SymbolReference(
             symbolType,
             functionMemberAst.Name, // We bucket all the overloads.
-            VisitorUtils.GetMemberOverloadName(functionMemberAst, false, true),
+            VisitorUtils.GetMemberOverloadName(functionMemberAst),
             nameExtent,
             functionMemberAst.Extent,
             _file,
@@ -172,13 +169,18 @@ public override AstVisitAction VisitPropertyMember(PropertyMemberAst propertyMem
     {
         SymbolType symbolType =
             propertyMemberAst.Parent is TypeDefinitionAst typeAst && typeAst.IsEnum
-                ? SymbolType.EnumMember : SymbolType.Property;
+                ? SymbolType.EnumMember
+                : SymbolType.Property;
+
+        IScriptExtent nameExtent = VisitorUtils.GetNameExtent(propertyMemberAst);
+        string name = symbolType == SymbolType.EnumMember
+            ? propertyMemberAst.Name
+            : "$" + propertyMemberAst.Name;
 
-        IScriptExtent nameExtent = VisitorUtils.GetNameExtent(propertyMemberAst, false, false);
         return _action(new SymbolReference(
             symbolType,
-            nameExtent.Text,
-            VisitorUtils.GetMemberOverloadName(propertyMemberAst, false, true),
+            name,
+            VisitorUtils.GetMemberOverloadName(propertyMemberAst),
             nameExtent,
             propertyMemberAst.Extent,
             _file,
@@ -228,11 +230,20 @@ public override AstVisitAction VisitInvokeMemberExpression(InvokeMemberExpressio
 
     public override AstVisitAction VisitConfigurationDefinition(ConfigurationDefinitionAst configurationDefinitionAst)
     {
+        string? name = configurationDefinitionAst.InstanceName is StringConstantExpressionAst stringConstant
+            ? stringConstant.Value : null;
+        if (string.IsNullOrEmpty(name))
+        {
+            return AstVisitAction.Continue;
+        }
+
         IScriptExtent nameExtent = VisitorUtils.GetNameExtent(configurationDefinitionAst);
         return _action(new SymbolReference(
             SymbolType.Configuration,
-            nameExtent.Text,
-            "configuration " + nameExtent.Text + " { }",
+#pragma warning disable CS8604 // Possible null reference argument.
+            name,
+#pragma warning restore CS8604
+            "configuration " + name + " { }",
             nameExtent,
             configurationDefinitionAst.Extent,
             _file,

src/PowerShellEditorServices/Utility/VisitorUtils.cs

@@ -170,16 +170,14 @@ internal static PSESSymbols.ScriptExtent GetNameExtent(TypeDefinitionAst typeDef
         /// Gets a new ScriptExtent for a given Ast for the symbol name only (variable)
         /// </summary>
         /// <param name="functionMemberAst">A FunctionMemberAst in the script's AST</param>
-        /// <param name="useQualifiedName">A bool indicating if class/enum name should be prepended</param>
-        /// <param name="includeReturnType">A bool indicating if return type should be included for methods</param>
         /// <returns>A ScriptExtent with for the symbol name only</returns>
-        internal static PSESSymbols.ScriptExtent GetNameExtent(FunctionMemberAst functionMemberAst, bool useQualifiedName = true, bool includeReturnType = false)
+        internal static PSESSymbols.ScriptExtent GetNameExtent(FunctionMemberAst functionMemberAst)
         {
             (int startColumn, int startLine) = GetNameStartColumnAndLineFromAst(functionMemberAst);
 
             return new PSESSymbols.ScriptExtent()
             {
-                Text = GetMemberOverloadName(functionMemberAst, useQualifiedName, includeReturnType),
+                Text = GetMemberOverloadName(functionMemberAst),
                 StartLineNumber = startLine,
                 EndLineNumber = startLine,
                 StartColumnNumber = startColumn,
@@ -192,13 +190,8 @@ internal static PSESSymbols.ScriptExtent GetNameExtent(FunctionMemberAst functio
         /// Gets a new ScriptExtent for a given Ast for the property name only
         /// </summary>
         /// <param name="propertyMemberAst">A PropertyMemberAst in the script's AST</param>
-        /// <param name="useQualifiedName">A bool indicating if class/enum name should be prepended</param>
-        /// <param name="includePropertyType">A bool indicating if type should be included for class property</param>
         /// <returns>A ScriptExtent with for the symbol name only</returns>
-        internal static PSESSymbols.ScriptExtent GetNameExtent(
-            PropertyMemberAst propertyMemberAst,
-            bool useQualifiedName = true,
-            bool includePropertyType = false)
+        internal static PSESSymbols.ScriptExtent GetNameExtent(PropertyMemberAst propertyMemberAst)
         {
             bool isEnumMember = propertyMemberAst.Parent is TypeDefinitionAst typeDef && typeDef.IsEnum;
             (int startColumn, int startLine) = GetNameStartColumnAndLineFromAst(propertyMemberAst, isEnumMember);
@@ -210,10 +203,7 @@ internal static PSESSymbols.ScriptExtent GetNameExtent(
 
             return new PSESSymbols.ScriptExtent()
             {
-                Text = GetMemberOverloadName(
-                    propertyMemberAst,
-                    useQualifiedName: useQualifiedName,
-                    includePropertyType: includePropertyType),
+                Text = GetMemberOverloadName(propertyMemberAst),
                 StartLineNumber = startLine,
                 EndLineNumber = startLine,
                 StartColumnNumber = startColumn,
@@ -307,26 +297,17 @@ internal static string GetParamDisplayName(ParameterAst parameterAst)
         /// Gets the method or constructor name with parameters for current overload.
         /// </summary>
         /// <param name="functionMemberAst">A FunctionMemberAst object in the script's AST</param>
-        /// <param name="useQualifiedName">A bool indicating if class/enum name should be prepended</param>
-        /// <param name="includeReturnType">A bool indicating if return type should be included for methods</param>
         /// <returns>Function member name with return type (optional) and parameters</returns>
-        internal static string GetMemberOverloadName(FunctionMemberAst functionMemberAst,
-            bool useQualifiedName = true,
-            bool includeReturnType = false)
+        internal static string GetMemberOverloadName(FunctionMemberAst functionMemberAst)
         {
             StringBuilder sb = new();
 
             // Prepend return type and class. Used for symbol details (hover)
-            if (includeReturnType && !functionMemberAst.IsConstructor)
+            if (!functionMemberAst.IsConstructor)
             {
                 sb.Append(functionMemberAst.ReturnType?.TypeName.Name ?? "void").Append(' ');
             }
 
-            if (useQualifiedName && functionMemberAst.Parent is TypeDefinitionAst typeAst && typeAst.IsClass)
-            {
-                sb.Append(typeAst.Name).Append('.');
-            }
-
             sb.Append(functionMemberAst.Name);
 
             // Add parameters
@@ -350,27 +331,17 @@ internal static string GetMemberOverloadName(FunctionMemberAst functionMemberAst
         /// Gets the property name with type and class/enum.
         /// </summary>
         /// <param name="propertyMemberAst">A PropertyMemberAst object in the script's AST</param>
-        /// <param name="useQualifiedName">A bool indicating if class/enum name should be prepended</param>
-        /// <param name="includePropertyType">A bool indicating if type should be included for class property</param>
         /// <returns>Property name with type (optional) and class/enum</returns>
-        internal static string GetMemberOverloadName(PropertyMemberAst propertyMemberAst,
-            bool useQualifiedName = true,
-            bool includePropertyType = false)
+        internal static string GetMemberOverloadName(PropertyMemberAst propertyMemberAst)
         {
             StringBuilder sb = new();
 
             // Prepend return type and class. Used for symbol details (hover)
-            if (propertyMemberAst.Parent is TypeDefinitionAst typeAst)
+            if (propertyMemberAst.Parent is TypeDefinitionAst typeAst && !typeAst.IsEnum)
             {
-                if (includePropertyType && !typeAst.IsEnum)
-                {
-                    sb.Append(propertyMemberAst.PropertyType?.TypeName.Name ?? "object").Append(' ');
-                }
-
-                if (useQualifiedName)
-                {
-                    sb.Append(typeAst.Name).Append('.');
-                }
+                sb.Append('[')
+                    .Append(propertyMemberAst.PropertyType?.TypeName.Name ?? "object")
+                    .Append("] $");
             }
 
             sb.Append(propertyMemberAst.Name);

test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs

@@ -603,10 +603,11 @@ public async Task FindsReferencesOnMethod()
         [Fact]
         public async Task FindsPropertyDefinition()
         {
-            SymbolReference definitionResult = await GetDefinition(FindsTypeSymbolsDefinitionData.PropertySourceDetails).ConfigureAwait(true);
-            Assert.Equal(15, definitionResult.ScriptRegion.StartLineNumber);
-            Assert.Equal(13, definitionResult.ScriptRegion.StartColumnNumber);
-            Assert.Equal("SuperClass.SomePropWithDefault", definitionResult.SymbolName);
+            SymbolReference symbol = await GetDefinition(FindsTypeSymbolsDefinitionData.PropertySourceDetails).ConfigureAwait(true);
+            Assert.Equal("$SomePropWithDefault", symbol.SymbolName);
+            Assert.Equal("[string] $SomePropWithDefault", symbol.DisplayString);
+            Assert.Equal(SymbolType.Property, symbol.SymbolType);
+            Assert.True(symbol.IsDeclaration);
         }
 
         [Fact]