fixed untyped function usage inspection and reference resolution

Author: retailcoder

RetailCoder.VBE/Inspections/UntypedFunctionUsageInspection.cs

@@ -45,8 +45,8 @@ public UntypedFunctionUsageInspection(RubberduckParserState state)
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
             var declarations = BuiltInDeclarations
-                .Where(item => item.DeclarationType == DeclarationType.Function
-                               && _tokens.Any(token => item.IdentifierName.EndsWith("_var_" + token)));
+                    // note: these *should* be functions, but somehow they're not defined as such
+                .Where(item => _tokens.Any(token => item.IdentifierName == ("_B_var_" + token) && item.References.Any()));
 
             return declarations.SelectMany(declaration => declaration.References
                 .Select(item => new UntypedFunctionUsageInspectionResult(this, string.Format(Description, declaration.IdentifierName), item.QualifiedModuleName, item.Context)));

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -56,7 +56,18 @@ public IEnumerable<Declaration> MatchName(string name)
             {
                 return result;
             }
-
+            if (_declarationsByName.TryGetValue("_" + name, out result))
+            {
+                return result;
+            }
+            if (_declarationsByName.TryGetValue("I" + name, out result))
+            {
+                return result;
+            }
+            if (_declarationsByName.TryGetValue("_I" + name, out result))
+            {
+                return result;
+            }
             return new List<Declaration>();
         }
 

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

@@ -1092,8 +1092,7 @@ private Declaration FindProjectScopeDeclaration(string identifierName, Declarati
         {
             // the "$" in e.g. "UCase$" isn't picked up as part of the identifierName, so we need to add it manually:
             var matches = _declarationFinder.MatchName(identifierName).Where(item => 
-                (!item.IsBuiltIn || item.IdentifierName == identifierName + (hasStringQualifier ? "$" : string.Empty))
-                && item.ParentDeclaration != null && ((item.ParentDeclaration.DeclarationType == DeclarationType.Module
+                item.ParentDeclaration != null && ((item.ParentDeclaration.DeclarationType == DeclarationType.Module
                     || item.ParentDeclaration.HasPredeclaredId))
                   || item.ParentScopeDeclaration.Equals(localScope)).ToList();
 
@@ -1152,12 +1151,22 @@ private Declaration FindProjectScopeDeclaration(string identifierName, Declarati
 
                     Debug.WriteLine("Ambiguous match in '{0}': '{1}'", localScope == null ? "(unknown)" : localScope.IdentifierName, identifierName);
                 }
-                if (temp.Count == 0)
-                {
-                    Debug.WriteLine("Unknown identifier in '{0}': '{1}'", localScope == null ? "(unknown)" : localScope.IdentifierName, identifierName);
-                }
             }
 
+            // VBA.Strings.Left function is actually called _B_var_Left;
+            // VBA.Strings.Left$ is _B_str_Left.
+            // same for all $-terminated functions.
+            var surrogateName = hasStringQualifier
+                ? "_B_str_" + identifierName
+                : "_B_var_" + identifierName;
+
+            matches = _declarationFinder.MatchName(surrogateName).ToList();
+            if (matches.Count == 1)
+            {
+                return matches.Single();
+            }
+
+            Debug.WriteLine("Unknown identifier in '{0}': '{1}'", localScope == null ? "(unknown)" : localScope.IdentifierName, identifierName);
             return null;
         }