Fix reorder params signature bugs.

Author: Hosch250

RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs

@@ -244,34 +244,33 @@ private void AdjustSignatures(Declaration declaration)
 
         private void RewriteSignature(Declaration target, VBAParser.ArgListContext paramList, CodeModule module)
         {
-            var argList = paramList.arg();
+            var parameters = paramList.arg().Select((s, i) => new {Index = i, Text = s.GetText()}).ToList();
 
-            var newContent = GetOldSignature(target);
-            var lineNum = paramList.GetSelection().LineCount;
-
-            var parameterIndex = 0;
-            var currentStringIndex = 0;
-
-            for (var i = parameterIndex; i < _model.Parameters.Count; i++)
+            var reorderedParams = new List<string>();
+            foreach (var param in _model.Parameters)
             {
-                var oldParam = argList.ElementAt(parameterIndex).GetText();
-                var newParam = argList.ElementAt(_model.Parameters.ElementAt(parameterIndex).Index).GetText();
-                var parameterStringIndex = newContent.IndexOf(oldParam, currentStringIndex, StringComparison.Ordinal);
-
-                if (parameterStringIndex > -1)
+                var parameterAtIndex = parameters.SingleOrDefault(s => s.Index == param.Index);
+                if (parameterAtIndex != null)
                 {
-                    var beginningSub = newContent.Substring(0, parameterStringIndex);
-                    var replaceSub = newContent.Substring(parameterStringIndex).Replace(oldParam, newParam);
-
-                    newContent = beginningSub + replaceSub;
-
-                    parameterIndex++;
-                    currentStringIndex = beginningSub.Length + newParam.Length;
+                    reorderedParams.Add(parameterAtIndex.Text);
                 }
             }
 
-            module.ReplaceLine(paramList.Start.Line, newContent.Replace(" _" + Environment.NewLine, string.Empty));
-            module.DeleteLines(paramList.Start.Line + 1, lineNum - 1);
+            // property let/set and paramarrays
+            for (var index = reorderedParams.Count; index < parameters.Count; index++)
+            {
+                reorderedParams.Add(parameters[index].Text);
+            }
+
+            var signature = GetOldSignature(target);
+            signature = signature.Remove(signature.IndexOf('('));
+
+            var asTypeText = target.AsTypeContext == null ? string.Empty : " " + target.AsTypeContext.GetText();
+            signature += '(' + string.Join(", ", reorderedParams) + ")" + (asTypeText == " " ? string.Empty : asTypeText);
+
+            var lineCount = paramList.GetSelection().LineCount;
+            module.ReplaceLine(paramList.Start.Line, signature.Replace(" _" + Environment.NewLine, string.Empty));
+            module.DeleteLines(paramList.Start.Line + 1, lineCount - 1);
         }
 
         private string GetOldSignature(Declaration target)

RubberduckTests/Refactoring/ReorderParametersTests.cs

@@ -65,6 +65,49 @@ public void ReorderParams_SwapPositions()
             Assert.AreEqual(expectedCode, module.Lines());
         }
 
+        [TestMethod]
+        public void ReorderParams_SwapPositions_SignatureContainsParamName()
+        {
+            //Input
+            const string inputCode =
+@"Private Sub Foo(a, ba)
+End Sub";
+            var selection = new Selection(1, 16, 1, 16);
+
+            //Expectation
+            const string expectedCode =
+@"Private Sub Foo(ba, a)
+End Sub";
+
+            //Arrange
+            var builder = new MockVbeBuilder();
+            VBComponent component;
+            var vbe = builder.BuildFromSingleStandardModule(inputCode, out component, selection);
+            var project = vbe.Object.VBProjects.Item(0);
+            var module = project.VBComponents.Item(0).CodeModule;
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+            var parser = MockParser.Create(vbe.Object, new RubberduckParserState(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);
+
+            //set up model
+            var model = new ReorderParametersModel(parser.State, qualifiedSelection, null);
+            model.Parameters.Reverse();
+
+            var factory = SetupFactory(model);
+
+            //act
+            var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null);
+            refactoring.Refactor(qualifiedSelection);
+
+            //assert
+            Assert.AreEqual(expectedCode, module.Lines());
+        }
+
         [TestMethod]
         public void ReorderParams_RefactorDeclaration()
         {
@@ -634,7 +677,7 @@ public void ReorderParametersRefactoring_SignatureOnMultipleLines()
 
             //Expectation
             const string expectedCode =
-@"Private Sub Foo(ByVal arg3 As Date,                  ByVal arg2 As String,                  ByVal arg1 As Integer)
+@"Private Sub Foo(ByVal arg3 As Date, ByVal arg2 As String, ByVal arg1 As Integer)
 End Sub";   // note: IDE removes excess spaces
 
             //Arrange