xml looks right, resolver still works.

Author: retailcoder

Rubberduck.Parsing/Symbols/ReferencedDeclarationsCollector.cs

@@ -228,19 +228,15 @@ public List<Declaration> GetDeclarationsForReference(IReference reference)
                         moduleDeclaration = module;
                         break;
                     default:
-                        string pseudoModuleName = string.Format("_{0}", typeName);
+                        var 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(
@@ -260,6 +256,8 @@ public List<Declaration> GetDeclarationsForReference(IReference reference)
                             true,
                             null,
                             attributes);
+
+                        output.Add(pseudoParentModule);
                         break;
                 }
 

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -435,27 +435,21 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
                                         var comReflector = new ReferencedDeclarationsCollector(State);
 
                                         var items = comReflector.GetDeclarationsForReference(localReference);
-                                        var root = items.SingleOrDefault(x => x.DeclarationType == DeclarationType.Project);
+                                        var root = items.OfType<ProjectDeclaration>().SingleOrDefault();
                                         var serialize = new List<Declaration>(items);
+                                        foreach (var declaration in serialize)
+                                        {
+                                            State.AddDeclaration(declaration);
+                                        }
                                         serialize.Remove(root);
                                         var tree = GetSerializableTreeForDeclaration(root, serialize);
 
                                         if (tree != null)
                                         {
-                                            State.BuiltInDeclarationTrees.Add(tree);
-                                        }
-
-                                        //var items = comReflector.GetDeclarationsForReference(localReference, out tree);
-                                        //if (tree != null)
-                                        //{
-                                        //    State.BuiltInDeclarationTrees.Add(tree);
-                                        //}
-
-                                        //foreach (var declaration in items)
-                                        //{
-                                        //    State.AddDeclaration(declaration);
-                                        //}
+                                            var added = State.BuiltInDeclarationTrees.TryAdd(tree);
+                                            //if (!added) { throw new Exception();}
                                         }
+                                    }
                                     catch (Exception exception)
                                     {
                                         unmapped.Add(reference);
@@ -500,7 +494,7 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
         private SerializableDeclarationTree GetSerializableTreeForDeclaration(Declaration declaration, List<Declaration> declarations)
         {
             var children = new List<SerializableDeclarationTree>();
-            var nodes = declarations.Where(x => x.ParentDeclaration != null && x.ParentDeclaration.Equals(declaration)).ToList();
+            var nodes = declarations.Where(x => x.ParentDeclaration.Equals(declaration)).ToList();
             declarations.RemoveAll(nodes.Contains);
             foreach (var item in nodes)
             {

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -585,8 +586,8 @@ public IReadOnlyList<Declaration> AllDeclarations
             }
         }
 
-        private readonly List<SerializableDeclarationTree> _builtInDeclarationTrees = new List<SerializableDeclarationTree>();
-        public IList<SerializableDeclarationTree> BuiltInDeclarationTrees { get { return _builtInDeclarationTrees; } }
+        private readonly ConcurrentBag<SerializableDeclarationTree> _builtInDeclarationTrees = new ConcurrentBag<SerializableDeclarationTree>();
+        public IProducerConsumerCollection<SerializableDeclarationTree> BuiltInDeclarationTrees { get { return _builtInDeclarationTrees; } }
 
         /// <summary>
         /// Gets a copy of the collected declarations, excluding the built-in ones.