fixed broken test; fixed context formatter for enum+udt members

Author: retailcoder

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/IContextFormatter.cs

@@ -75,12 +75,13 @@ private string Format(Declaration declaration)
             else if (declaration.DeclarationType == DeclarationType.EnumerationMember
                 || declaration.DeclarationType == DeclarationType.UserDefinedTypeMember)
             {
-                formattedDeclaration = string.Format("{0}.{1}.{2}",
+                formattedDeclaration = string.Format("{0}.{1}.{2} {3}",
                     declaration.IsBuiltIn 
                         ? System.IO.Path.GetFileName(moduleName.ProjectPath) + ";" + moduleName.ProjectName 
                         : moduleName.ToString(), 
                     declaration.ParentDeclaration.IdentifierName, 
-                    declaration.IdentifierName);
+                    declaration.IdentifierName,
+                    typeName);
             }
 
             var subscripts = declaration.IsArray ? "()" : string.Empty;

Rubberduck.Parsing/Binding/SimpleNameDefaultBinding.cs

@@ -93,7 +93,9 @@ or explicit definition precedes this expression in an enclosing procedure.
             {
                 return null;
             }
-            var localVariable = _declarationFinder.FindMemberEnclosingProcedure(_parent, _name, DeclarationType.Variable);
+            var localVariable = _declarationFinder.FindMemberEnclosingProcedure(_parent, _name, DeclarationType.Variable)
+                ?? _declarationFinder.FindMemberEnclosingProcedure(_parent, _name, DeclarationType.Variable)
+                ;
             if (IsValidMatch(localVariable, _name))
             {
                 return new SimpleNameExpression(localVariable, ExpressionClassification.Variable, _context);

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -258,6 +258,7 @@
     <Compile Include="Symbols\PropertyGetDeclaration.cs" />
     <Compile Include="Symbols\FunctionDeclaration.cs" />
     <Compile Include="Symbols\SerializableDeclaration.cs" />
+    <Compile Include="Symbols\SquareBracketedNameComparer.cs" />
     <Compile Include="Symbols\SubroutineDeclaration.cs" />
     <Compile Include="Symbols\ProjectReferencePass.cs" />
     <Compile Include="Symbols\SyntaxErrorInfo.cs" />

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -28,6 +28,8 @@ public static IEnumerable<TValue> AllValues<TKey, TValue>(
 
     public class DeclarationFinder
     {
+        private static readonly SquareBracketedNameComparer NameComparer = new SquareBracketedNameComparer();
+
         private readonly IHostApplication _hostApp;
         private readonly IDictionary<QualifiedModuleName, IAnnotation[]> _annotations;
         private readonly IDictionary<QualifiedMemberName, IList<Declaration>> _undeclared;
@@ -48,7 +50,7 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<IA
             {
                 IdentifierName = declaration.IdentifierName.ToLowerInvariant()
             })
-            .ToDictionary(grouping => grouping.Key.IdentifierName, grouping => grouping.ToArray());
+            .ToDictionary(grouping => grouping.Key.IdentifierName, grouping => grouping.ToArray(), NameComparer);
 
             _undeclared = new Dictionary<QualifiedMemberName, IList<Declaration>>();
             _annotationService = new AnnotationService(this);
@@ -306,7 +308,7 @@ public Declaration FindMemberEnclosingModule(Declaration callingModule, Declarat
 
         public Declaration FindMemberEnclosingProcedure(Declaration enclosingProcedure, string memberName, DeclarationType memberType, ParserRuleContext onSiteContext = null)
         {
-            if (memberType == DeclarationType.Variable && enclosingProcedure.IdentifierName.Equals(memberName))
+            if (memberType == DeclarationType.Variable && NameComparer.Equals(enclosingProcedure.IdentifierName, memberName))
             {
                 return enclosingProcedure;
             }

Rubberduck.Parsing/Symbols/SquareBracketedNameComparer.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+namespace Rubberduck.Parsing.Symbols
+{
+    public class SquareBracketedNameComparer : IEqualityComparer<string>
+    {
+        public bool Equals(string x, string y)
+        {
+            return string.Equals(ApplyBrackets(x), ApplyBrackets(y));
+        }
+
+        public int GetHashCode(string obj)
+        {
+            if (obj == null) return 0;
+
+            var value = ApplyBrackets(obj);
+            return value.GetHashCode();
+        }
+
+        private string ApplyBrackets(string value)
+        {
+            if (value == null) return null;
+
+            return value[0] == '[' && value[value.Length - 1] == ']'
+                ? value
+                : "[" + value + "]";
+        }
+    }
+}