Make Implement Interface use the rewriter

rubberduck-vba · Mar 18, 2017 · 3174f11 · 3174f11
1 parent 90a0ae8
commit 3174f11
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 176 deletions.
diff --git a/RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs b/RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs
@@ -105,13 +105,15 @@ private void ImplementMissingMembers()
             AddItems(nonImplementedMembers);
         }
 
-        private void AddItems(List<Declaration> members)
+        private void AddItems(List<Declaration> missingMembers)
         {
-            var module = _targetClass.QualifiedSelection.QualifiedName.Component.CodeModule;
-            {
-                var missingMembersText = members.Aggregate(string.Empty, (current, member) => current + Environment.NewLine + GetInterfaceMember(member));
-                module.InsertLines(module.CountOfDeclarationLines + 1, missingMembersText);
-            }
+            var missingMembersText = missingMembers.Aggregate(string.Empty,
+                (current, member) => current + Environment.NewLine + GetInterfaceMember(member));
+
+            var rewriter = _state.GetRewriter(_targetClass);
+            rewriter.InsertAfter(rewriter.TokenStream.Size, Environment.NewLine + missingMembersText);
+
+            rewriter.Rewrite();
         }
 
         private string GetInterfaceMember(Declaration member)

diff --git a/RetailCoder.VBE/Refactorings/MoveCloserToUsage/MoveCloserToUsageRefactoring.cs b/RetailCoder.VBE/Refactorings/MoveCloserToUsage/MoveCloserToUsageRefactoring.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Antlr4.Runtime;
 using Rubberduck.Common;
-using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.PostProcessing;
 using Rubberduck.Parsing.Symbols;