fix built-in enums/udts can't be resolved because of missing parent (#1631)

Author: Andrin Meier

Rubberduck.Parsing/Symbols/AccessibilityCheck.cs

@@ -23,12 +23,12 @@ public static bool IsModuleAccessible(Declaration callingProject, Declaration ca
             {
                 return true;
             }
-            bool sameProject = calleeModule != null && callingModule.ParentScopeDeclaration.Equals(calleeModule.ParentScopeDeclaration);
+            bool sameProject = callingModule.ParentScopeDeclaration.Equals(calleeModule.ParentScopeDeclaration);
             if (sameProject)
             {
                 return validAccessibility;
             }
-            if (calleeModule != null && calleeModule.DeclarationType.HasFlag(DeclarationType.ProceduralModule))
+            if (calleeModule.DeclarationType.HasFlag(DeclarationType.ProceduralModule))
             {
                 bool isPrivate = ((ProceduralModuleDeclaration)calleeModule).IsPrivateModule;
                 return validAccessibility && !isPrivate;
@@ -64,13 +64,7 @@ public static bool IsMemberAccessible(Declaration callingProject, Declaration ca
                 return calleeHasSameParent;
             }
             var memberModule = Declaration.GetModuleParent(calleeMember);
-            // TODO: Fix this?
-            // Assume null = built in declaration which is always accessible.
-            if (memberModule == null)
-            {
-                return true;
-            }
-            if (IsModuleAccessible(callingProject, callingModule, memberModule) && calleeMember.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Module))
+            if (IsModuleAccessible(callingProject, callingModule, memberModule))
             {
                 if (calleeMember.DeclarationType.HasFlag(DeclarationType.EnumerationMember) || calleeMember.DeclarationType.HasFlag(DeclarationType.UserDefinedTypeMember))
                 {

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -438,11 +438,15 @@ public string ProjectName
         /// </remarks>
         public string AsTypeName { get { return _asTypeName; } }
 
-        public virtual string AsTypeNameWithoutArrayDesignator
+        public string AsTypeNameWithoutArrayDesignator
         {
             get
             {
-                return AsTypeName;
+                if (string.IsNullOrWhiteSpace(AsTypeName))
+                {
+                    return AsTypeName;
+                }
+                return AsTypeName.Replace("(", "").Replace(")", "").Trim();
             }
         }
 

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -63,17 +63,6 @@ public IEnumerable<Declaration> FindProjects()
             return _declarations.Where(d => d.DeclarationType == DeclarationType.Project).ToList();
         }
 
-        public IEnumerable<CommentNode> ModuleComments(QualifiedModuleName module)
-        {
-            CommentNode[] result;
-            if (_comments.TryGetValue(module, out result))
-            {
-                return result;
-            }
-
-            return new List<CommentNode>();
-        }
-
         public Declaration FindParameter(Declaration procedure, string parameterName)
         {
             var matches = MatchName(parameterName);
@@ -90,14 +79,6 @@ public IEnumerable<IAnnotation> FindAnnotations(QualifiedModuleName module)
             return new List<IAnnotation>();
         }
 
-        public IEnumerable<Declaration> MatchTypeName(string name)
-        {
-            return MatchName(name).Where(declaration =>
-                declaration.DeclarationType.HasFlag(DeclarationType.ClassModule) ||
-                declaration.DeclarationType.HasFlag(DeclarationType.UserDefinedType) ||
-                declaration.DeclarationType.HasFlag(DeclarationType.Enumeration));
-        }
-
         public bool IsMatch(string declarationName, string potentialMatchName)
         {
             return string.Equals(declarationName, potentialMatchName, StringComparison.OrdinalIgnoreCase);
@@ -160,59 +141,6 @@ public Declaration FindStdModule(string name, Declaration parent = null, bool in
             return result;
         }
 
-        public Declaration FindUserDefinedType(string name, Declaration parent = null, bool includeBuiltIn = false)
-        {
-            Declaration result = null;
-            try
-            {
-                var matches = MatchName(name);
-                result = matches.SingleOrDefault(declaration => declaration.DeclarationType.HasFlag(DeclarationType.UserDefinedType)
-                    && (parent == null || parent.Equals(declaration.ParentDeclaration))
-                    && (includeBuiltIn || !declaration.IsBuiltIn));
-            }
-            catch (Exception exception)
-            {
-                _logger.Error(exception, "Multiple matches found for user-defined type '{0}'.", name);
-            }
-
-            return result;
-        }
-
-        public Declaration FindEnum(string name, Declaration parent = null, bool includeBuiltIn = false)
-        {
-            Declaration result = null;
-            try
-            {
-                var matches = MatchName(name);
-                result = matches.SingleOrDefault(declaration => declaration.DeclarationType.HasFlag(DeclarationType.Enumeration)
-                    && (parent == null || parent.Equals(declaration.ParentDeclaration))
-                    && (includeBuiltIn || !declaration.IsBuiltIn));
-            }
-            catch (Exception exception)
-            {
-                _logger.Error(exception, "Multiple matches found for enum type '{0}'.", name);
-            }
-
-            return result;
-        }
-
-        public Declaration FindClass(Declaration parent, string name, bool includeBuiltIn = false)
-        {
-            Declaration result = null;
-            try
-            {
-                result = MatchName(name).SingleOrDefault(declaration => declaration.DeclarationType.HasFlag(DeclarationType.ClassModule)
-                    && (parent == null || parent.Equals(declaration.ParentDeclaration))
-                    && (includeBuiltIn || !declaration.IsBuiltIn));
-            }
-            catch (InvalidOperationException exception)
-            {
-                _logger.Error(exception, "Multiple matches found for class '{0}'.", name);
-            }
-
-            return result;
-        }
-
         public Declaration FindReferencedProject(Declaration callingProject, string referencedProjectName)
         {
             return FindInReferencedProjectByPriority(callingProject, referencedProjectName, p => p.DeclarationType.HasFlag(DeclarationType.Project));
@@ -353,9 +281,7 @@ public Declaration FindMemberEnclosedProjectWithoutEnclosingModule(Declaration c
             var allMatches = MatchName(memberName);
             var memberMatches = allMatches.Where(m =>
                 m.DeclarationType.HasFlag(memberType)
-                // TODO: Fix this?
-                // Assume no module = built-in, not checkable thus we conservatively include it in the matches.
-                && (Declaration.GetModuleParent(m) == null || Declaration.GetModuleParent(m).DeclarationType == DeclarationType.ProceduralModule)
+                && Declaration.GetModuleParent(m).DeclarationType == DeclarationType.ProceduralModule
                 && Declaration.GetProjectParent(m).Equals(callingProject)
                 && !callingModule.Equals(Declaration.GetModuleParent(m)));
             var accessibleMembers = memberMatches.Where(m => AccessibilityCheck.IsMemberAccessible(callingProject, callingModule, callingParent, m));

Rubberduck.Parsing/Symbols/FunctionDeclaration.cs

@@ -78,21 +78,5 @@ public bool IsDefaultMember
                 return false;
             }
         }
-
-        public override string AsTypeNameWithoutArrayDesignator
-        {
-            get
-            {
-                if (string.IsNullOrWhiteSpace(AsTypeName))
-                {
-                    return AsTypeName;
-                }
-                if (!IsArray)
-                {
-                    return AsTypeName;
-                }
-                return AsTypeName.Substring(0, AsTypeName.IndexOf("("));
-            }
-        }
     }
 }

Rubberduck.Parsing/Symbols/PropertyGetDeclaration.cs

@@ -78,21 +78,5 @@ public bool IsDefaultMember
                 return false;
             }
         }
