removed use of regular expression in PassParameterByReferenceQuickFix

Author: BZngr

RetailCoder.VBE/Inspections/QuickFixes/PassParameterByReferenceQuickFix.cs

@@ -4,6 +4,7 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.VBEditor;
 using System.Text.RegularExpressions;
+using static Rubberduck.Parsing.Grammar.VBAParser;
 
 namespace Rubberduck.Inspections.QuickFixes
 {
@@ -19,21 +20,26 @@ public PassParameterByReferenceQuickFix(ParserRuleContext context, QualifiedSele
 
         public override void Fix()
         {
-            string pattern = "^\\s*" + Tokens.ByVal + "(\\s+)";
-            string rgxReplacement = Tokens.ByRef + "$1";
-            Regex rgx = new Regex(pattern);
+            var byValParameter = Context.GetText();
 
-            var parameter = Context.GetText();
-            var newParameter = rgx.Replace(parameter, rgxReplacement);
+            var byRefParameter = BuildByRefParameter(byValParameter);
 
-            var selection = Selection.Selection;
+            ReplaceByValParameterInModule(byValParameter, byRefParameter);
+        }
 
+        private string BuildByRefParameter(string originalParameter)
+        {
+            var everythingAfterTheByValToken = originalParameter.Substring(Tokens.ByVal.Length);
+            return Tokens.ByRef + everythingAfterTheByValToken;
+        }
+        private void ReplaceByValParameterInModule( string byValParameter, string byRefParameter)
+        {
+            var selection = Selection.Selection;
             var module = Selection.QualifiedName.Component.CodeModule;
-            {
-                var lines = module.GetLines(selection.StartLine, selection.LineCount);
-                var result = lines.Replace(parameter, newParameter);
-                module.ReplaceLine(selection.StartLine, result);
-            }
+
+            var lines = module.GetLines(selection.StartLine, selection.LineCount);
+            var result = lines.Replace(byValParameter, byRefParameter);
+            module.ReplaceLine(selection.StartLine, result);
         }
     }
 }

RubberduckTests/Inspections/AssignedByValParameterInspectionTests.cs

@@ -97,17 +97,30 @@ Dim var1 As Integer
         [TestCategory("Inspections")]
         public void AssignedByValParameter_QuickFixWorks()
         {
-            const string inputCode =
+            string inputCode =
 @"Public Sub Foo(ByVal barByVal As String)
     Let barByVal = ""test""
 End Sub";
-            const string expectedCode =
+            string expectedCode =
 @"Public Sub Foo(ByRef barByVal As String)
     Let barByVal = ""test""
 End Sub";
 
             var quickFixResult = ApplyPassParameterByReferenceQuickFixToVBAFragment(inputCode);
             Assert.AreEqual(expectedCode, quickFixResult);
+
+            //check when ByVal argument is one of several parameters
+            inputCode =
+@"Public Sub Foo(ByRef firstArg As Long, ByVal barByVal As String, secondArg as Double)
+    Let barByVal = ""test""
+End Sub";
+            expectedCode =
+@"Public Sub Foo(ByRef firstArg As Long, ByRef barByVal As String, secondArg as Double)
+    Let barByVal = ""test""
+End Sub";
+
+            quickFixResult = ApplyPassParameterByReferenceQuickFixToVBAFragment(inputCode);
+            Assert.AreEqual(expectedCode, quickFixResult);
         }
 
         [TestMethod]
@@ -507,9 +520,6 @@ private Mock<IVBE> BuildMockVBEStandardModuleForVBAFragment(string inputCode)
         {
             var builder = new MockVbeBuilder();
             IVBComponent component;
-            //TODO: removal of the two lines below have no effect on the outcome of any test...remove?
-            //var mockHost = new Mock<IHostApplication>();
-            //mockHost.SetupAllProperties();
             return builder.BuildFromSingleStandardModule(inputCode, out component);
 
         }