Distinguish constructors/methods from functions

Author: andyleejordan

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

@@ -158,7 +158,7 @@ public override AstVisitAction VisitFunctionMember(FunctionMemberAst functionMem
 
         return _action(new SymbolReference(
             symbolType,
-            "fn " + functionMemberAst.Name, // We bucket all the overloads.
+            "mtd " + functionMemberAst.Name, // We bucket all the overloads.
             VisitorUtils.GetMemberOverloadName(functionMemberAst),
             nameExtent,
             functionMemberAst.Extent,
@@ -215,7 +215,7 @@ public override AstVisitAction VisitInvokeMemberExpression(InvokeMemberExpressio
         // TODO: It's too bad we can't get the member's real symbol and reuse its display string.
         return _action(new SymbolReference(
             SymbolType.Method,
-            "fn " + memberName,
+            "mtd " + memberName,
             "(method) " + memberName,
             methodCallAst.Member.Extent,
             methodCallAst.Extent,

test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs

@@ -552,14 +552,14 @@ public async Task FindsConstructorDefinition()
             Assert.Collection(symbols,
                 (i) =>
                 {
-                    Assert.Equal("fn SuperClass", i.Id);
+                    Assert.Equal("mtd SuperClass", i.Id);
                     Assert.Equal("SuperClass([string]$name)", i.Name);
                     Assert.Equal(SymbolType.Constructor, i.Type);
                     Assert.True(i.IsDeclaration);
                 },
                 (i) =>
                 {
-                    Assert.Equal("fn SuperClass", i.Id);
+                    Assert.Equal("mtd SuperClass", i.Id);
                     Assert.Equal("SuperClass()", i.Name);
                     Assert.Equal(SymbolType.Constructor, i.Type);
                     Assert.True(i.IsDeclaration);
@@ -576,21 +576,21 @@ public async Task FindsMethodDefinition()
             Assert.Collection(symbols,
                 (i) =>
                 {
-                    Assert.Equal("fn MyClassMethod", i.Id);
+                    Assert.Equal("mtd MyClassMethod", i.Id);
                     Assert.Equal("string MyClassMethod([string]$param1, $param2, [int]$param3)", i.Name);
                     Assert.Equal(SymbolType.Method, i.Type);
                     Assert.True(i.IsDeclaration);
                 },
                 (i) =>
                 {
-                    Assert.Equal("fn MyClassMethod", i.Id);
+                    Assert.Equal("mtd MyClassMethod", i.Id);
                     Assert.Equal("string MyClassMethod([MyEnum]$param1)", i.Name);
                     Assert.Equal(SymbolType.Method, i.Type);
                     Assert.True(i.IsDeclaration);
                 },
                 (i) =>
                 {
-                    Assert.Equal("fn MyClassMethod", i.Id);
+                    Assert.Equal("mtd MyClassMethod", i.Id);
                     Assert.Equal("string MyClassMethod()", i.Name);
                     Assert.Equal(SymbolType.Method, i.Type);
                     Assert.True(i.IsDeclaration);
@@ -607,7 +607,7 @@ public async Task FindsReferencesOnMethod()
                 (i) => Assert.Equal("string MyClassMethod()", i.Name),
                 (i) => // The invocation!
                 {
-                    Assert.Equal("fn MyClassMethod", i.Id);
+                    Assert.Equal("mtd MyClassMethod", i.Id);
                     Assert.Equal("(method) MyClassMethod", i.Name);
                     Assert.Equal("$o.MyClassMethod()", i.SourceLine);
                     Assert.Equal(SymbolType.Method, i.Type);
@@ -766,12 +766,12 @@ public void FindsSymbolsInFile()
             Assert.True(symbol.IsDeclaration);
 
             symbol = Assert.Single(symbols.Where(i => i.Type == SymbolType.Constructor));
-            Assert.Equal("fn AClass", symbol.Id);
+            Assert.Equal("mtd AClass", symbol.Id);
             Assert.Equal("AClass([string]$AParameter)", symbol.Name);
             Assert.True(symbol.IsDeclaration);
 
             symbol = Assert.Single(symbols.Where(i => i.Type == SymbolType.Method));
-            Assert.Equal("fn AMethod", symbol.Id);
+            Assert.Equal("mtd AMethod", symbol.Id);
             Assert.Equal("void AMethod([string]$param1, [int]$param2, $param3)", symbol.Name);
             Assert.True(symbol.IsDeclaration);
 
@@ -802,7 +802,7 @@ public void FindsSymbolsWithNewLineInFile()
             AssertIsRegion(symbol.ScriptRegion, 6, 1, 23, 2);
 
             symbol = Assert.Single(symbols.Where(i => i.Type == SymbolType.Constructor));
-            Assert.Equal("fn NewLineClass", symbol.Id);
+            Assert.Equal("mtd NewLineClass", symbol.Id);
             AssertIsRegion(symbol.NameRegion, 8, 5, 8, 17);
             AssertIsRegion(symbol.ScriptRegion, 8, 5, 10, 6);
 
@@ -812,7 +812,7 @@ public void FindsSymbolsWithNewLineInFile()
             AssertIsRegion(symbol.ScriptRegion, 12, 5, 15, 40);
 
             symbol = Assert.Single(symbols.Where(i => i.Type == SymbolType.Method));
-            Assert.Equal("fn MyClassMethod", symbol.Id);
+            Assert.Equal("mtd MyClassMethod", symbol.Id);
             Assert.Equal("string MyClassMethod([MyNewLineEnum]$param1)", symbol.Name);
             AssertIsRegion(symbol.NameRegion, 20, 5, 20, 18);
             AssertIsRegion(symbol.ScriptRegion, 17, 5, 22, 6);