Merge branch 'ReworkParseCoordinatorPart1Bugfix' into ReworkParseCoordinatorBugfixing

Incorporating bugfix.

Author: MDoerner

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

@@ -242,7 +242,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) =>
             {
@@ -257,7 +264,6 @@ private void ParseComponents(List<IVBComponent> components, CancellationToken to
 
         private void ProcessComponentParseResults(IVBComponent component, Task<ComponentParseTask.ParseCompletionArgs> finishedParseTask)
         {
-            finishedParseTask.Wait();
             if (finishedParseTask.IsFaulted)
             {
                 //In contrast to the situation in the success scenario, the overall parser state is reevaluated immediately.

Rubberduck.VBEEditor/SafeComWrappers/Office.Core/Abstract/IControl.cs

@@ -1,6 +1,5 @@
 using System;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.ComTypes;
+using System.ComponentModel;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.VBEditor.SafeComWrappers.Office.Core.Abstract
@@ -16,59 +15,12 @@ public static string TypeName(this IControl control)
         {
             try
             {
-                var dispatch = control.Target as IDispatch;
-                if (dispatch == null)
-                {
-                    return "Control";
-                }
-                ITypeInfo info;               
-                dispatch.GetTypeInfo(0, 0, out info);
-                string name;
-                string docs;
-                int context;
-                string help;
-                info.GetDocumentation(-1, out name, out docs, out context, out help);
-                return name;
+                return TypeDescriptor.GetClassName(control.Target);
             }
             catch
             {
                 return "Control";
             }
-        }
-
-        [ComImport]
-        [Guid("00020400-0000-0000-C000-000000000046")]
-        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        interface IDispatch
-        {
-            [PreserveSig]
-            int GetTypeInfoCount(out int Count);
-
-            [PreserveSig]
-            int GetTypeInfo(
-                [MarshalAs(UnmanagedType.U4)] int iTInfo,
-                [MarshalAs(UnmanagedType.U4)] int lcid,
-                out ITypeInfo typeInfo);
-
-            [PreserveSig]
-            int GetIDsOfNames(
-                ref Guid riid,
-                [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.LPWStr)]
-			string[] rgsNames,
-                int cNames,
-                int lcid,
-                [MarshalAs(UnmanagedType.LPArray)] int[] rgDispId);
-
-            [PreserveSig]
-            int Invoke(
-                int dispIdMember,
-                ref Guid riid,
-                uint lcid,
-                ushort wFlags,
-                ref System.Runtime.InteropServices.ComTypes.DISPPARAMS pDispParams,
-                out object pVarResult,
-                ref System.Runtime.InteropServices.ComTypes.EXCEPINFO pExcepInfo,
-                IntPtr[] pArgErr);
-        }        
+        }     
     }
 }