fixed UntypedFunctionUsageInspection

Author: retailcoder

RetailCoder.VBE/Inspections/UntypedFunctionUsageInspection.cs

@@ -44,7 +44,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
             var declarations = BuiltInDeclarations
                     // 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()));
+                .Where(item => _tokens.Any(token => item.References.Any() && (item.IdentifierName == token || item.IdentifierName == "_B_var_" + token)));
 
             return declarations.SelectMany(declaration => declaration.References
                 .Select(item => new UntypedFunctionUsageInspectionResult(this, string.Format(Description, declaration.IdentifierName), item.QualifiedModuleName, item.Context)));

Rubberduck.Parsing/Grammar/Tokens.cs

@@ -98,7 +98,7 @@ public static class Tokens
         public static readonly string LBound = "LBound";
         public static readonly string LCase = "LCase";
         public static readonly string Left = "Left";
-        public static readonly string LeftB = "Left";
+        public static readonly string LeftB = "LeftB";
         public static readonly string Len = "Len";
         public static readonly string LenB = "LenB";
         public static readonly string Let = "Let";
@@ -113,7 +113,7 @@ public static class Tokens
         public static readonly string LTrim = "LTrim";
         public static readonly string Me = "Me";
         public static readonly string Mid = "Mid";
-        public static readonly string MidB = "Mid";
+        public static readonly string MidB = "MidB";
         public static readonly string Minute = "Minute";
         public static readonly string MkDir = "MkDir";
         public static readonly string Mod = "Mod";
@@ -147,7 +147,7 @@ public static class Tokens
         public static readonly string Resume = "Resume";
         public static readonly string Return = "Return";
         public static readonly string Right = "Right";
-        public static readonly string RightB = "Right";
+        public static readonly string RightB = "RightB";
         public static readonly string RmDir = "RmDir";
         public static readonly string Rnd = "Rnd";
         public static readonly string RTrim = "RTrim";

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

@@ -1088,13 +1088,26 @@ private Declaration FindModuleScopeProcedure(string identifierName, Declaration
             return result.Count == 1 ? result.SingleOrDefault() : null;
         }
 
+        private bool IsStdModuleMember(Declaration declaration)
+        {
+            return declaration.ParentDeclaration != null
+                   && declaration.ParentDeclaration.DeclarationType == DeclarationType.Module;
+        }
+
+        private bool IsStaticClass(Declaration declaration)
+        {
+            return declaration.ParentDeclaration != null
+                   && declaration.ParentDeclaration.DeclarationType == DeclarationType.Class
+                   && (declaration.ParentDeclaration.HasPredeclaredId || declaration.IsBuiltIn);
+        }
+
         private Declaration FindProjectScopeDeclaration(string identifierName, Declaration localScope = null, ContextAccessorType accessorType = ContextAccessorType.GetValueOrReference, bool hasStringQualifier = false)
         {
-            // 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.ParentDeclaration != null && ((item.ParentDeclaration.DeclarationType == DeclarationType.Module
-                    || item.ParentDeclaration.HasPredeclaredId))
-                  || item.ParentScopeDeclaration.Equals(localScope)).ToList();
+                item.ParentDeclaration == null 
+                || IsStdModuleMember(item)
+                || IsStaticClass(item)
+                || item.ParentScopeDeclaration.Equals(localScope)).ToList();
 
             if (matches.Count == 1)
             {

Rubberduck.Parsing/Symbols/ReferencedDeclarationsCollector.cs

@@ -16,6 +16,7 @@
 using TYPEATTR = System.Runtime.InteropServices.ComTypes.TYPEATTR;
 using FUNCDESC = System.Runtime.InteropServices.ComTypes.FUNCDESC;
 using ELEMDESC = System.Runtime.InteropServices.ComTypes.ELEMDESC;
+using TYPEFLAGS = System.Runtime.InteropServices.ComTypes.TYPEFLAGS;
 using VARDESC = System.Runtime.InteropServices.ComTypes.VARDESC;
 
 namespace Rubberduck.Parsing.Symbols
@@ -125,14 +126,20 @@ public IEnumerable<Declaration> GetDeclarationsForReference(Reference reference)
                     typeQualifiedMemberName = new QualifiedMemberName(typeQualifiedModuleName, typeName);
                 }
 
-                var moduleDeclaration = new Declaration(typeQualifiedMemberName, projectDeclaration, projectDeclaration, typeName, false, false, Accessibility.Global, typeDeclarationType, null, Selection.Home);
-                yield return moduleDeclaration;
-
                 IntPtr typeAttributesPointer;
                 info.GetTypeAttr(out typeAttributesPointer);
 
                 var typeAttributes = (TYPEATTR)Marshal.PtrToStructure(typeAttributesPointer, typeof (TYPEATTR));
                 //var implements = GetImplementedInterfaceNames(typeAttributes, info);
+
+                var attributes = new Attributes();
+                if (typeAttributes.wTypeFlags.HasFlag(TYPEFLAGS.TYPEFLAG_FPREDECLID))
+                {
+                    attributes.AddPredeclaredIdTypeAttribute();
+                }
+
+                var moduleDeclaration = new Declaration(typeQualifiedMemberName, projectDeclaration, projectDeclaration, typeName, false, false, Accessibility.Global, typeDeclarationType, null, Selection.Home, true, null, attributes);
+                yield return moduleDeclaration;
 
                 for (var memberIndex = 0; memberIndex < typeAttributes.cFuncs; memberIndex++)
                 {