Fix cancellation bug. Don't request reparse on startup--request it when the project is loaded.

Author: Hosch250

RetailCoder.VBE/API/ParserState.cs

@@ -78,7 +78,7 @@ public void Initialize(VBE vbe)
         public void Parse()
         {
             // blocking call
-            _parser.Parse();
+            _parser.Parse(new System.Threading.CancellationTokenSource());
         }
 
         /// <summary>

RetailCoder.VBE/App.cs

@@ -11,7 +11,6 @@
 using Rubberduck.UI.Command.MenuItems;
 using System;
 using System.Globalization;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Rubberduck
@@ -141,7 +140,6 @@ public void Startup()
             _appMenus.Initialize();
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
-            Task.Delay(1000).ContinueWith(t => UiDispatcher.Invoke(() => _parser.State.OnParseRequested(this)));
             UpdateLoggingLevel();
         }
 

Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs

@@ -7,9 +7,11 @@
 using Rubberduck.VBEditor;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Antlr4.Runtime.Misc;
+using NLog;
 
 namespace Rubberduck.Parsing.Symbols
 {
@@ -38,6 +40,9 @@ public DeclarationSymbolsListener(
             IDictionary<Tuple<string, DeclarationType>, Attributes> attributes,
             Declaration projectDeclaration)
         {
+            var log = LogManager.GetCurrentClassLogger();
+            var stop = Stopwatch.StartNew();
+
             _state = state;
             _qualifiedName = qualifiedName;
             _annotations = annotations;
@@ -68,6 +73,10 @@ public DeclarationSymbolsListener(
             {
                 bool hasDefaultInstanceVariable = type != vbext_ComponentType.vbext_ct_ClassModule && type != vbext_ComponentType.vbext_ct_StdModule;
 
+                var stop1 = Stopwatch.StartNew();
+                var stop2 = new Stopwatch();
+                var stop3 = new Stopwatch();
+
                 Declaration superType = null;
                 if (type == vbext_ComponentType.vbext_ct_Document)
                 {
@@ -83,7 +92,15 @@ public DeclarationSymbolsListener(
                             var allNamesMatch = true;
                             for (var i = 0; i < coclass.Key.Count; i++)
                             {
-                                if (coclass.Key[i] != _qualifiedName.Component.Properties.Item(i + 1).Name)
+                                stop2.Start();
+                                var propName = _qualifiedName.Component.Properties.Item(i + 1).Name;
+                                stop2.Stop();
+
+                                stop3.Start();
+                                var namesMatch = coclass.Key[i] != propName;
+                                stop3.Stop();
+
+                                if (namesMatch)
                                 {
                                     allNamesMatch = false;
                                     break;
@@ -101,6 +118,10 @@ public DeclarationSymbolsListener(
                         }
                     }
                 }
+                stop1.Stop();
+                log.Debug("{0}ms getting property name", stop2.ElapsedMilliseconds);
+                log.Debug("{0}ms comparing property name", stop3.ElapsedMilliseconds);
+                log.Debug("{0}ms resolving coclass", stop1.ElapsedMilliseconds);
 
                 _moduleDeclaration = new ClassModuleDeclaration(
                     _qualifiedName.QualifyMemberName(_qualifiedName.Component.Name),
@@ -123,6 +144,9 @@ public DeclarationSymbolsListener(
             {
                 DeclareControlsAsMembers(component);
             }
+
+            stop.Stop();
+            log.Debug("{0}ms in declaration listener ctor", stop.ElapsedMilliseconds);
         }
 
         private IEnumerable<IAnnotation> FindAnnotations()
@@ -801,8 +825,8 @@ public override void ExitPrivateTypeDeclaration(VBAParser.PrivateTypeDeclaration
         {
             _parentDeclaration = _moduleDeclaration;
         }
-        
-        public void AddUdtDeclaration(VBAParser.UdtDeclarationContext udtDeclaration, Accessibility accessibility, ParserRuleContext context)
+
+        private void AddUdtDeclaration(VBAParser.UdtDeclarationContext udtDeclaration, Accessibility accessibility, ParserRuleContext context)
         {
             var identifier = Identifier.GetName(udtDeclaration.untypedIdentifier());
             var identifierSelection = Identifier.GetNameSelection(udtDeclaration.untypedIdentifier());