Merge pull request #2572 from MDoerner/DeclarationFinderForCustomDeclarations

retailcoder · web-flow · commit c8e45f6fa21f · 2017-01-23T23:57:43.000-05:00
CustomDeclarationLoaders now use finder on parser state
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)

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public IReadOnlyList<Declaration> Load()`
`56`	`56`
`57`	`57`	`private IReadOnlyList<Declaration> AddAliasDeclarations()`
`58`	`58`	`{`
`59`		`- var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });`
	`59`	`+ var finder = _state.DeclarationFinder;;`
`60`	`60`
`61`	`61`	`if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))`
`62`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public DebugDeclarations(RubberduckParserState state)`
`18`	`18`
`19`	`19`	`public IReadOnlyList<Declaration> Load()`
`20`	`20`	`{`
`21`		`- var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });`
	`21`	`+ var finder = _state.DeclarationFinder;;`
`22`	`22`
`23`	`23`	`if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public IReadOnlyList<Declaration> Load()`
`28`	`28`
`29`	`29`	`private static Declaration FormsClassModuleFromParserState(RubberduckParserState state)`
`30`	`30`	`{`
`31`		`- var finder = new DeclarationFinder(state.AllDeclarations, new IAnnotation[] { });`
	`31`	`+ var finder = state.DeclarationFinder;`
`32`	`32`
`33`	`33`	`var msForms = finder.FindProject("MSForms");`
`34`	`34`	`if (msForms == null)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public SpecialFormDeclarations(RubberduckParserState state)`
`19`	`19`
`20`	`20`	`public IReadOnlyList<Declaration> Load()`
`21`	`21`	`{`
`22`		`- var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });`
	`22`	`+ var finder = _state.DeclarationFinder;`
`23`	`23`
`24`	`24`	`if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,10 @@ public void Parse(CancellationTokenSource token)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`SyncComReferences(State.Projects);`
	`110`	`+ State.RefreshFinder(_hostApp);`
	`111`	`+`
`110`	`112`	`AddBuiltInDeclarations();`
	`113`	`+ State.RefreshFinder(_hostApp);`
`111`	`114`
`112`	`115`	`foreach (var component in components)`
`113`	`116`	`{`
`@@ -229,7 +232,10 @@ private void ParseAll(object requestor, CancellationTokenSource token)`
`229`	`232`	`}`
`230`	`233`
`231`	`234`	`SyncComReferences(State.Projects);`
	`235`	`+ State.RefreshFinder(_hostApp);`
	`236`	`+`
`232`	`237`	`AddBuiltInDeclarations();`
	`238`	`+ State.RefreshFinder(_hostApp);`
`233`	`239`
`234`	`240`	`// invalidation cleanup should go into ParseAsync?`
`235`	`241`	`foreach (var key in _componentAttributes.Keys)`