Changes per PR comments

Author: Andrew Mansell

Rubberduck.VBEEditor/Events/VBENativeServices.cs

@@ -88,11 +88,11 @@ public static void VbeEventCallback(IntPtr hWinEventHook, uint eventType, IntPtr
             if (idObject != (int)ObjId.Cursor)
             {
                 var windowClassName = hwnd.ToClassName();
-                if (!WinEventMap.Lookup.TryGetValue(eventType, out var eventName))
+                if (!WinEventMap.Lookup.TryGetValue((int)eventType, out var eventName))
                 {
                     eventName = "Unknown";
                 }
-                Debug.WriteLine("EVT: {0:X4} ({1}) Hwnd {2:X4} ({3}), idObject {4}, idChild {5}", eventType, eventName, (int)hwnd, windowClassName, idObject, idChild);
+                Debug.WriteLine($"EVT: 0x{eventType:X4} ({eventName}) Hwnd 0x{(int)hwnd:X4} ({windowClassName}), idObject {idObject}, idChild {idChild}");
             }
 #endif
 

Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj

@@ -98,6 +98,7 @@
     <Compile Include="SafeComWrappers\SafeRedirectedEventedComWrapper.cs" />
     <Compile Include="SafeComWrappers\VB\Abstract\IHostApplication.cs" />
     <Compile Include="SafeComWrappers\VB\Enums\VBEKind.cs" />
+    <Compile Include="Utility\EnumHelper.cs" />
     <Compile Include="Utility\UiContext.cs" />
     <Compile Include="VBERuntime\IVBERuntime.cs" />
     <Compile Include="VBERuntime\Settings\IVBESettings.cs" />

Rubberduck.VBEEditor/Utility/EnumHelper.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Rubberduck.VBEditor.Utility
+{
+    public static class EnumHelper
+    {
+        public static Dictionary<TUnderlying, string> ToDictionary<TEnum, TUnderlying>()
+        {
+            var enumType = typeof(TEnum);
+            var underlyingType = typeof(TUnderlying);
+
+            Debug.Assert(enumType.IsEnum, $"Type '{enumType.Name}' is not an enum");
+
+            Debug.Assert(Enum.GetUnderlyingType(enumType) == underlyingType, 
+                $"Type parameter '{underlyingType}' does not match underlying type for enum '{enumType.Name}' ('{Enum.GetUnderlyingType(enumType).Name}')");
+            
+            var dictionary = new Dictionary<TUnderlying, string>();
+
+            foreach (var fieldInfo in enumType.GetFields().Where(fi => fi.FieldType.IsEnum))
+            {
+                if (fieldInfo.GetCustomAttributes(typeof(ReflectionIgnoreAttribute), false).Any())
+                {
+                    continue;
+                }
+
+                var key = (TUnderlying) fieldInfo.GetRawConstantValue();
+
+                dictionary[key] = dictionary.ContainsKey(key)
+                    ? $"{dictionary[key]} / {fieldInfo.Name}"
+                    : fieldInfo.Name;
+            }
+
+            return dictionary;
+        }
+    }
+
+    public class ReflectionIgnoreAttribute : Attribute
+    {
+    }
+}

Rubberduck.VBEEditor/WindowsApi/SubclassingWindow.cs

@@ -89,11 +89,17 @@ public virtual int SubClassProc(IntPtr hWnd, IntPtr msg, IntPtr wParam, IntPtr l
 #if (DEBUG && (THIRSTY_DUCK || THIRSTY_DUCK_WM))
             //This is an output window firehose kind of like spy++. Prepare for some spam.
             var windowClassName = ToClassName(hWnd);
-            if (!(WM_MAP.Lookup.TryGetValue((uint) msg, out var wmName)))
+            if (WM_MAP.Lookup.TryGetValue((uint) msg, out var wmName))
+            {
+                wmName = $"WM_{wmName}";
+            }
+            else
             {
                 wmName = "Unknown";
             }
-            Debug.WriteLine("MSG: {0:X4} ({1}), Hwnd {2:X4} ({3}), wParam {4:X4}, lParam {5:X4}", (uint)msg, wmName, (uint)hWnd, windowClassName, (uint)wParam, (uint)lParam);
+
+
+            Debug.WriteLine($"MSG: 0x{(uint)msg:X4} ({wmName}), Hwnd 0x{(uint)hWnd:X4} ({windowClassName}), wParam 0x{(uint)wParam:X4}, lParam 0x{(uint)lParam:X4}");
 #endif
 
             if ((uint) msg == (uint) WM.DESTROY)