Merge branch 'next' into obsoleteCommentBugs

Author: Hosch250

RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs

@@ -66,7 +66,7 @@ public override void Fix()
                 return;
             }
 
-            var fixedCodeLine = codeLine.Replace(originalInstruction, fix);
+            var fixedCodeLine = codeLine.Remove(Context.Start.Column, originalInstruction.Length).Insert(Context.Start.Column, fix);
             codeModule.ReplaceLine(Selection.Selection.StartLine, fixedCodeLine);
         }
 

RubberduckTests/Inspections/VariableTypeNotDeclaredInspectionTests.cs

@@ -279,6 +279,38 @@ public void VariableTypeNotDeclared_QuickFixWorks_Parameter()
             Assert.AreEqual(expectedCode, actual);
         }
 
+        [TestMethod]
+        [TestCategory("Inspections")]
+        public void VariableTypeNotDeclared_QuickFixWorks_SubNameContainsParameterName()
+        {
+            const string inputCode =
+@"Sub Foo(Foo)
+End Sub";
+
+            const string expectedCode =
+@"Sub Foo(Foo As Variant)
+End Sub";
+
+            //Arrange
+            var builder = new MockVbeBuilder();
+            VBComponent component;
+            var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
+            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(vbe.Object, new Mock<ISinks>().Object));
+
+            parser.Parse(new CancellationTokenSource());
+            if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
+
+            var inspection = new VariableTypeNotDeclaredInspection(parser.State);
+            inspection.GetInspectionResults().First().QuickFixes.First().Fix();
+
+            var actual = module.Lines();
+            Assert.AreEqual(expectedCode, actual);
+        }
+
         [TestMethod]
         [TestCategory("Inspections")]
         public void VariableTypeNotDeclared_QuickFixWorks_Variable()