Merge pull request #3114 from rkapka/next

Made RemoveTypeHintsQuickFix work correctly for constant declarations

Author: retailcoder

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1470,7 +1470,7 @@ All our stargazers, likers & followers, for the warm fuzzies
     <value>By marker</value>
   </data>
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
-    <value>Library procedure</value>
+    <value>library procedure</value>
   </data>
   <data name="CodeExplorer_ShowSignaturesToolTip" xml:space="preserve">
     <value>Toggle signatures</value>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -42,6 +42,10 @@ public void Fix(IInspectionResult result)
                         var variableContext = (VBAParser.VariableSubStmtContext) result.Target.Context;
                         rewriter.InsertAfter(variableContext.identifier().Stop.TokenIndex, asTypeClause);
                         break;
+                    case DeclarationType.Constant:
+                        var constantContext = (VBAParser.ConstSubStmtContext) result.Target.Context;
+                        rewriter.InsertAfter(constantContext.identifier().Stop.TokenIndex, asTypeClause);
+                        break;
                     case DeclarationType.Parameter:
                         var parameterContext = (VBAParser.ArgContext)result.Target.Context;
                         rewriter.InsertAfter(parameterContext.unrestrictedIdentifier().Stop.TokenIndex, asTypeClause);

Rubberduck.Inspections/QuickFixes/RemoveTypeHintsQuickFix.cs

@@ -431,12 +431,13 @@ public override void EnterFunctionStmt(VBAParser.FunctionStmtContext context)
                 return;
             }
             var name = Identifier.GetName(identifier);
-
-            var asTypeClause = context.asTypeClause();
-            var asTypeName = asTypeClause == null
-                ? Tokens.Variant
-                : asTypeClause.type().GetText();
             var typeHint = Identifier.GetTypeHintValue(identifier);
+            var asTypeClause = context.asTypeClause();
+            var asTypeName = typeHint == null
+                ? asTypeClause == null
+                    ? Tokens.Variant
+                    : asTypeClause.type().GetText()
+                : SymbolList.TypeHintToTypeName[typeHint];
             var isArray = asTypeName.EndsWith("()");
             var declaration = CreateDeclaration(
                 name,
@@ -462,11 +463,13 @@ public override void EnterPropertyGetStmt(VBAParser.PropertyGetStmtContext conte
             var accessibility = GetProcedureAccessibility(context.visibility());
             var identifier = context.functionName().identifier();
             var name = Identifier.GetName(identifier);
-            var asTypeClause = context.asTypeClause();
-            var asTypeName = asTypeClause == null
-                ? Tokens.Variant
-                : asTypeClause.type().GetText();
             var typeHint = Identifier.GetTypeHintValue(identifier);
+            var asTypeClause = context.asTypeClause();
+            var asTypeName = typeHint == null
+                ? asTypeClause == null
+                    ? Tokens.Variant
+                    : asTypeClause.type().GetText()
+                : SymbolList.TypeHintToTypeName[typeHint];
             var isArray = asTypeClause != null && asTypeClause.type().LPAREN() != null;
             var declaration = CreateDeclaration(
                 name,

Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs

@@ -187,6 +187,26 @@ Dim buzz$
             Assert.AreEqual(1, inspectionResults.Count());
         }
 
+        [TestMethod]
+        [TestCategory("Inspections")]
+        public void ObsoleteTypeHint_ConstantReturnsResult()
+        {
+            const string inputCode =
+@"Public Function Foo() As Boolean
+    Const buzz$ = 0
+    Foo = True
+End Function";
+
+            IVBComponent component;
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
+            var state = MockParser.CreateAndParse(vbe.Object);
+
+            var inspection = new ObsoleteTypeHintInspection(state);
+            var inspectionResults = inspection.GetInspectionResults();
+
+            Assert.AreEqual(1, inspectionResults.Count());
+        }
+
         [TestMethod]
         [TestCategory("Inspections")]
         public void ObsoleteTypeHint_StringValueDoesNotReturnsResult()
@@ -520,6 +540,36 @@ Dim buzz As String
             Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
         }
 
+        [TestMethod]
+        [TestCategory("Inspections")]
+        public void ObsoleteTypeHint_QuickFixWorks_Constant_StringTypeHint()
+        {
+            const string inputCode =
+@"Public Sub Foo()
+    Const buzz$ = """"
+End Sub";
+
+            const string expectedCode =
+@"Public Sub Foo()
+    Const buzz As String = """"
+End Sub";
+
+            IVBComponent component;
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
+            var state = MockParser.CreateAndParse(vbe.Object);
+
+            var inspection = new ObsoleteTypeHintInspection(state);
+            var inspectionResults = inspection.GetInspectionResults();
+
+            var fix = new RemoveTypeHintsQuickFix(state);
+            foreach (var result in inspectionResults)
+            {
+                fix.Fix(result);
+            }
+
+            Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
+        }
+
         [TestMethod]
         [TestCategory("Inspections")]
         public void ObsoleteTypeHint_IgnoreQuickFixWorks()