Fix a few more tests (still WIP)

RetailCoder.VBE/Inspections/QuickFixes/AssignedByValParameterMakeLocalCopyQuickFix.cs

@@ -103,7 +103,7 @@ private void InsertLocalVariableDeclarationAndAssignment(IModuleRewriter rewrite
                 + (_target.AsTypeDeclaration is ClassModuleDeclaration ? Tokens.Set + " " : string.Empty)
                 + localIdentifier + " = " + _target.IdentifierName;
 
-            rewriter.InsertAtIndex(content, ((ParserRuleContext)_target.Context.Parent).Start.TokenIndex);
+            rewriter.InsertAtIndex("\r\n" + content, ((ParserRuleContext)_target.Context.Parent).Stop.TokenIndex + 1);
         }
     }
 }

RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs

@@ -75,7 +75,7 @@ public void Refactor(Declaration target)
                 _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption,
                     MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 
-                throw new ArgumentException(@"Invalid declaration type", "target");
+                return;
             }
 
             PromoteVariable(target);
@@ -112,8 +112,6 @@ private void PromoteVariable(Declaration target)
             {
                 pane.Selection = oldSelection.Value.Selection;
             }
-
-            _state.OnParseRequested(this);
         }
 
         private bool PromptIfMethodImplementsInterface(Declaration targetVariable)
@@ -194,7 +192,7 @@ private void AddParameter(IModuleRewriter rewriter, Declaration targetMethod, De
             var argList = paramList.arg();
             var lastParam = argList.LastOrDefault();
             var newParameter = Tokens.ByVal + " " + targetVariable.IdentifierName + " "+ Tokens.As + " " + targetVariable.AsTypeName;
-            var newContent = GetOldSignature(rewriter, targetMethod);
+            var newContent = paramList.GetText(); //GetOldSignature(rewriter, targetMethod);
 
             if (lastParam == null)
             {

RetailCoder.VBE/Refactorings/MoveCloserToUsage/MoveCloserToUsageRefactoring.cs

@@ -66,9 +66,7 @@ public void Refactor(Declaration target)
             {
                 _messageBox.Show(RubberduckUI.MoveCloserToUsage_InvalidSelection, RubberduckUI.IntroduceParameter_Caption,
                     MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-
-                // ReSharper disable once LocalizableElement
-                throw new ArgumentException("Invalid Argument. DeclarationType must be 'Variable'", "target");
+                return;
             }
 
             _target = target;

RubberduckTests/Inspections/ConstantNotUsedInspectionTests.cs

@@ -187,7 +187,7 @@ public void ConstantNotUsed_QuickFixWorks()
         {
             const string inputCode =
 @"Public Sub Foo()
-    Const const1 As Integer = 9
+Const const1 As Integer = 9
 End Sub";
 
             const string expectedCode =

RubberduckTests/Inspections/ProcedureNotUsedInspectionTests.cs

@@ -269,7 +269,9 @@ public void ProcedureNotUsed_QuickFixWorks()
             var inspectionResults = inspection.GetInspectionResults();
 
             inspectionResults.First().QuickFixes.First().Fix();
-            Assert.AreEqual(expectedCode, component.CodeModule.Content());
+
+            var rewriter = state.GetRewriter(component);
+            Assert.AreEqual(expectedCode, rewriter.GetText());
         }
 
         [TestMethod]

RubberduckTests/Inspections/VariableNotAssignedInspectionTests.cs

@@ -98,8 +98,8 @@ public void VariableNotAssigned_Ignored_DoesNotReturnResult()
         {
             const string inputCode =
 @"Sub Foo()
-    '@Ignore VariableNotAssigned
-    Dim var1 As String
+'@Ignore VariableNotAssigned
+Dim var1 As String
 End Sub";
 
             IVBComponent component;
@@ -118,7 +118,7 @@ public void UnassignedVariable_QuickFixWorks()
         {
             const string inputCode =
 @"Sub Foo()
-    Dim var1 as Integer
+Dim var1 as Integer
 End Sub";
 
             const string expectedCode =
@@ -140,10 +140,10 @@ public void UnassignedVariable_VariableOnMultipleLines_QuickFixWorks()
         {
             const string inputCode =
 @"Sub Foo()
-    Dim _
-    var1 _
-    as _
-    Integer
+Dim _
+var1 _
+as _
+Integer
 End Sub";
 
             const string expectedCode =
@@ -165,13 +165,13 @@ public void UnassignedVariable_MultipleVariablesOnSingleLine_QuickFixWorks()
         {
             const string inputCode =
 @"Sub Foo()
-    Dim var1 As Integer, var2 As Boolean
+Dim var1 As Integer, var2 As Boolean
 End Sub";
 
             // note the extra space after "Integer"--the VBE will remove it
             const string expectedCode =
 @"Sub Foo()
-    Dim var1 As Integer 
+Dim var1 As Integer
 End Sub";
 
             IVBComponent component;
@@ -189,13 +189,13 @@ public void UnassignedVariable_MultipleVariablesOnMultipleLines_QuickFixWorks()
         {
             const string inputCode =
 @"Sub Foo()
-    Dim var1 As Integer, _
-        var2 As Boolean
+Dim var1 As Integer, _
+var2 As Boolean
 End Sub";
 
             const string expectedCode =
 @"Sub Foo()
-    Dim var1 As Integer
+Dim var1 As Integer
 End Sub";
 
             IVBComponent component;
@@ -214,13 +214,13 @@ public void UnassignedVariable_IgnoreQuickFixWorks()
         {
             const string inputCode =
 @"Sub Foo()
-    Dim var1 as Integer
+Dim var1 as Integer
 End Sub";
 
             const string expectedCode =
 @"Sub Foo()
 '@Ignore VariableNotAssigned
-    Dim var1 as Integer
+Dim var1 as Integer
 End Sub";
 
             IVBComponent component;

RubberduckTests/Inspections/VariableNotUsedInspectionTests.cs

@@ -148,7 +148,7 @@ public void UnassignedVariable_QuickFixWorks()
         {
             const string inputCode =
 @"Sub Foo()
-    Dim var1 As String
+Dim var1 As String
 End Sub";
 
             const string expectedCode =
@@ -162,7 +162,8 @@ Dim var1 As String
             var inspection = new VariableNotUsedInspection(state);
             inspection.GetInspectionResults().First().QuickFixes.First().Fix();
 
-            Assert.AreEqual(expectedCode, component.CodeModule.Content());
+            var rewriter = state.GetRewriter(component);
+            Assert.AreEqual(expectedCode, rewriter.GetText());
         }
 
         [TestMethod]
@@ -171,13 +172,13 @@ public void UnassignedVariable_IgnoreQuickFixWorks()
         {
             const string inputCode =
 @"Sub Foo()
-    Dim var1 As String
+Dim var1 As String
 End Sub";
 
             const string expectedCode =
 @"Sub Foo()
 '@Ignore VariableNotUsed
-    Dim var1 As String
+Dim var1 As String
 End Sub";
 
             IVBComponent component;