Build serializable tree after collection.

Author: comintern

Rubberduck.Parsing/Symbols/AliasDeclarations.cs

@@ -14,7 +14,7 @@ public class AliasDeclarations : ICustomDeclarationLoader
         private Declaration _fileSystemModule;
         private Declaration _interactionModule;
         private Declaration _stringsModule;
-
+        private Declaration _dateTimeModule;
 
         public AliasDeclarations(RubberduckParserState state)
         {
@@ -79,6 +79,9 @@ private void UpdateAliasFunctionModulesFromReferencedProjects(RubberduckParserSt
 
                 _stringsModule = state.AllDeclarations.SingleOrDefault(
                         item => item.IdentifierName == "Strings" && item.Scope == "VBE7.DLL;VBA.Strings");
+
+                _dateTimeModule = state.AllDeclarations.SingleOrDefault(
+                        item => item.IdentifierName == "DateTime" && item.Scope == "VBE7.DLL;VBA.DateTime");
             }
 
 

Rubberduck.Parsing/Symbols/SerializableDeclaration.cs

@@ -14,7 +14,7 @@ public class SerializableDeclarationTree
         public readonly SerializableDeclaration Node;
 
         [DataMember(IsRequired = true)]
-        public readonly IEnumerable<SerializableDeclarationTree> Children;
+        public IEnumerable<SerializableDeclarationTree> Children;
 
         public SerializableDeclarationTree(Declaration declaration)   
             : this(new SerializableDeclaration(declaration)) { }

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -433,8 +433,12 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
                                     try
                                     {
                                         var comReflector = new ReferencedDeclarationsCollector(State);
-                                        SerializableDeclarationTree tree;
-                                        var items = comReflector.GetDeclarationsForReference(localReference, out tree);
+
+                                        var items = comReflector.GetDeclarationsForReference(localReference);
+                                        var root = items.SingleOrDefault(x => x.DeclarationType == DeclarationType.Project);
+                                        var serialize = new List<Declaration>(items);
+                                        var tree = GetSerializableTreeForDeclaration(root, serialize);
+
                                         if (tree != null)
                                         {
                                             State.BuiltInDeclarationTrees.Add(tree);
@@ -486,6 +490,21 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
             }
         }
 
+        private SerializableDeclarationTree GetSerializableTreeForDeclaration(Declaration declaration, List<Declaration> declarations)
+        {
+            var output = new SerializableDeclarationTree(declaration);
+            var children = new List<SerializableDeclarationTree>();
+            var nodes = declarations.Where(x => x.ParentDeclaration.Equals(declaration)).ToList();
+            declarations.RemoveAll(nodes.Contains);
+            foreach (var item in nodes)
+            {
+                children.Add(GetSerializableTreeForDeclaration(item, declarations));
+            }
+
+            output.Children = children;
+            return output;
+        }
+
         private void UnloadComReference(IReference reference, IReadOnlyList<IVBProject> projects)
         {
             var referencedProjectId = GetReferenceProjectId(reference, projects);