Fix an infinite recursion when printing the redacted description of SourceKitLSPOptions

Author: ahoppen

Sources/SKLogging/CustomLogStringConvertible.swift

@@ -115,8 +115,6 @@ public func recursiveRedactedDescription(of value: Any) -> String {
     return value.description
   case let value as String:
     return value.hashForLogging
-  case let value as any CustomLogStringConvertible:
-    return value.redactedDescription
   case let value as any OptionalProtocol:
     if let value = value.asOptional {
       return recursiveRedactedDescription(of: value)
@@ -129,11 +127,17 @@ public func recursiveRedactedDescription(of value: Any) -> String {
 
   let children = Mirror(reflecting: value).children.sorted { $0.label ?? "" < $1.label ?? "" }
   if !children.isEmpty {
-    return "{"
-      + children.map { (label, value) -> String in
-        "\(label ?? "<nil>"): \(recursiveRedactedDescription(of: value))"
-      }.joined(separator: ", ")
-      + "}"
+    let childrenKeyValuePairs = children.map { (label, value) -> String in
+      let label = label ?? "<nil>"
+      let value =
+        if let value = value as? any CustomLogStringConvertible {
+          value.redactedDescription
+        } else {
+          recursiveRedactedDescription(of: value)
+        }
+      return "\(label): \(value)"
+    }
+    return "{" + childrenKeyValuePairs.joined(separator: ", ") + "}"
   }
   return "<private>"
 }

Tests/SKLoggingTests/LoggingTests.swift

@@ -237,5 +237,21 @@ final class LoggingTests: XCTestCase {
       recursiveRedactedDescription(of: ("abc" as String?) as Any),
       "MD5 digest: 900150983cd24fb0d6963f7d28e17f72"
     )
+
+    struct Something: CustomLogStringConvertible {
+      let x = 1
+      let y = "hi"
+
+      var redactedDescription: String {
+        recursiveRedactedDescription(of: self)
+      }
+
+      var description: String { "" }
+    }
+
+    XCTAssertEqual(
+      Something().redactedDescription,
+      "{x: 1, y: MD5 digest: 49f68a5c8493ec2c0bf489821c21fc3b}"
+    )
   }
 }