Merge pull request #2605 from MDoerner/ReworkParseCoordinatorPart1Bugfix

Rework parse coordinator part1 bugfix

Author: retailcoder

Rubberduck.Parsing/VBA/ComponentParseTask.cs

@@ -101,9 +101,15 @@ public void Start(CancellationToken token)
                         Cause = exception
                     });
             }
-            catch (OperationCanceledException)
+            catch (OperationCanceledException exception)
             {
-                // no results to be used, so no results "returned"
+                //We return this, so that the calling code knows that the operation actually has been cancelled.
+                var failedHandler = ParseFailure;
+                if (failedHandler != null)
+                    failedHandler.Invoke(this, new ParseFailureArgs
+                    {
+                        Cause = exception
+                    });
             }
         }
 

Rubberduck.Parsing/VBA/ParseCoordinator.cs

@@ -215,7 +215,14 @@ private void ParseComponents(List<IVBComponent> components, CancellationToken to
 
             parser.ParseFailure += (sender, e) =>
             {
-                tcs.SetException(e.Cause);
+                if (e.Cause is OperationCanceledException)
+                {
+                    tcs.SetCanceled();
+                }
+                else
+                {
+                    tcs.SetException(e.Cause);
+                }
             };
             parser.ParseCompleted += (sender, e) =>
             {
@@ -230,7 +237,6 @@ private void ParseComponents(List<IVBComponent> components, CancellationToken to
 
         private void ProcessComponentParseResults(IVBComponent component, Task<ComponentParseTask.ParseCompletionArgs> finishedParseTask)
         {
-            finishedParseTask.Wait();
             if (finishedParseTask.IsFaulted)
             {
                 State.SetModuleState(component, ParserState.Error, finishedParseTask.Exception.InnerException as SyntaxErrorException);