Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into FixTestMethodCommands

Author: Hosch250

RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
@@ -90,7 +91,25 @@ private string DeclareExplicitVariant(VBAParser.ArgContext context, out string i
             }
 
             instruction = context.GetText();
-            return instruction + ' ' + Tokens.As + ' ' + Tokens.Variant;
+            if (!context.children.Select(s => s.GetType()).Contains(typeof(VBAParser.ArgDefaultValueContext)))
+            {
+                return instruction + ' ' + Tokens.As + ' ' + Tokens.Variant;
+            }
+
+            var fix = string.Empty;
+            var hasArgDefaultValue = false;
+            foreach (var child in context.children)
+            {
+                if (child.GetType() == typeof(VBAParser.ArgDefaultValueContext))
+                {
+                    fix += Tokens.As + ' ' + Tokens.Variant + ' ';
+                    hasArgDefaultValue = true;
+                }
+
+                fix += child.GetText();
+            }
+
+            return hasArgDefaultValue ? fix : fix + ' ' + Tokens.As + ' ' + Tokens.Variant;
         }
 
         private string DeclareExplicitVariant(VBAParser.ConstSubStmtContext context, out string instruction)

RubberduckTests/Inspections/VariableTypeNotDeclaredInspectionTests.cs

@@ -286,6 +286,68 @@ Dim var1 As Variant
             Assert.AreEqual(expectedCode, module.Lines());
         }
 
+        [TestMethod]
+        [TestCategory("Inspections")]
+        public void VariableTypeNotDeclared_ReturnsResult_QuickFixWorks_ParameterWithoutDefaultValue()
+        {
+            const string inputCode =
+@"Sub Foo(ByVal Fizz)
+End Sub";
+
+            const string expectedCode =
+@"Sub Foo(ByVal Fizz 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();
+
+            Assert.AreEqual(expectedCode, module.Lines());
+        }
+
+        [TestMethod]
+        [TestCategory("Inspections")]
+        public void VariableTypeNotDeclared_ReturnsResult_QuickFixWorks_ParameterWithDefaultValue()
+        {
+            const string inputCode =
+@"Sub Foo(ByVal Fizz = False)
+End Sub";
+
+            const string expectedCode =
+@"Sub Foo(ByVal Fizz As Variant = False)
+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();
+
+            Assert.AreEqual(expectedCode, module.Lines());
+        }
+
         [TestMethod]
         [TestCategory("Inspections")]
         public void InspectionType()