Merge pull request #5065 from apple/debuggable-nserrors

jakepetroules · web-flow · commit 951f3532bdb9 · 2024-08-13T17:04:59.000-07:00
Include userInfo in Error descriptions
diff --git a/Sources/Foundation/NSError.swift b/Sources/Foundation/NSError.swift
@@ -182,7 +182,11 @@ open class NSError : NSObject, NSCopying, NSSecureCoding, NSCoding, @unchecked S
     }
     
     override open var description: String {
-        return "Error Domain=\(domain) Code=\(code) \"\(localizedFailureReason ?? "(null)")\""
+        var result = "Error Domain=\(domain) Code=\(code) \"\(localizedFailureReason ?? "(null)")\""
+        if !userInfo.isEmpty {
+            result += "UserInfo={\(userInfo.map { "\($0)=\($1)"}.joined(separator: ", "))}"
+        }
+        return result
     }
     
     // -- NSObject Overrides --

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,11 @@ open class NSError : NSObject, NSCopying, NSSecureCoding, NSCoding, @unchecked S`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`override open var description: String {`
`185`		`- return "Error Domain=\(domain) Code=\(code) \"\(localizedFailureReason ?? "(null)")\""`
	`185`	`+ var result = "Error Domain=\(domain) Code=\(code) \"\(localizedFailureReason ?? "(null)")\""`
	`186`	`+ if !userInfo.isEmpty {`
	`187`	`+ result += "UserInfo={\(userInfo.map { "\($0)=\($1)"}.joined(separator: ", "))}"`
	`188`	`+ }`
	`189`	`+ return result`
`186`	`190`	`}`
`187`	`191`
`188`	`192`	`// -- NSObject Overrides --`