Merge pull request #4279 from MDoerner/SomeRefactoringOfTheComCollector

Some refactoring of the com collector

Author: retailcoder

Rubberduck.API/VBA/Parser.cs

@@ -6,6 +6,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using Rubberduck.Common;
+using Rubberduck.Parsing.ComReflection;
 using Rubberduck.Parsing.PreProcessing;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols.DeclarationLoaders;
@@ -116,7 +117,9 @@ internal Parser(object vbe) : this()
             var parserStateManager = new ParserStateManager(_state);
             var referenceRemover = new ReferenceRemover(_state, moduleToModuleReferenceManager);
             var supertypeClearer = new SupertypeClearer(_state);
-            var comSynchronizer = new COMReferenceSynchronizer(_state, parserStateManager);
+            var comLibraryProvider = new ComLibraryProvider();
+            var referencedDeclarationsCollector = new LibraryReferencedDeclarationsCollector(comLibraryProvider);
+            var comSynchronizer = new COMReferenceSynchronizer(_state, parserStateManager, projectRepository, referencedDeclarationsCollector);
             var builtInDeclarationLoader = new BuiltInDeclarationLoader(
                 _state,
                 new List<ICustomDeclarationLoader>

Rubberduck.Core/UI/Command/MenuItems/CommandBars/SerializeDeclarationsCommandMenuItem.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using NLog;
 using Rubberduck.Parsing.ComReflection;
 using Rubberduck.Parsing.Symbols;
@@ -22,12 +23,14 @@ public class SerializeDeclarationsCommand : CommandBase
     {
         private readonly RubberduckParserState _state;
         private readonly IPersistable<SerializableProject> _service;
+        private readonly ISerializableProjectBuilder _serializableProjectBuilder;
 
-        public SerializeDeclarationsCommand(RubberduckParserState state, IPersistable<SerializableProject> service) 
+        public SerializeDeclarationsCommand(RubberduckParserState state, IPersistable<SerializableProject> service, ISerializableProjectBuilder serializableProjectBuilder) 
             : base(LogManager.GetCurrentClassLogger())
         {
             _state = state;
             _service = service;
+            _serializableProjectBuilder = serializableProjectBuilder;
         }
 
         protected override bool EvaluateCanExecute(object parameter)
@@ -43,15 +46,14 @@ protected override void OnExecute(object parameter)
             var path = Path.Combine(BasePath, "Declarations");
             if (!Directory.Exists(path)) { Directory.CreateDirectory(path); }
 
-            foreach (var tree in _state.BuiltInDeclarationTrees)
+            foreach (var project in _state.DeclarationFinder.BuiltInDeclarations(DeclarationType.Project).OfType<ProjectDeclaration>())
             {
                 System.Diagnostics.Debug.Assert(path != null, "project path isn't supposed to be null");
 
-                var filename = string.Format("{0}.{1}.{2}.xml",
-                    tree.Node.QualifiedMemberName.QualifiedModuleName.ProjectName,
-                    tree.MajorVersion,
-                    tree.MinorVersion);
-                _service.Persist(Path.Combine(path, filename), tree);
+                var tree = _serializableProjectBuilder.SerializableProject(project);
+                var filename = $"{tree.Node.QualifiedMemberName.QualifiedModuleName.ProjectName}.{tree.MajorVersion}.{tree.MinorVersion}.xml";
+                var fullFilename = Path.Combine(path, filename);
+                _service.Persist(fullFilename, tree);
             }
         }
     }

Rubberduck.Main/Root/RubberduckIoCInstaller.cs

@@ -818,6 +818,12 @@ private void RegisterParsingEngine(IWindsorContainer container)
             container.Register(Component.For<IParseCoordinator>()
                 .ImplementedBy<ParseCoordinator>()
                 .LifestyleSingleton());
+            container.Register(Component.For<IComLibraryProvider>()
+                .ImplementedBy<ComLibraryProvider>()
+                .LifestyleSingleton());
+            container.Register(Component.For<IReferencedDeclarationsCollector>()
+                .ImplementedBy<LibraryReferencedDeclarationsCollector>()
+                .LifestyleSingleton());
             container.Register(Component.For<ITokenStreamPreprocessor>()
                 .ImplementedBy<VBAPreprocessor>()
                 .DependsOn(Dependency.OnComponent<ITokenStreamParser, VBAPreprocessorParser>())

Rubberduck.Parsing/ComReflection/ComLibraryProvider.cs

@@ -0,0 +1,44 @@
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+
+namespace Rubberduck.Parsing.ComReflection
+{
+    public class ComLibraryProvider : IComLibraryProvider
+    {
+        #region Native Stuff
+        // ReSharper disable InconsistentNaming
+        // ReSharper disable UnusedMember.Local
+        /// <summary>
+        /// Controls how a type library is registered.
+        /// </summary>
+        private enum REGKIND
+        {
+            /// <summary>
+            /// Use default register behavior.
+            /// </summary>
+
+
+            REGKIND_DEFAULT = 0,
+            /// <summary>
+            /// Register this type library.
+            /// </summary>
+            REGKIND_REGISTER = 1,
+            /// <summary>
+            /// Do not register this type library.
+            /// </summary>
+            REGKIND_NONE = 2
+        }
+        // ReSharper restore UnusedMember.Local
+
+        [DllImport("oleaut32.dll", CharSet = CharSet.Unicode)]
+        private static extern int LoadTypeLibEx(string strTypeLibName, REGKIND regKind, out ITypeLib TypeLib);
+        // ReSharper restore InconsistentNaming
+        #endregion
+
+        public ITypeLib LoadTypeLibrary(string libraryPath)
+        {
+            LoadTypeLibEx(libraryPath, REGKIND.REGKIND_NONE, out var typeLibrary);
+            return typeLibrary;
+        }
+    }
+}

Rubberduck.Parsing/ComReflection/IComLibraryProvider.cs

@@ -0,0 +1,9 @@
+using System.Runtime.InteropServices.ComTypes;
+
+namespace Rubberduck.Parsing.ComReflection
+{
+    public interface IComLibraryProvider
+    {
+        ITypeLib LoadTypeLibrary(string libraryPath);
+    }
+}

Rubberduck.Parsing/ComReflection/IReferencedDeclarationsCollector.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Rubberduck.Parsing.Symbols;
+using Rubberduck.VBEditor;
+
+namespace Rubberduck.Parsing.ComReflection
+{
+    public interface IReferencedDeclarationsCollector
+    {
+        IReadOnlyCollection<Declaration> CollectedDeclarations(ReferenceInfo reference);
+    }
+}

Rubberduck.Parsing/ComReflection/ISerializableProjectBuilder.cs

@@ -0,0 +1,9 @@
+using Rubberduck.Parsing.Symbols;
+
+namespace Rubberduck.Parsing.ComReflection
+{
+    public interface ISerializableProjectBuilder
+    {
+        SerializableProject SerializableProject(ProjectDeclaration projectDeclaration);
+    }
+}