Merge branch 'BugBlipper'

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -154,7 +154,7 @@ private void ParseComponentAsync(VBComponent component, bool resolve = true)
             var tokenSource = RenewTokenSource(component);
 
             var token = tokenSource.Token;
-            _parser.ParseAsync(component, token).Wait(token);
+            _parser.ParseAsync(component, token);
 
             if (resolve && !token.IsCancellationRequested)
             {
@@ -216,8 +216,6 @@ private void ParseAll()
                     _parser.Resolve(tokenSource.Token);
                 }
             }
-
-            var v = _parser.State.AllDeclarations.Where(d => !d.IsBuiltIn);
         }
 
         private void CleanReloadConfig()

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -28,15 +28,17 @@ public RubberduckParser(RubberduckParserState state)
         private readonly RubberduckParserState _state;
         public RubberduckParserState State { get { return _state; } }
 
-        public async Task ParseAsync(VBComponent vbComponent, CancellationToken token)
+        public Task ParseAsync(VBComponent vbComponent, CancellationToken token)
         {
             var component = vbComponent;
 
+            token.ThrowIfCancellationRequested();
             var parseTask = Task.Run(() => ParseInternal(component, token), token);
 
             try
             {
-                await parseTask;
+                token.ThrowIfCancellationRequested();
+                parseTask.Wait(token);
             }
             catch (SyntaxErrorException exception)
             {
@@ -45,7 +47,9 @@ public async Task ParseAsync(VBComponent vbComponent, CancellationToken token)
             catch (OperationCanceledException)
             {
                 // no need to blow up
-            } 
+            }
+
+            return null;
         }
 
         public void Resolve(CancellationToken token)