Merge pull request #1154 from retailcoder/CodeExplorer

Parser/Resolver fixes

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -69,9 +69,9 @@ public App(VBE vbe, IMessageBox messageBox,
 
             var sink = new VBProjectsEventsSink();
             var connectionPointContainer = (IConnectionPointContainer)_vbe.VBProjects;
-            Guid interfaceId = typeof (_dispVBProjectsEvents).GUID;
+            var interfaceId = typeof (_dispVBProjectsEvents).GUID;
             connectionPointContainer.FindConnectionPoint(ref interfaceId, out _projectsEventsConnectionPoint);
-
+            
             sink.ProjectAdded += sink_ProjectAdded;
             sink.ProjectRemoved += sink_ProjectRemoved;
             sink.ProjectActivated += sink_ProjectActivated;
@@ -82,8 +82,9 @@ public App(VBE vbe, IMessageBox messageBox,
             UiDispatcher.Initialize();
         }
 
-        void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
+        async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
         {
+            Debug.WriteLine(string.Format("Project '{0}' was removed.", e.Item.Name));
             Tuple<IConnectionPoint, int> value;
             if (_componentsEventsConnectionPoints.TryGetValue(e.Item.VBComponents, out value))
             {
@@ -94,8 +95,9 @@ void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
             }
         }
 
-        void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
+        async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
         {
+            Debug.WriteLine(string.Format("Project '{0}' was added.", e.Item.Name));
             var connectionPointContainer = (IConnectionPointContainer)e.Item.VBComponents;
             Guid interfaceId = typeof(_dispVBComponentsEvents).GUID;
 
@@ -117,46 +119,54 @@ void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
             _parser.State.OnParseRequested();
         }
 
-        void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
+        async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            Debug.WriteLine(string.Format("Component '{0}' was selected.", e.Item.Name));
             // do something?
         }
 
-        void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBComponent> e)
+        async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBComponent> e)
         {
+            Debug.WriteLine(string.Format("Component '{0}' was renamed.", e.Item.Name));
             _parser.State.ClearDeclarations(e.Item);
             _parser.State.OnParseRequested(e.Item);
         }
 
-        void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent> e)
+        async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            Debug.WriteLine(string.Format("Component '{0}' was removed.", e.Item.Name));
             _parser.State.ClearDeclarations(e.Item);
         }
 
-        void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent> e)
+        async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            Debug.WriteLine(string.Format("Component '{0}' was reloaded.", e.Item.Name));
             _parser.State.ClearDeclarations(e.Item);
             _parser.State.OnParseRequested(e.Item);
         }
 
-        void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e)
+        async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            Debug.WriteLine(string.Format("Component '{0}' was added.", e.Item.Name));
             _parser.State.OnParseRequested(e.Item);
         }
 
-        void sink_ComponentActivated(object sender, DispatcherEventArgs<VBComponent> e)
+        async void sink_ComponentActivated(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            Debug.WriteLine(string.Format("Component '{0}' was activated.", e.Item.Name));
             // do something?
         }
 
-        void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProject> e)
+        async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProject> e)
         {
+            Debug.WriteLine(string.Format("Project '{0}' was renamed.", e.Item.Name));
             _parser.State.ClearDeclarations(e.Item);
             _parser.State.OnParseRequested();
         }
 
-        void sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject> e)
+        async void sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject> e)
         {
+            Debug.WriteLine(string.Format("Project '{0}' was activated.", e.Item.Name));
             // do something?
         }
 
@@ -249,13 +259,6 @@ public void Startup()
             _appMenus.Initialize();
             _appMenus.Localize();
 
-            // delay to allow the VBE to properly load. HostApplication is null until then.
-            Task.Delay(1000).ContinueWith(t =>
-            {
-                _parser.State.AddBuiltInDeclarations(_vbe.HostApplication());
-                //_parser.State.OnParseRequested();
-            });
-
             //_hooks.AddHook(new LowLevelKeyboardHook(_vbe));
             //_hooks.AddHook(new HotKey((IntPtr)_vbe.MainWindow.HWnd, "%^R", Keys.R));
             //_hooks.AddHook(new HotKey((IntPtr)_vbe.MainWindow.HWnd, "%^I", Keys.I));

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -29,9 +29,13 @@ public RubberduckParser(VBE vbe, RubberduckParserState state)
             state.ParseRequest += ReparseRequested;
         }
 
-        private void ReparseRequested(object sender, EventArgs e)
+        private async void ReparseRequested(object sender, EventArgs e)
         {
-            Task.Run(() => ParseParallel());
+            if (!_state.ParseTrees.Any())
+            {
+                _state.AddBuiltInDeclarations(_vbe.HostApplication());
+            }
+            await ParseParallel();
         }
 
         private readonly VBE _vbe;
@@ -102,7 +106,7 @@ private CancellationTokenSource RenewTokenSource(VBComponent component)
             return tokenSource;
         }
 
-        private void ParseParallel()
+        private async Task ParseParallel()
         {
             try
             {
@@ -114,7 +118,7 @@ private void ParseParallel()
                 SetComponentsState(components, ParserState.Pending);
 
                 var parseTasks = components.Select(vbComponent => Task.Run(() => ParseComponent(vbComponent, false))).ToArray();
-                Task.WhenAll(parseTasks)
+                await Task.WhenAll(parseTasks)
                     .ContinueWith(t =>
                     {
                         using (var tokenSource = new CancellationTokenSource())
@@ -148,7 +152,7 @@ private void Parse(VBComponent vbComponent, CancellationToken token, TokenStream
                 var code = rewriter == null
                     ? string.Join(Environment.NewLine, vbComponent.CodeModule.GetSanitizedCode())
                     : rewriter.GetText();
-                    // note: removes everything ignored by the parser, e.g. line numbers and comments
+                    // note: removes everything ignored by the parser, e.g. line numbers
 
                 ParseInternal(component, code, token);
             }
@@ -287,6 +291,7 @@ private void ResolveReferences(VBComponent component, IParseTree tree, Cancellat
                 return;
             }
 
+            _state.SetModuleState(component, ParserState.Resolving);
             Debug.Print("Resolving '{0}'...", component.Name);
 
             if (!string.IsNullOrWhiteSpace(tree.GetText().Trim()))