Moved 'GetDeclarationAccessibleToScope(...) to DeclarationFinder per PR comment.

Author: BZngr

RetailCoder.VBE/Inspections/AccessibilityEvaluator.cs

@@ -14,8 +14,7 @@
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using System.Collections.Generic;
-using Rubberduck.Inspections;
+using System;
 
 namespace Rubberduck.Refactorings.Rename
 {
@@ -102,8 +101,8 @@ public void Refactor(Declaration target)
 
         private void Rename()
         {
-            var declaration = AccessibilityEvaluator.GetDeclarationsAccessibleToScope(_model.Target, _model.Declarations)
-                .Where(d => d.IdentifierName == _model.NewName).FirstOrDefault();
+            var declaration = _state.DeclarationFinder.GetDeclarationsAccessibleToScope(_model.Target, _model.Declarations)
+                .Where(d => d.IdentifierName.Equals(_model.NewName, StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault();
             if (declaration != null)
             {
                 var message = string.Format(RubberduckUI.RenameDialog_ConflictingNames, _model.NewName,

RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs

@@ -341,7 +341,6 @@
     <Compile Include="Common\WinAPI\WindowLongFlags.cs" />
     <Compile Include="Common\WindowsOperatingSystem.cs" />
     <Compile Include="Common\UndocumentedAttribute.cs" />
-    <Compile Include="Inspections\AccessibilityEvaluator.cs" />
     <Compile Include="Inspections\ApplicationWorksheetFunctionInspection.cs" />
     <Compile Include="Inspections\HostSpecificExpressionInspection.cs" />
     <Compile Include="Inspections\HungarianNotationInspection.cs" />

RetailCoder.VBE/Rubberduck.csproj

@@ -747,5 +747,64 @@ private ConcurrentBag<Declaration> FindEventHandlers(IEnumerable<Declaration> de
 
             return new ConcurrentBag<Declaration>(handlers);
         }
+
+        public IEnumerable<Declaration> GetDeclarationsAccessibleToScope(Declaration target, IEnumerable<Declaration> declarations)
+        {
+
+            object obj = new object();
+            lock (obj)
+            {
+                if (target == null) { return Enumerable.Empty<Declaration>(); }
+
+                return declarations
+                    .Where(candidateDeclaration =>
+                    (
+                           IsDeclarationInTheSameProcedure(candidateDeclaration, target)
+                        || IsDeclarationChildOfTheScope(candidateDeclaration, target)
+                        || IsModuleLevelDeclarationOfTheScope(candidateDeclaration, target)
+                        || IsProjectGlobalDeclaration(candidateDeclaration, target)
+                     )).Distinct();
+            }
+        }
+
+        private bool IsDeclarationInTheSameProcedure(Declaration candidateDeclaration, Declaration scopingDeclaration)
+        {
+            return candidateDeclaration.ParentScope == scopingDeclaration.ParentScope;
+        }
+
+        private bool IsDeclarationChildOfTheScope(Declaration candidateDeclaration, Declaration scopingDeclaration)
+        {
+            return scopingDeclaration == candidateDeclaration.ParentDeclaration;
+        }
+
+        private bool IsModuleLevelDeclarationOfTheScope(Declaration candidateDeclaration, Declaration scopingDeclaration)
+        {
+            if (candidateDeclaration.ParentDeclaration == null)
+            {
+                return false;
+            }
+            return candidateDeclaration.ComponentName == scopingDeclaration.ComponentName
+                    && !IsDeclaredWithinMethodOrProperty(candidateDeclaration.ParentDeclaration.Context);
+        }
+
+        private bool IsProjectGlobalDeclaration(Declaration candidateDeclaration, Declaration scopingDeclaration)
+        {
+            return candidateDeclaration.ProjectName == scopingDeclaration.ProjectName
+                && !(candidateDeclaration.ParentScopeDeclaration is ClassModuleDeclaration)
+                && (candidateDeclaration.Accessibility == Accessibility.Public
+                    || ((candidateDeclaration.Accessibility == Accessibility.Implicit)
+                        && (candidateDeclaration.ParentScopeDeclaration is ProceduralModuleDeclaration)));
+        }
+
+        private bool IsDeclaredWithinMethodOrProperty(RuleContext procedureContextCandidate)
+        {
+            if (procedureContextCandidate == null) { return false; }
+
+            return (procedureContextCandidate is VBAParser.SubStmtContext)
+                || (procedureContextCandidate is VBAParser.FunctionStmtContext)
+                || (procedureContextCandidate is VBAParser.PropertyLetStmtContext)
+                || (procedureContextCandidate is VBAParser.PropertyGetStmtContext)
+                || (procedureContextCandidate is VBAParser.PropertySetStmtContext);
+        }
     }
 }