Return the identifier name of the declaration from reference.IdentifierName

Returning a bracketed expression instead makes querying the references base on identifier name complicated and surprising.

Author: MDoerner

Rubberduck.Parsing/Binding/Bindings/MemberAccessDefaultBinding.cs

@@ -34,7 +34,7 @@ public MemberAccessDefaultBinding(
                   parent,
                   expression,
                   null,
-                  Identifier.GetName(expression.unrestrictedIdentifier()),
+                  expression.unrestrictedIdentifier().GetText(),
                   statementContext,
                   unrestrictedNameContext)
         {

Rubberduck.Parsing/VBA/ReferenceManagement/BoundExpressionVisitor.cs

@@ -123,8 +123,8 @@ private void Visit(
             bool isSetAssignment)
         {
             var callSiteContext = expression.Context;
-            var identifier = expression.Context.GetText();
             var callee = expression.ReferencedDeclaration;
+            var identifier = callee.IdentifierName;
             var selection = callSiteContext.GetSelection();
             expression.ReferencedDeclaration.AddReference(
                 module,
@@ -163,8 +163,8 @@ private void Visit(
             }
 
             var callSiteContext = expression.UnrestrictedNameContext;
-            var identifier = expression.UnrestrictedNameContext.GetText();
             var callee = expression.ReferencedDeclaration;
+            var identifier = callee.IdentifierName;
             var selection = callSiteContext.GetSelection();
             expression.ReferencedDeclaration.AddReference(
                 module,

RubberduckTests/Grammar/ResolverTests.cs

@@ -6915,6 +6915,7 @@ End Function
         [Test]
         [TestCase("nonHiddenElement")]
         [TestCase("[nonHiddenElement]")]
+        [TestCase("")]
         public void NonHiddenBracketedEnumVariableHasCorrectName(string enumElementName)
         {
             var moduleCode = $@"
@@ -6937,9 +6938,13 @@ End Enum
         [Category("Grammar")]
         [Category("Resolver")]
         [Test]
+        [TestCase("nonHiddenElement", "SomeEnum.nonHiddenElement", 1)]
+        [TestCase("[nonHiddenElement]", "SomeEnum.[nonHiddenElement]", 0)]
+        [TestCase("[nonHiddenElement]", "SomeEnum.[[nonHiddenElement]]", 1)]
         [TestCase("nonHiddenElement", "nonHiddenElement", 1)]
-        [TestCase("[nonHiddenElement]", "[nonHiddenElement]", 0)]
         [TestCase("[nonHiddenElement]", "[[nonHiddenElement]]", 1)]
+        [TestCase("", "SomeEnum.[]", 1)]
+        [TestCase("", "[]", 1)]
         public void NonHiddenBracketedEnumVariableHasReference(string enumElementName, string referenceText, int expectedNumberOfReferences)
         {
             var moduleCode = $@"
@@ -6948,7 +6953,7 @@ Private Enum SomeEnum
 End Enum
 
 Private Function Test() As Variant
-    Debug.Print SomeEnum.{referenceText}
+    Debug.Print {referenceText}
 End Function
 ";
 
@@ -7024,5 +7029,45 @@ End Function
                 Assert.AreEqual("enumElement", enumMemberReference.IdentifierName);
             }
         }
+
+        [Category("Grammar")]
+        [Category("Resolver")]
+        [Test]
+        [TestCase("TestModule.[Foo]", "Foo")]
+        [TestCase("TestModule.[Bar] 23", "Bar")]
+        [TestCase("Debug.Print TestModule.[Baz](42)", "Baz")]
+        [TestCase("[Foo]", "Foo")]
+        [TestCase("[Bar] 23", "Bar")]
+        [TestCase("Debug.Print [Baz](42)", "Baz")]
+        public void BracketedMemberExpressionCorrectReferencedIdentifierName(string statement, string expectedReferenceText)
+        {
+            var moduleCode = $@"
+Private Sub Foo()
+End Sub
+
+Private Sub Bar(arg As Long)
+End Sub
+
+Private Function Baz(arg As Long) As Long
+End Function
+
+Private Function Test() As Variant
+    {statement}
+End Function
+";
+
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(moduleCode, "TestModule", out _);
+
+            using (var state = Resolve(vbe.Object))
+            {
+                var module = state.DeclarationFinder
+                    .AllModules.Single(qmn => qmn.ComponentType == ComponentType.StandardModule);
+                var enumMemberReference = state.DeclarationFinder
+                    .IdentifierReferences(module)
+                    .Single(reference => reference.Declaration.DeclarationType.HasFlag(DeclarationType.Member));
+
+                Assert.AreEqual(expectedReferenceText, enumMemberReference.IdentifierName);
+            }
+        }
     }
 }