Make everything happy again.

Author: Hosch250

RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs

@@ -91,7 +91,7 @@ private void AddItems(List<Declaration> members)
 
             var missingMembersText = members.Aggregate(string.Empty, (current, member) => current + Environment.NewLine + GetInterfaceMember(member));
 
-            module.InsertLines(module.CountOfDeclarationLines + 2, missingMembersText);
+            module.InsertLines(module.CountOfDeclarationLines + 1, missingMembersText);
         }
 
         private string GetInterfaceMember(Declaration member)

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

@@ -4,6 +4,7 @@
 using Rubberduck.Parsing.Binding;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.Extensions;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;

RubberduckTests/Mocks/MockProjectBuilder.cs

@@ -270,17 +270,7 @@ private Mock<CodeModule> CreateCodeModuleMock(string content)
             var codeModule = new Mock<CodeModule>();
             codeModule.SetupGet(c => c.CountOfLines).Returns(() => lines.Count);
             codeModule.SetupGet(c => c.CountOfDeclarationLines).Returns(() =>
-            {
-                var declarationLines =  lines.TakeWhile(line => !ModuleBodyTokens.Any(line.Contains)).ToList();
-                for (var i = declarationLines.Count - 1; i >= 0; i--)
-                {
-                    if (!string.IsNullOrWhiteSpace(declarationLines[i]))
-                    {
-                        return i;
-                    }
-                }
-                return 0;
-            });
+                lines.TakeWhile(line => !ModuleBodyTokens.Any(line.Contains)).Count());
 
             // ReSharper disable once UseIndexedProperty
             codeModule.Setup(m => m.get_Lines(It.IsAny<int>(), It.IsAny<int>()))
@@ -297,7 +287,7 @@ private Mock<CodeModule> CreateCodeModuleMock(string content)
                 {
                     if (index - 1 >= lines.Count)
                     {
-                        lines.AddRange(newLine.Split(new[] {Environment.NewLine}, StringSplitOptions.None));
+                        lines.AddRange(newLine.Split(new[] { Environment.NewLine }, StringSplitOptions.None));
                     }
                     else
                     {

RubberduckTests/Refactoring/ExtractInterfaceTests.cs

@@ -32,11 +32,11 @@ public void ExtractInterfaceRefactoring_ImplementProc()
             const string expectedCode =
 @"Implements ITestModule1
 
+
 Private Sub ITestModule1_Foo(ByVal arg1 As Integer, ByVal arg2 As String)
     Err.Raise 5 'TODO implement interface member
 End Sub
 
-
 Public Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String)
 End Sub";
 
@@ -107,6 +107,7 @@ Public Property Set Buzz(value)
             const string expectedCode =
 @"Implements ITestModule1
 
+
 Private Sub ITestModule1_Foo(ByVal arg1 As Integer, ByVal arg2 As String)
     Err.Raise 5 'TODO implement interface member
 End Sub
@@ -127,7 +128,6 @@ Private Property Set ITestModule1_Buzz(ByRef value As Variant)
     Err.Raise 5 'TODO implement interface member
 End Property
 
-
 Public Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String)
 End Sub
 
@@ -222,6 +222,7 @@ Public Property Set Buzz(value)
             const string expectedCode =
 @"Implements ITestModule1
 
+
 Private Sub ITestModule1_Foo(ByVal arg1 As Integer, ByVal arg2 As String)
     Err.Raise 5 'TODO implement interface member
 End Sub
@@ -230,7 +231,6 @@ Private Function ITestModule1_Fizz(ByRef b As Variant) As Variant
     Err.Raise 5 'TODO implement interface member
 End Function
 
-
 Public Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String)
 End Sub
 
@@ -414,11 +414,11 @@ public void ExtractInterfaceRefactoring_PassTargetIn()
             const string expectedCode =
 @"Implements ITestModule1
 
+
 Private Sub ITestModule1_Foo(ByVal arg1 As Integer, ByVal arg2 As String)
     Err.Raise 5 'TODO implement interface member
 End Sub
 
-
 Public Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String)
 End Sub";
 

RubberduckTests/Refactoring/ImplementInterfaceTests.cs

@@ -64,6 +64,59 @@ End Sub
             Assert.AreEqual(expectedCode, module.Lines());
         }
 
+        [TestMethod]
+        public void ImplementInterface_Procedure_ClassHasOtherProcedure()
+        {
+            //Input
+            const string inputCode1 =
+@"Public Sub Foo()
+End Sub";
+
+            const string inputCode2 =
+@"Implements Class1
+Public Sub Bar()
+End Sub";
+
+            var selection = new Selection(1, 1, 1, 1);
+
+            //Expectation
+            const string expectedCode =
+@"Implements Class1
+
+Private Sub Class1_Foo()
+    Err.Raise 5 'TODO implement interface member
+End Sub
+
+Public Sub Bar()
+End Sub";
+
+            //Arrange
+            var builder = new MockVbeBuilder();
+            var project = builder.ProjectBuilder("TestProject1", vbext_ProjectProtection.vbext_pp_none)
+                 .AddComponent("Class1", vbext_ComponentType.vbext_ct_ClassModule, inputCode1)
+                 .AddComponent("Class2", vbext_ComponentType.vbext_ct_ClassModule, inputCode2)
+                 .Build();
+            var vbe = builder.AddProject(project).Build();
+            var component = project.Object.VBComponents.Item(1);
+
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+            var parser = MockParser.Create(vbe.Object, new RubberduckParserState(vbe.Object, new Mock<ISinks>().Object));
+
+            parser.Parse(new CancellationTokenSource());
+            if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
+
+            var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
+            var module = project.Object.VBComponents.Item(1).CodeModule;
+
+            //Act
+            var refactoring = new ImplementInterfaceRefactoring(vbe.Object, parser.State, null);
+            refactoring.Refactor(qualifiedSelection);
+
+            //Assert
+            Assert.AreEqual(expectedCode, module.Lines());
+        }
+
         [TestMethod]
         public void ImplementInterface_Procedure_WithParams()
         {