Resolve review comments

Author: BZngr

Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs

@@ -1302,7 +1302,7 @@ public IEnumerable<Declaration> FindNewDeclarationNameConflicts(string newName,
                 return Enumerable.Empty<Declaration>();
             }
 
-            var identifierMatches = MatchName(newName).Where(match => match.Project == renameTarget.Project);
+            var identifierMatches = MatchName(newName).Where(match => match.ProjectId == renameTarget.ProjectId);
 
             if (!identifierMatches.Any())
             {
@@ -1327,7 +1327,8 @@ public IEnumerable<Declaration> FindNewDeclarationNameConflicts(string newName,
                                 && !UsesScopeResolution(renameTargetRef.Context.Parent)))
                 || idm.DeclarationType.HasFlag(DeclarationType.Variable)
                     && idm.ParentDeclaration.DeclarationType.HasFlag(DeclarationType.Module)
-                    && renameTarget.References.Any(renameTargetRef => renameTargetRef.QualifiedModuleName == idm.ParentDeclaration.QualifiedModuleName));
+                    && renameTarget.References.Any(renameTargetRef => renameTargetRef.QualifiedModuleName == idm.ParentDeclaration.QualifiedModuleName))
+                    .ToList();
 
             if (referenceConflicts.Any())
             {
@@ -1342,7 +1343,8 @@ public IEnumerable<Declaration> FindNewDeclarationNameConflicts(string newName,
                     renameTargetModule,
                     renameTarget.ParentDeclaration,
                     idm)
-                    && IsConflictingMember(renameTarget, renameTargetModule, idm));
+                    && IsConflictingMember(renameTarget, renameTargetModule, idm))
+                    .ToList();
 
             return declarationConflicts;
         }

RubberduckTests/Symbols/DeclarationFinderTests.cs

@@ -450,10 +450,10 @@ End Sub
         //https://github.com/rubberduck-vba/Rubberduck/issues/4969
         private const string projectOneModuleName = "projectOneModule";
         private const string projectTwoModuleName = "projectTwoModule";
-        [TestCase(projectOneModuleName, ExpectedResult = 0)]  //Duplicate module name found in a separate project
-        [TestCase(projectTwoModuleName, ExpectedResult = 1)] //Duplicate module name found in the same project
+        [TestCase(projectOneModuleName, 0)]  //Duplicate module name found in a separate project
+        [TestCase(projectTwoModuleName, 1)] //Duplicate module name found in the same project
         [Category("Resolver")]
-        public int DeclarationFinder_NameConflictDetectionRespectsProjectScope(string proposedTestModuleName)
+        public void DeclarationFinder_NameConflictDetectionRespectsProjectScope(string proposedTestModuleName, int expectedCount)
         {
 
             string renameTargetModuleName = "TargetModule";
@@ -476,11 +476,12 @@ public int DeclarationFinder_NameConflictDetectionRespectsProjectScope(string pr
 
             using(var parser = MockParser.CreateAndParse(vbe))
             {
-                var target = parser.DeclarationFinder.AllDeclarations
+                var target = parser.DeclarationFinder.UserDeclarations(DeclarationType.ProceduralModule)
                     .FirstOrDefault(item => item.IdentifierName.Equals(renameTargetModuleName));
 
                 var results = parser.DeclarationFinder.FindNewDeclarationNameConflicts(proposedTestModuleName, target);
-                return results.Count();
+
+                Assert.AreEqual(expectedCount, results.Count());
             }
         }