Skip to content

Commit b43d1a6

Browse files
committed
Combined predicate functions
1 parent b1a1c2d commit b43d1a6

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -777,22 +777,16 @@ private bool IsProjectGlobalDeclaration(Declaration candidateDeclaration, Declar
777777
{
778778
return candidateDeclaration.ProjectName == scopingDeclaration.ProjectName
779779
&& !(candidateDeclaration.ParentScopeDeclaration is ClassModuleDeclaration)
780-
&& (IsExplicitPublicInOtherModule(candidateDeclaration, scopingDeclaration)
781-
|| IsImplicitPublicInOtherModule(candidateDeclaration, scopingDeclaration));
780+
&& (IsPublicInOtherModule(candidateDeclaration, scopingDeclaration));
782781
}
783782

784-
private bool IsExplicitPublicInOtherModule(Declaration candidateDeclaration, Declaration scopingDeclaration)
783+
private bool IsPublicInOtherModule(Declaration candidateDeclaration, Declaration scopingDeclaration)
785784
{
786785
return candidateDeclaration.ComponentName != scopingDeclaration.ComponentName
787-
&& candidateDeclaration.Accessibility == Accessibility.Public;
788-
}
789-
790-
private bool IsImplicitPublicInOtherModule(Declaration candidateDeclaration, Declaration scopingDeclaration)
791-
{
792-
return candidateDeclaration.ComponentName != scopingDeclaration.ComponentName
793-
&& candidateDeclaration.Accessibility == Accessibility.Implicit
794-
&& (candidateDeclaration.ParentScopeDeclaration is ProceduralModuleDeclaration)
795-
&& !candidateDeclaration.IdentifierName.StartsWith("Option ");
786+
&& (candidateDeclaration.Accessibility == Accessibility.Public
787+
|| (candidateDeclaration.Accessibility == Accessibility.Implicit)
788+
&& (candidateDeclaration.ParentScopeDeclaration is ProceduralModuleDeclaration)
789+
&& !candidateDeclaration.IdentifierName.StartsWith("Option "));
796790
}
797791

798792
private bool IsDeclaredWithinMethodOrProperty(RuleContext procedureContextCandidate)

0 commit comments

Comments
 (0)