Used DeclarationType.ModuleOption to replace string op

rubberduck-vba · Mar 8, 2017 · e9050d8 · e9050d8
1 parent b43d1a6
commit e9050d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Rubberduck.Parsing/Symbols/DeclarationFinder.cs b/Rubberduck.Parsing/Symbols/DeclarationFinder.cs
@@ -786,7 +786,7 @@ private bool IsPublicInOtherModule(Declaration candidateDeclaration, Declaration
                         && (candidateDeclaration.Accessibility == Accessibility.Public
                             || (candidateDeclaration.Accessibility == Accessibility.Implicit)
                                 && (candidateDeclaration.ParentScopeDeclaration is ProceduralModuleDeclaration)
-                                && !candidateDeclaration.IdentifierName.StartsWith("Option "));
+                                && !(candidateDeclaration.DeclarationType == DeclarationType.ModuleOption));
         }
 
         private bool IsDeclaredWithinMethodOrProperty(RuleContext procedureContextCandidate)

diff --git a/RubberduckTests/Symbols/DeclarationFinderTests.cs b/RubberduckTests/Symbols/DeclarationFinderTests.cs
@@ -141,7 +141,7 @@ private void SetupSUT(string projectName)
 
             string[] accessibleWithinParentProcedure = { "arg1", "FooBar1", "targetAccessibilityTests", "theSecondArg" };
             string[] accessibleModuleScope = { "memberString", "memberLong", "myEggo", "Foo", "FooBar1", "GoMyEggo", "FooFight" };
-            string[] accessibleGlobalScope = { "CantTouchThis", "BigNumber", "DoSomething", "SetFilename", "ShortStory","THE_FILENAME" };
+            string[] accessibleGlobalScope = { "CantTouchThis", "BigNumber", "DoSomething", "SetFilename", "ShortStory","THE_FILENAME"};
 
             _accessibilityTests_ProcedureScopeNames = accessibleWithinParentProcedure.ToList();
             _accessibilityTests_ModuleScopeNames = accessibleModuleScope.ToList();