Merge pull request #4243 from comintern/issue3906

Fix association of property implementations to declaring interfaces

Author: retailcoder

Rubberduck.CodeAnalysis/Inspections/Concrete/ParameterCanBeByValInspection.cs

@@ -90,11 +90,11 @@ private IEnumerable<IInspectionResult> GetResults(Declaration[] declarations, De
                         .ThenBy(t => t.Selection.StartColumn)
                         .ToList();
 
+                    //If you hit this assert, reopen https://github.com/rubberduck-vba/Rubberduck/issues/3906
+                    Debug.Assert(parametersAreByRef.Count == parameters.Count);
+
                     for (var i = 0; i < parameters.Count; i++)
                     {
-                        //If you hit this assert, congratulations! you've found a test case for https://github.com/rubberduck-vba/Rubberduck/issues/3906
-                        //Please examine the code, and if possible, either fix the indexing on this or upload your failing code to the GitHub issue.
-                        Debug.Assert(parametersAreByRef.Count == parameters.Count);
                         parametersAreByRef[i] = parametersAreByRef[i] &&
                                                 !IsUsedAsByRefParam(declarations, parameters[i]) &&
                                                 ((VBAParser.ArgContext) parameters[i].Context).BYVAL() == null &&

Rubberduck.Refactorings/Common/DeclarationExtensions.cs

@@ -417,7 +417,8 @@ public static IEnumerable<Declaration> FindInterfaceImplementationMembers(this I
         public static IEnumerable<Declaration> FindInterfaceImplementationMembers(this IEnumerable<Declaration> declarations, Declaration interfaceDeclaration)
         {
             return FindInterfaceImplementationMembers(declarations)
-                .Where(m => m.IdentifierName == interfaceDeclaration.ComponentName + "_" + interfaceDeclaration.IdentifierName);
+                .Where(m => m.DeclarationType == interfaceDeclaration.DeclarationType && m.IdentifierName ==
+                            interfaceDeclaration.ComponentName + "_" + interfaceDeclaration.IdentifierName);
         }
 
         public static Declaration FindInterfaceMember(this IEnumerable<Declaration> declarations, Declaration implementation)

RubberduckTests/RubberduckTests.csproj

@@ -119,6 +119,7 @@
     <Compile Include="Mocks\MockExtentions.cs" />
     <Compile Include="Inspections\DefTypeStatementInspectionTests.cs" />
     <Compile Include="Inspections\InspectionProviderTests.cs" />
+    <Compile Include="Symbols\DeclarationExtensionTests.cs" />
     <Compile Include="Symbols\ToVbExpressionTests.cs" />
     <Compile Include="UnitTesting\TestMethodTests.cs" />
     <Compile Include="VBEditor\Utility\DisposalActionContainerTests.cs" />

RubberduckTests/Symbols/DeclarationExtensionTests.cs

@@ -0,0 +1,61 @@
+using System.Linq;
+using System.Threading;
+using NUnit.Framework;
+using Rubberduck.Common;
+using Rubberduck.Parsing.Symbols;
+using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.SafeComWrappers;
+using RubberduckTests.Mocks;
+
+namespace RubberduckTests.Symbols
+{
+    [TestFixture]
+    public class DeclarationExtensionTests
+    {
+        [Test]
+        [Category("Resolver")]
+        public void FindInterfaceImplementationMembersMatchesDeclarationTypes()
+        {
+            var intrface =
+@"Option Explicit
+
+Public Property Get Foo(Bar As Long) As Long
+End Property
+
+Public Property Let Foo(Bar As Long, NewValue As Long)
+End Property
+";
+
+            var implementation =
+@"Option Explicit
+
+Implements TestInterface
+
+Private Property Get TestInterface_Foo(Bar As Long) As Long
+End Property
+
+Private Property Let TestInterface_Foo(Bar As Long, RHS As Long)
+End Property
+";
+            var vbe = new MockVbeBuilder()
+                .ProjectBuilder("UnderTest", ProjectProtection.Unprotected)
+                .AddComponent("TestInterface", ComponentType.ClassModule, intrface, new Selection(1, 1))
+                .AddComponent("TestImplementation", ComponentType.ClassModule, implementation, new Selection(1, 1))
+                .AddProjectToVbeBuilder()
+                .Build();
+
+            var parser = MockParser.Create(vbe.Object);
+            parser.Parse(new CancellationTokenSource());
+
+            var declarations = parser.State.DeclarationFinder.AllDeclarations.ToList();
+            var declaration = declarations.Single(decl => decl.DeclarationType == DeclarationType.PropertyGet && decl.IdentifierName.Equals("Foo"));
+
+            var expected = declarations.Single(decl => decl.DeclarationType == DeclarationType.PropertyGet && decl.IdentifierName.Equals("TestInterface_Foo"));
+            var actual = declarations.FindInterfaceImplementationMembers(declaration).ToList();
+            var results = actual.Count;
+
+            Assert.AreEqual(1, results, "Expected {0} Declarations, received {1}", expected, results);
+            Assert.AreEqual(expected, actual.First(), "Expected {0}, resolved to {1}", expected, actual);
+        }
+    }
+}