Verify identifier use in FindParameterFromArgument. Closes #4577

comintern · comintern · commit 3e68474418ac · 2018-11-29T19:02:23.000-06:00
diff --git a/Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs b/Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs
@@ -552,8 +552,10 @@ public ParameterDeclaration FindParameterFromArgument(VBAParser.ArgumentExpressi
             }
 
             var procedure = MatchName(procedureName)
-                .Where(p => AccessibilityCheck.IsAccessible(enclosingProcedure, p))
-                .SingleOrDefault(p => !p.DeclarationType.HasFlag(DeclarationType.Property) || p.DeclarationType.HasFlag(DeclarationType.PropertyGet));
+                .SingleOrDefault(p =>
+                    (!p.DeclarationType.HasFlag(DeclarationType.Property) ||
+                     p.DeclarationType.HasFlag(DeclarationType.PropertyGet)) &&
+                    p.References.Any(r => callStmt == r.Context.GetAncestor<VBAParser.CallStmtContext>()));
             if (procedure?.ParentScopeDeclaration is ClassModuleDeclaration)
             {
                 // we can't know that the member is on the class' default interface

Original file line number	Diff line number	Diff line change
`@@ -552,8 +552,10 @@ public ParameterDeclaration FindParameterFromArgument(VBAParser.ArgumentExpressi`
`552`	`552`	`}`
`553`	`553`
`554`	`554`	`var procedure = MatchName(procedureName)`
`555`		`- .Where(p => AccessibilityCheck.IsAccessible(enclosingProcedure, p))`
`556`		`- .SingleOrDefault(p => !p.DeclarationType.HasFlag(DeclarationType.Property) \|\| p.DeclarationType.HasFlag(DeclarationType.PropertyGet));`
	`555`	`+ .SingleOrDefault(p =>`
	`556`	`+ (!p.DeclarationType.HasFlag(DeclarationType.Property) \|\|`
	`557`	`+ p.DeclarationType.HasFlag(DeclarationType.PropertyGet)) &&`
	`558`	`+ p.References.Any(r => callStmt == r.Context.GetAncestor<VBAParser.CallStmtContext>()));`
`557`	`559`	`if (procedure?.ParentScopeDeclaration is ClassModuleDeclaration)`
`558`	`560`	`{`
`559`	`561`	`// we can't know that the member is on the class' default interface`