Fix threading for FindBuiltinEventHandlers

Author: comintern

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -66,7 +66,7 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<IA
                 declarations.Where(declaration => !declaration.IsBuiltIn)
                             .GroupBy(declaration => declaration.DeclarationType)
                             .ToDictionary(grouping => grouping.Key, grouping => grouping.ToArray()));
-            _builtinEvents = new ConcurrentBag<Declaration>(FindBuiltInEventHandlers(declarations));
+            _builtinEvents = new Lazy<ConcurrentBag<Declaration>>(() => FindBuiltInEventHandlers(declarations));
 
             _projects = _projects = declarations.Where(d => d.DeclarationType == DeclarationType.Project).ToList();
             _classes = _declarations.AllValues().Where(d => d.DeclarationType == DeclarationType.ClassModule).ToList();
@@ -146,12 +146,12 @@ public IEnumerable<Declaration> FindDeclarationsWithNonBaseAsType()
             }
         }
 
-        private readonly ConcurrentBag<Declaration> _builtinEvents; 
+        private readonly Lazy<ConcurrentBag<Declaration>> _builtinEvents; 
         public IEnumerable<Declaration> FindBuiltinEventHandlers()
         {
             lock (ThreadLock)
             {
-                return _builtinEvents.ToList();
+                return _builtinEvents.Value;
             }
         }
 
@@ -622,7 +622,7 @@ private IEnumerable<Declaration> FindAllInReferencedProjectByPriority(Declaratio
             }
         }
 
-        public static IEnumerable<Declaration> FindBuiltInEventHandlers(IEnumerable<Declaration> declarations)
+        public static ConcurrentBag<Declaration> FindBuiltInEventHandlers(IEnumerable<Declaration> declarations)
         {
             var declarationList = declarations.ToList();
 
@@ -640,24 +640,24 @@ public static IEnumerable<Declaration> FindBuiltInEventHandlers(IEnumerable<Decl
 
             var handlers = declarationList.Where(item =>
                 // class module built-in events
-                        (item.DeclarationType == DeclarationType.Procedure &&
-                        item.ParentDeclaration.DeclarationType == DeclarationType.ClassModule && (
-                            item.IdentifierName.Equals("Class_Initialize", StringComparison.InvariantCultureIgnoreCase) ||
-                            item.IdentifierName.Equals("Class_Terminate", StringComparison.InvariantCultureIgnoreCase))) ||
-                            // standard module built-in handlers (Excel specific):
-                        (host != null &&
-                        host.ApplicationName.Equals("Excel", StringComparison.InvariantCultureIgnoreCase) &&
-                        item.DeclarationType == DeclarationType.Procedure &&
-                        item.ParentDeclaration.DeclarationType == DeclarationType.ProceduralModule && (
-                            item.IdentifierName.Equals("auto_open", StringComparison.InvariantCultureIgnoreCase) ||
-                            item.IdentifierName.Equals("auto_close", StringComparison.InvariantCultureIgnoreCase))) ||
-                            // user handlers:
-                        (!item.IsBuiltIn &&
-                         item.DeclarationType == DeclarationType.Procedure &&
-                         handlerNames.Contains(item.IdentifierName))
-                        ).ToList();
-
-            return handlers;
+                (item.DeclarationType == DeclarationType.Procedure &&
+                 item.ParentDeclaration.DeclarationType == DeclarationType.ClassModule && (
+                     item.IdentifierName.Equals("Class_Initialize", StringComparison.InvariantCultureIgnoreCase) ||
+                     item.IdentifierName.Equals("Class_Terminate", StringComparison.InvariantCultureIgnoreCase))) ||
+                // standard module built-in handlers (Excel specific):
+                (host != null &&
+                 host.ApplicationName.Equals("Excel", StringComparison.InvariantCultureIgnoreCase) &&
+                 item.DeclarationType == DeclarationType.Procedure &&
+                 item.ParentDeclaration.DeclarationType == DeclarationType.ProceduralModule && (
+                     item.IdentifierName.Equals("auto_open", StringComparison.InvariantCultureIgnoreCase) ||
+                     item.IdentifierName.Equals("auto_close", StringComparison.InvariantCultureIgnoreCase))) ||
+                // user handlers:
+                (!item.IsBuiltIn &&
+                 item.DeclarationType == DeclarationType.Procedure &&
+                 handlerNames.Contains(item.IdentifierName))
+                );
+
+            return new ConcurrentBag<Declaration>(handlers);
         }
     }
 }