-
-        public override string AsTypeNameWithoutArrayDesignator
-        {
-            get
-            {
-                if (string.IsNullOrWhiteSpace(AsTypeName))
-                {
-                    return AsTypeName;
-                }
-                if (!IsArray)
-                {
-                    return AsTypeName;
-                }
-                return AsTypeName.Substring(0, AsTypeName.IndexOf("("));
-            }
-        }
     }
 }

Rubberduck.Parsing/Symbols/ReferencedDeclarationsCollector.cs

@@ -20,6 +20,7 @@
 using VARDESC = System.Runtime.InteropServices.ComTypes.VARDESC;
 using Rubberduck.Parsing.Annotations;
 using System.Linq;
+using Rubberduck.Parsing.Grammar;
 
 namespace Rubberduck.Parsing.Symbols
 {
@@ -206,10 +207,25 @@ public IEnumerable<Declaration> GetDeclarationsForReference(Reference reference)
                         moduleDeclaration = module;
                         break;
                     default:
+                        string pseudoModuleName = string.Format("_{0}", typeName);
+                        var pseudoParentModule = new ProceduralModuleDeclaration(
+                            new QualifiedMemberName(projectQualifiedModuleName, pseudoModuleName),
+                            projectDeclaration,
+                            pseudoModuleName,
+                            true,
+                            new List<IAnnotation>(),
+                            new Attributes());
+                        // Enums don't define their own type but have a declared type of "Long".
+                        if (typeDeclarationType == DeclarationType.Enumeration)
+                        {
+                            typeName = Tokens.Long;
+                        }
+                        // UDTs and ENUMs don't seem to have a module parent that's why we add a "fake" module
+                        // so that the rest of the application can treat it normally.
                         moduleDeclaration = new Declaration(
-                            typeQualifiedMemberName, 
-                            projectDeclaration, 
-                            projectDeclaration, 
+                            typeQualifiedMemberName,
+                            pseudoParentModule,
+                            pseudoParentModule, 
                             typeName,
                             null,
                             false, 
@@ -409,7 +425,7 @@ private Declaration CreateFieldDeclaration(ITypeInfo info, int fieldIndex, Decla
             var fieldName = names[0];
             var memberType = GetDeclarationType(varDesc, typeDeclarationType);
 
-            var asTypeName = GetTypeName(varDesc.elemdescVar.tdesc, info);
+            var asTypeName = GetTypeName(varDesc.elemdescVar.tdesc, info);            
 
             return new Declaration(new QualifiedMemberName(typeQualifiedModuleName, fieldName),
                 moduleDeclaration, moduleDeclaration, asTypeName, null, false, false, Accessibility.Global, memberType, null,

Rubberduck.Parsing/Symbols/TypeAnnotationPass.cs

@@ -64,7 +64,6 @@ private void AnnotateType(Declaration declaration)
             var module = Declaration.GetModuleParent(declaration);
             if (module == null)
             {
-                // TODO: Reference Collector does not add module, find workaround?
                 _logger.Warn("Type annotation failed for {0} because module parent is missing.", typeExpression);
                 return;
             }
@@ -76,8 +75,11 @@ private void AnnotateType(Declaration declaration)
             }
             else
             {
-                // Commented out due to a massive amount of VT_HRESULT messages.
-                //Debug.WriteLine(string.Format("{0}: Failed to resolve type {1}.", GetType().Name, typeExpression));
+                const string IGNORE_THIS = "DISPATCH";
+                if (typeExpression != IGNORE_THIS)
+                {
+                    _logger.Warn("Failed to resolve type {0}", typeExpression);
+                }
             }
         }
     }