Merge pull request #2572 from MDoerner/DeclarationFinderForCustomDecl…

…arations CustomDeclarationLoaders now use finder on parser state
rubberduck-vba · Jan 24, 2017 · c8e45f6 · c8e45f6
2 parents e8061aa + f2edd01
commit c8e45f6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/Rubberduck.Parsing/Symbols/DeclarationLoaders/AliasDeclarations.cs b/Rubberduck.Parsing/Symbols/DeclarationLoaders/AliasDeclarations.cs
@@ -56,7 +56,7 @@ public IReadOnlyList<Declaration> Load()
 
         private IReadOnlyList<Declaration> AddAliasDeclarations()
         {
-            var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });
+            var finder = _state.DeclarationFinder;;
 
             if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))
             {

diff --git a/Rubberduck.Parsing/Symbols/DeclarationLoaders/DebugDeclarations.cs b/Rubberduck.Parsing/Symbols/DeclarationLoaders/DebugDeclarations.cs
@@ -18,7 +18,7 @@ public DebugDeclarations(RubberduckParserState state)
 
         public IReadOnlyList<Declaration> Load()
         {
-            var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });
+            var finder = _state.DeclarationFinder;;
 
             if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))
             {

diff --git a/Rubberduck.Parsing/Symbols/DeclarationLoaders/FormEventDeclarations.cs b/Rubberduck.Parsing/Symbols/DeclarationLoaders/FormEventDeclarations.cs
@@ -28,7 +28,7 @@ public IReadOnlyList<Declaration> Load()
 
         private static Declaration FormsClassModuleFromParserState(RubberduckParserState state)
         {
-            var finder = new DeclarationFinder(state.AllDeclarations, new IAnnotation[] { });
+            var finder = state.DeclarationFinder;
 
             var msForms = finder.FindProject("MSForms");
             if (msForms == null)

diff --git a/Rubberduck.Parsing/Symbols/DeclarationLoaders/SpecialFormDeclarations.cs b/Rubberduck.Parsing/Symbols/DeclarationLoaders/SpecialFormDeclarations.cs
@@ -19,7 +19,7 @@ public SpecialFormDeclarations(RubberduckParserState state)
 
         public IReadOnlyList<Declaration> Load()
         {
-            var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });
+            var finder = _state.DeclarationFinder;
 
             if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))
             {

diff --git a/Rubberduck.Parsing/VBA/ParseCoordinator.cs b/Rubberduck.Parsing/VBA/ParseCoordinator.cs
@@ -107,7 +107,10 @@ public void Parse(CancellationTokenSource token)
             }
 
             SyncComReferences(State.Projects);
+            State.RefreshFinder(_hostApp);
+
             AddBuiltInDeclarations();
+            State.RefreshFinder(_hostApp);
 
             foreach (var component in components)
             {
@@ -229,7 +232,10 @@ private void ParseAll(object requestor, CancellationTokenSource token)
             }
 
             SyncComReferences(State.Projects);
+            State.RefreshFinder(_hostApp);
+
             AddBuiltInDeclarations();
+            State.RefreshFinder(_hostApp);
 
             // invalidation cleanup should go into ParseAsync?
             foreach (var key in _componentAttributes.Keys)