Merge pull request #1544 from Hosch250/Issue1537

Issue1537

Author: Hosch250

RetailCoder.VBE/Inspections/ObsoleteTypeHintInspection.cs

@@ -22,12 +22,20 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
 
             var declarations = from item in results
                 where item.HasTypeHint()
-                // 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
+                select
+                    new ObsoleteTypeHintInspectionResult(this,
+                        string.Format(InspectionsUI.ObsoleteTypeHintInspectionResultFormat,
+                            InspectionsUI.Inspections_Declaration, item.DeclarationType.ToString().ToLower(),
+                            item.IdentifierName), new QualifiedContext(item.QualifiedName, item.Context), item);
+
             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,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Grammar;
@@ -72,6 +73,8 @@ public override void Fix()
 
         private static string GetNewSignature(ParserRuleContext context)
         {
+            Debug.Assert(context != null);
+
             return context.children.Aggregate(string.Empty, (current, member) =>
             {
                 var isIdentifierNode = member is VBAParser.IdentifierContext;