Merge branch 'next' of https://github.com/retailcoder/Rubberduck.git

Author: retailcoder

RetailCoder.VBE/Inspections/ObsoleteTypeHintInspection.cs

@@ -22,18 +22,12 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
 
             var declarations = from item in results
                 where item.HasTypeHint()
-                select new ObsoleteTypeHintInspectionResult(this,
-                        string.Format(InspectionsUI.ObsoleteTypeHintInspectionResultFormat,
-                            InspectionsUI.Inspections_Declaration, item.DeclarationType.ToString().ToLower(),
-                            item.IdentifierName), new QualifiedContext(item.QualifiedName, item.Context), item);
-            
+                // bug: this inspection result only has one value.  Why are we passing two in?
+                               select new ObsoleteTypeHintInspectionResult(this, string.Format(InspectionsUI.ObsoleteTypeHintInspectionResultFormat, InspectionsUI.Inspections_Declaration, item.DeclarationType.ToString().ToLower(), item.IdentifierName), new QualifiedContext(item.QualifiedName, item.Context), item);
+            // todo: localize this InspectionResultFormat properly
             var references = from item in results.SelectMany(d => d.References)
                 where item.HasTypeHint()
-                select new ObsoleteTypeHintInspectionResult(this,
-                        string.Format(InspectionsUI.ObsoleteTypeHintInspectionResultFormat,
-                            InspectionsUI.Inspections_Usage, item.Declaration.DeclarationType.ToString().ToLower(),
-                            item.IdentifierName), new QualifiedContext(item.QualifiedModuleName, item.Context),
-                        item.Declaration);
+                             select new ObsoleteTypeHintInspectionResult(this, string.Format(InspectionsUI.ObsoleteTypeHintInspectionResultFormat, InspectionsUI.Inspections_Usage, item.Declaration.DeclarationType.ToString().ToLower(), item.IdentifierName), new QualifiedContext(item.QualifiedModuleName, item.Context), item.Declaration);
 
             return declarations.Union(references);
         }

RetailCoder.VBE/Inspections/UntypedFunctionUsageInspectionResult.cs

@@ -1,5 +1,8 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using Antlr4.Runtime;
+using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor;
 
@@ -16,7 +19,7 @@ public UntypedFunctionUsageInspectionResult(IInspection inspection, IdentifierRe
             _reference = reference;
             _quickFixes = new CodeInspectionQuickFix[]
             {
-                new UntypedFunctionUsageQuickFix(Context, QualifiedSelection), 
+                new UntypedFunctionUsageQuickFix((ParserRuleContext)GetFirst(typeof(VBAParser.IdentifierContext)).Parent, QualifiedSelection), 
                 new IgnoreOnceQuickFix(Context, QualifiedSelection, Inspection.AnnotationName), 
             };
         }
@@ -27,29 +30,53 @@ public override string Description
         {
             get { return string.Format(Inspection.Description, _reference.Declaration.IdentifierName); }
         }
+
+        private ParserRuleContext GetFirst(Type nodeType)
+        {
+            var unexploredNodes = new List<ParserRuleContext> {Context};
+
+            while (unexploredNodes.Any())
+            {
+                if (unexploredNodes[0].GetType() == nodeType)
+                {
+                    return unexploredNodes[0];
+                }
+                
+                unexploredNodes.AddRange(unexploredNodes[0].children.OfType<ParserRuleContext>());
+                unexploredNodes.RemoveAt(0);
+            }
+
+            return null;
+        }
     }
 
     public class UntypedFunctionUsageQuickFix : CodeInspectionQuickFix
     {
         public UntypedFunctionUsageQuickFix(ParserRuleContext context, QualifiedSelection selection) 
-            : base(context, selection,
-                  string.Format(InspectionsUI.QuickFixUseTypedFunction_,
-                      context.GetText(), context.GetText().Insert(context.GetText().IndexOf('('), "$")))
+            : base(context, selection, string.Format(InspectionsUI.QuickFixUseTypedFunction_, context.GetText(), GetNewSignature(context)))
         {
         }
 
         public override void Fix()
         {
             var originalInstruction = Context.GetText();
-            var newInstruction = originalInstruction.Insert(originalInstruction.IndexOf('('), "$");
+            var newInstruction = GetNewSignature(Context);
             var selection = Selection.Selection;
 
             var module = Selection.QualifiedName.Component.CodeModule;
             var lines = module.Lines[selection.StartLine, selection.LineCount];
 
             var result = lines.Replace(originalInstruction, newInstruction);
             module.ReplaceLine(selection.StartLine, result);
-            // FIXME trigger reparse
+        }
+
+        private static string GetNewSignature(ParserRuleContext context)
+        {
+            return context.children.Aggregate(string.Empty, (current, member) =>
+            {
+                var isIdentifierNode = member is VBAParser.IdentifierContext;
+                return current + member.GetText() + (isIdentifierNode ? "$" : string.Empty);
+            });
         }
     }
 }