Skip to content

Commit c3b2e9d

Browse files
authored
Merge pull request #2444 from comintern/next
Prefer parent procedure name for variable declarations with same name.
2 parents 8c562cf + 648da74 commit c3b2e9d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,10 @@ public Declaration FindMemberEnclosingModule(Declaration callingModule, Declarat
263263

264264
public Declaration FindMemberEnclosingProcedure(Declaration enclosingProcedure, string memberName, DeclarationType memberType, ParserRuleContext onSiteContext = null)
265265
{
266+
if (memberType == DeclarationType.Variable && enclosingProcedure.IdentifierName.Equals(memberName))
267+
{
268+
return enclosingProcedure;
269+
}
266270
var allMatches = MatchName(memberName);
267271
var memberMatches = allMatches.Where(m =>
268272
m.DeclarationType.HasFlag(memberType)

0 commit comments

Comments
 (0)