Skip to content

Make NSError.description incorporate userInfo #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dfabulich wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make NSError.description incorporate userInfo #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions Sources/SkipFoundation/NSError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public let NSStringEncodingErrorKey: String = "NSStringEncodingErrorKey"
public let NSURLErrorKey: String = "NSURL"
public let NSFilePathErrorKey: String = "NSFilePathErrorKey"

open class NSError : Error, CustomStringConvertible {
open class NSError : Error, CustomStringConvertible, CustomDebugStringConvertible {
// ErrorType forbids this being internal
open var _domain: String
open var _code: Int
Expand Down Expand Up @@ -120,7 +120,22 @@ open class NSError : Error, CustomStringConvertible {
}

open var description: String {
return "Error Domain=\(domain) Code=\(code) \"\(localizedFailureReason ?? "(null)")\""
let message: String
if let localizedDescription = userInfo[NSLocalizedDescriptionKey] as? String {
message = localizedDescription
} else {
message = localizedFailureReason ?? "(null)"
}
let base = "Error Domain=\(domain) Code=\(code) \"\(message)\""
if userInfo.isEmpty {
return base
} else {
return "\(base) UserInfo=\(userInfo)"
}
}

open var debugDescription: String {
return description
}
}

Expand Down