Update tracers and factory

Author: bclothier

Rubberduck.VBEEditor/ComManagement/TypeLibs/DebugInternal/TypeInfoWrapperTracer.cs

@@ -1,5 +1,4 @@
-#if DEBUG && TRACE_TYPEAPI
-using System;
+using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.ComTypes;
 using Rubberduck.VBEditor.ComManagement.TypeLibs.Abstract;
@@ -748,5 +747,4 @@ int ITypeInfoWrapper.Invoke(IntPtr pvInstance, int memid, short wFlags, IntPtr p
             return Invoke(pvInstance, memid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
         }
     }
-}
-#endif
+}

Rubberduck.VBEEditor/ComManagement/TypeLibs/DebugInternal/TypeLibWrapperTracer.cs

@@ -1,5 +1,4 @@
-#if DEBUG && TRACE_TYPEAPI
-using System;
+using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.ComTypes;
 using Rubberduck.VBEditor.ComManagement.TypeLibs.Abstract;
@@ -314,5 +313,4 @@ int ITypeLibWrapper.GetSafeTypeInfoByIndex(int index, out ITypeInfoWrapper outTI
             return result;
         }
     }
-}
-#endif
+}

Rubberduck.VBEEditor/ComManagement/TypeLibs/TypeApiFactory.cs

@@ -1,13 +1,13 @@
 using System;
+using System.Diagnostics;
 using System.Runtime.InteropServices.ComTypes;
 using Rubberduck.VBEditor.ComManagement.TypeLibs.Abstract;
+using Rubberduck.VBEditor.ComManagement.TypeLibs.DebugInternal;
+using Rubberduck.VBEditor.ComManagement.TypeLibs.Unmanaged;
 
 // TODO The tracers are broken - using them will cause a NRE inside the 
 // unmanaged boundary. If we need to enable them for diagnostics, this needs
 // to be fixed first. 
-#if DEBUG && TRACE_TYPEAPI
-using Rubberduck.VBEditor.ComManagement.TypeLibs.DebugInternal;
-#endif
 
 namespace Rubberduck.VBEditor.ComManagement.TypeLibs
 {
@@ -21,32 +21,37 @@ internal static class TypeApiFactory
     {
         internal static ITypeLibWrapper GetTypeLibWrapper(IntPtr rawObjectPtr, bool addRef)
         {
-            var wrapper = new TypeLibWrapper(rawObjectPtr, addRef);
-#if DEBUG && TRACE_TYPEAPI
-            return new TypeLibWrapperTracer(wrapper, wrapper);
-#else
+            ITypeLibWrapper wrapper = new TypeLibWrapper(rawObjectPtr, addRef);
+            TraceWrapper(ref wrapper);
             return wrapper;
-#endif
+        }
+
+        [Conditional("DEBUG")]
+        [Conditional("TRACE_TYPEAPI")]
+        private static void TraceWrapper(ref ITypeLibWrapper wrapper)
+        {
+            wrapper = new TypeLibWrapperTracer(wrapper, (ITypeLibInternal)wrapper);
         }
 
         internal static ITypeInfoWrapper GetTypeInfoWrapper(IntPtr rawObjectPtr, int? parentUserFormUniqueId = null)
         {
-            var wrapper = new TypeInfoWrapper(rawObjectPtr, parentUserFormUniqueId);
-#if DEBUG && TRACE_TYPEAPI
-            return new TypeInfoWrapperTracer(wrapper, wrapper);
-#else
+            ITypeInfoWrapper wrapper = new TypeInfoWrapper(rawObjectPtr, parentUserFormUniqueId);
+            TraceWrapper(ref wrapper);
             return wrapper;
-#endif
         }
 
         internal static ITypeInfoWrapper GetTypeInfoWrapper(ITypeInfo rawTypeInfo)
         {
-            var wrapper = new TypeInfoWrapper(rawTypeInfo);
-#if DEBUG && TRACE_TYPEAPI
-            return new TypeInfoWrapperTracer(wrapper, wrapper);
-#else
+            ITypeInfoWrapper wrapper = new TypeInfoWrapper(rawTypeInfo);
+            TraceWrapper(ref wrapper);
             return wrapper;
-#endif
+        }
+
+        [Conditional("DEBUG")]
+        [Conditional("TRACE_TYPEAPI")]
+        private static void TraceWrapper(ref ITypeInfoWrapper wrapper)
+        {
+            wrapper = new TypeInfoWrapperTracer(wrapper, (ITypeInfoInternal)wrapper);
         }
     }
 }