Merge pull request #1199 from retailcoder/next

Fixes broken tests

Author: retailcoder

RetailCoder.VBE/Inspections/ConvertToProcedureQuickFix.cs

@@ -1,10 +1,13 @@
-using Antlr4.Runtime;
+using System;
+using Antlr4.Runtime;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Microsoft.Vbe.Interop;
+using Rubberduck.Parsing.Symbols;
 
 namespace Rubberduck.Inspections
 {
@@ -25,25 +28,42 @@ public ConvertToProcedureQuickFix(ParserRuleContext context, QualifiedSelection
 
         public override void Fix()
         {
-            var context = (VBAParser.FunctionStmtContext)Context;
-            var visibility = context.visibility() == null ? string.Empty : context.visibility().GetText() + ' ';
-            var name = ' ' + context.ambiguousIdentifier().GetText();
-            var args = context.argList().GetText();
-            var asType = context.asTypeClause() == null ? string.Empty : ' ' + context.asTypeClause().GetText();
+            dynamic functionContext = Context as VBAParser.FunctionStmtContext;
+            dynamic propertyGetContext = Context as VBAParser.PropertyGetStmtContext;
 
-            var oldSignature = visibility + Tokens.Function + name + args + asType;
-            var newSignature = visibility + Tokens.Sub + name + args;
+            var context = functionContext ?? propertyGetContext;
+            if (context == null)
+            {
+                throw new InvalidOperationException(string.Format("Context type '{0}' is not valid for {1}.", Context.GetType(), GetType()));
+            }
 
-            var procedure = Context.GetText();
+            string token = functionContext != null
+                ? Tokens.Function
+                : Tokens.Property + ' ' + Tokens.Get;
+            string endToken = token == Tokens.Function
+                ? token
+                : Tokens.Property;
+
+            string visibility = context.visibility() == null ? string.Empty : context.visibility().GetText() + ' ';
+            string name = ' ' + context.ambiguousIdentifier().GetText();
+            bool hasTypeHint = context.typeHint() != null;
+
+            string args = context.argList().GetText();
+            string asType = context.asTypeClause() == null ? string.Empty : ' ' + context.asTypeClause().GetText();
+
+            string oldSignature = visibility + token + name + (hasTypeHint ? context.typeHint().GetText() : string.Empty) + args + asType;
+            string newSignature = visibility + Tokens.Sub + name + args;
+
+            string procedure = Context.GetText();
             string noReturnStatements = procedure;
             _returnStatements.ToList().ForEach(returnStatement =>
                 noReturnStatements = Regex.Replace(noReturnStatements, @"[ \t\f]*" + returnStatement + @"[ \t\f]*\r?\n?", ""));
-            var result = noReturnStatements.Replace(oldSignature, newSignature)
-                .Replace(Tokens.End + ' ' + Tokens.Function, Tokens.End + ' ' + Tokens.Sub)
-                .Replace(Tokens.Exit + ' ' + Tokens.Function, Tokens.Exit + ' ' + Tokens.Sub);
+            string result = noReturnStatements.Replace(oldSignature, newSignature)
+                .Replace(Tokens.End + ' ' + endToken, Tokens.End + ' ' + Tokens.Sub)
+                .Replace(Tokens.Exit + ' ' + endToken, Tokens.Exit + ' ' + Tokens.Sub);
 
-            var module = Selection.QualifiedName.Component.CodeModule;
-            var selection = Context.GetSelection();
+            CodeModule module = Selection.QualifiedName.Component.CodeModule;
+            Selection selection = Context.GetSelection();
 
             module.DeleteLines(selection.StartLine, selection.LineCount);
             module.InsertLines(selection.StartLine, result);

RubberduckTests/Inspections/NonReturningFunctionInspectionTests.cs

@@ -208,7 +208,7 @@ public void NonReturningFunction_QuickFixWorks_Function()
         }
 
         [TestMethod]
-        public void NonReturningFunction_QuickFixWorks_FunctionHasTypeHint()
+        public void GivenFunctionNameWithTypeHint_SubNameHasNoTypeHint()
         {
             const string inputCode =
 @"Function Foo$()
@@ -304,7 +304,7 @@ public void NonReturningFunction_QuickFixWorks_FunctionHasVariable()
         }
 
         [TestMethod]
-        public void NonReturningFunction_QuickFixWorks_PropertyGet()
+        public void GivenNonReturningPropertyGetter_QuickFixConvertsToSub()
         {
             const string inputCode =
 @"Property Get Foo() As Boolean
@@ -336,7 +336,7 @@ public void NonReturningFunction_QuickFixWorks_PropertyGet()
         }
 
         [TestMethod]
-        public void NonReturningFunction_QuickFixWorks_PropertyGetHasTypeHint()
+        public void GivenNonReturningPropertyGetWithTypeHint_QuickFixDropsTypeHint()
         {
             const string inputCode =
 @"Property Get Foo$()
@@ -368,7 +368,7 @@ public void NonReturningFunction_QuickFixWorks_PropertyGetHasTypeHint()
         }
 
         [TestMethod]
-        public void NonReturningFunction_QuickFixWorks_PropertyGetReturnsImplicitVariant()
+        public void GivenImplicitVariantPropertyGetter_StillConvertsToSub()
         {
             const string inputCode =
 @"Property Get Foo()
@@ -400,7 +400,7 @@ public void NonReturningFunction_QuickFixWorks_PropertyGetReturnsImplicitVariant
         }
 
         [TestMethod]
-        public void NonReturningFunction_QuickFixWorks_PropertyGetHasVariable()
+        public void GivenParameterizedPropertyGetter_QuickFixKeepsParameter()
         {
             const string inputCode =
 @"Property Get Foo(ByVal b As Boolean) As String