Emit demangled Swift type names in view hierarchy dumps

Author: amorde

Package.swift

@@ -17,7 +17,7 @@ let package = Package(
     targets: [
         .target(
             name: "KIF",
-            dependencies: [],
+            dependencies: ["KIFSwift"],
             publicHeadersPath: "include",
             cSettings: [
                 .headerSearchPath("ApplePrivateAPIs/"),
@@ -28,6 +28,10 @@ let package = Package(
             ],
             linkerSettings: [.linkedFramework("IOKit"), .linkedFramework("XCTest")]
         ),
+        .target(
+            name: "KIFSwift",
+            dependencies: [],
+        ),
         .testTarget(
             name: "KIFTests",
             dependencies: ["KIF"],

Sources/KIF/Additions/UIView-Debugging.m

@@ -9,6 +9,7 @@
 #import "KIFEventVisualizer.h"
 #import "KIFTouchVisualizerView.h"
 #import <Foundation/Foundation.h>
+@import KIFSwift;
 
 @implementation UIView (Debugging)
 
@@ -94,7 +95,7 @@ - (void)_KIF_appendIndentation:(int)indent result:(NSMutableString *)result{
 }
 
 - (void)_KIF_appendClassName:(NSMutableString *)result {
-    [result appendString:NSStringFromClass([self class])];
+    [result appendString:[NSObject _kif_typeNameOfObject:self qualified:YES]];
 }
 
 - (void)_KIF_appendAccessibilityInfo:(NSMutableString *)result {

Sources/KIFSwift/NSObject+KIF.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+extension NSObject {
+    /// Return a demangled type name for a given object.
+    /// If `qualified` is `true`, Swift types will produce a qualified type name
+    @objc(_kif_typeNameOfObject:qualified:)
+    public static func _kif_typeName(object: Any, qualified: Bool) -> String {
+        let meta = type(of: object)
+        if qualified {
+            return String(reflecting: meta)    
+        } else {
+            return String(describing: meta)
+        }
+    }
+}