Merge pull request #182 from rubberduck-vba/next

sync with main repo

Author: retailcoder

RetailCoder.VBE/Inspections/Concrete/Inspector.cs

@@ -43,7 +43,7 @@ private void UpdateInspectionSeverity(Configuration config)
                 {
                     foreach (var setting in config.UserSettings.CodeInspectionSettings.CodeInspections)
                     {
-                        if (inspection.Description == setting.Description)
+                        if (inspection.Name == setting.Name)
                         {
                             inspection.Severity = setting.Severity;
                         }

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -263,6 +263,10 @@ 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))
+            {
+                return enclosingProcedure;
+            }
             var allMatches = MatchName(memberName);
             var memberMatches = allMatches.Where(m =>
                 m.DeclarationType.HasFlag(memberType)

RubberduckTests/Grammar/ResolverTests.cs

@@ -1111,6 +1111,30 @@ End Sub
                 && item.ParentScoping.DeclarationType == DeclarationType.Procedure));
         }
 
+        [TestMethod]
+        public void FunctionWithSameNameAsEnumReturnAssignment_DoesntResolveToEnum()
+        {
+            var code = @"
+
+Option Explicit
+Public Enum Foos
+    Foo1
+End Enum
+
+Public Function Foos() As Foos
+    Foos = Foo1
+End Function
+";
+
+            var state = Resolve(code);
+
+            var declaration = state.AllUserDeclarations.Single(item =>
+                item.DeclarationType == DeclarationType.Enumeration
+                && item.IdentifierName == "Foos");
+
+            Assert.IsTrue(declaration.References.All(item => item.Selection.StartLine != 9));
+        }
+
         [TestMethod]
         public void UserDefinedTypeParameterAsTypeName_ResolvesToUserDefinedTypeDeclaration()
         {