Merge pull request #1130 from Hosch250/BugBlipper

Obsolete Type Hint Tests

Author: Hosch250

RetailCoder.VBE/Inspections/FunctionReturnValueNotUsedInspectionResult.cs

@@ -42,6 +42,7 @@ public override string Description
         {
             get
             {
+                // bug NullReferenceException thrown here - null Target
                 return string.Format(InspectionsUI.FunctionReturnValueNotUsedInspectionResultFormat, Target.IdentifierName);
             }
         }

RetailCoder.VBE/Inspections/NonReturningFunctionInspectionResult.cs

@@ -27,6 +27,7 @@ public override string Description
         {
             get
             {
+                // bug NullReferenceException thrown here - null Target
                 return string.Format(InspectionsUI.NonReturningFunctionInspectionResultFormat, Target.IdentifierName);
             }
         }

RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 using Antlr4.Runtime;
 using Microsoft.Vbe.Interop;
@@ -78,13 +79,30 @@ public override void Fix()
 
         private void FixTypeHintUsage(string hint, CodeModule module, Selection selection, bool isDeclaration = false)
         {
-            var line = module.get_Lines(selection.StartLine, 1);
+            var line = module.Lines[selection.StartLine, 1];
 
             var asTypeClause = ' ' + Tokens.As + ' ' + TypeHints[hint];
-            var pattern = "\\b" + _declaration.IdentifierName + "\\" + hint;
-            var fix = Regex.Replace(line, pattern, _declaration.IdentifierName + (isDeclaration ? asTypeClause : String.Empty));
 
-            module.ReplaceLine(selection.StartLine, fix);
+            string fix;
+
+            if (isDeclaration && (Context is VBAParser.FunctionStmtContext || Context is VBAParser.PropertyGetStmtContext))
+            {
+                var typeHint = (ParserRuleContext)Context.children.First(c => c is VBAParser.TypeHintContext);
+                var argList = (ParserRuleContext) Context.children.First(c => c is VBAParser.ArgListContext);
+                var endLine = argList.Stop.Line;
+                var endColumn = argList.Stop.Column;
+
+                var oldLine = module.Lines[endLine, selection.LineCount];
+                fix = oldLine.Insert(endColumn + 1, asTypeClause).Remove(typeHint.Start.Column, 1);  // adjust for VBA 0-based indexing
+
+                module.ReplaceLine(endLine, fix);
+            }
+            else
+            {
+                var pattern = "\\b" + _declaration.IdentifierName + "\\" + hint;
+                fix = Regex.Replace(line, pattern, _declaration.IdentifierName + (isDeclaration ? asTypeClause : string.Empty));
+                module.ReplaceLine(selection.StartLine, fix);
+            }
         }
     }
 }

RetailCoder.VBE/Inspections/ParameterNotUsedInspectionResult.cs

@@ -26,6 +26,7 @@ public ParameterNotUsedInspectionResult(IInspection inspection, string result,
 
         public override string Description
         {
+            // bug NullReferenceException thrown here - null Target
             get { return string.Format(InspectionsUI.ParameterNotUsedInspectionResultFormat, Target.IdentifierName); }
         }
     }

Rubberduck.Parsing/Grammar/VBA.g4

@@ -637,7 +637,7 @@ dictionaryCallStmt : '!' ambiguousIdentifier typeHint?;
 
 argList : LPAREN (WS? arg (WS? ',' WS? arg)*)? WS? RPAREN;
 
-arg : (OPTIONAL WS)? ((BYVAL | BYREF) WS)? (PARAMARRAY WS)? ambiguousIdentifier (WS? LPAREN WS? RPAREN)? (WS? asTypeClause)? (WS? argDefaultValue)?;
+arg : (OPTIONAL WS)? ((BYVAL | BYREF) WS)? (PARAMARRAY WS)? ambiguousIdentifier typeHint? (WS? LPAREN WS? RPAREN)? (WS? asTypeClause)? (WS? argDefaultValue)?;
 
 argDefaultValue : EQ WS? valueStmt;