Skip to content

Sort unordered dictionaries when nested in another type #91

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

Merged
merged 1 commit into from
May 12, 2023
Merged

Sort unordered dictionaries when nested in another type #91

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Sources/CustomDump/Diff.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ public func diff<T>(_ lhs: T, _ rhs: T, format: DiffFormat = .default) -> String
}
return lhs.key == rhs.key
},
areInIncreasingOrder: T.self is _UnorderedCollection.Type
areInIncreasingOrder: lhsMirror.subjectType is _UnorderedCollection.Type
? {
guard
let lhs = $0.value as? (key: AnyHashable, value: Any),
Expand Down Expand Up @@ -483,7 +483,7 @@ public func diff<T>(_ lhs: T, _ rhs: T, format: DiffFormat = .default) -> String
areEquivalent: {
isIdentityEqual($0.value, $1.value) || isMirrorEqual($0.value, $1.value)
},
areInIncreasingOrder: T.self is _UnorderedCollection.Type
areInIncreasingOrder: lhsMirror.subjectType is _UnorderedCollection.Type
? {
_customDump($0.value, name: nil, indent: 0, isRoot: false, maxDepth: 1)
< _customDump($1.value, name: nil, indent: 0, isRoot: false, maxDepth: 1)
Expand Down
4 changes: 2 additions & 2 deletions Sources/CustomDump/Dump.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func _customDump<T, TargetStream>(
dumpChildren(
of: mirror,
prefix: "[", suffix: "]",
by: T.self is _UnorderedCollection.Type
by: mirror.subjectType is _UnorderedCollection.Type
? {
guard
let (lhsKey, _) = $0.value as? (key: AnyHashable, value: Any),
Expand Down Expand Up @@ -262,7 +262,7 @@ func _customDump<T, TargetStream>(
dumpChildren(
of: mirror,
prefix: "Set([", suffix: "])",
by: T.self is _UnorderedCollection.Type
by: mirror.subjectType is _UnorderedCollection.Type
? {
_customDump($0.value, name: nil, indent: 0, isRoot: false, maxDepth: 1)
< _customDump($1.value, name: nil, indent: 0, isRoot: false, maxDepth: 1)
Expand Down
24 changes: 24 additions & 0 deletions Tests/CustomDumpTests/DumpTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,31 @@ final class DumpTests: XCTestCase {
]
"""
)
}

func testDictionary_Nested() {
struct NestedDictionary {
let content: [String: Int]
}

XCTAssertNoDifference(
"""
DumpTests.NestedDictionary(
content: [
"a": 5,
"b": 9,
"c": 1,
"d": -3,
"e": 12
]
)
""",
String(
customDumping: NestedDictionary(
content: ["a": 5, "b": 9, "c": 1, "d": -3, "e": 12]
)
)
)
}

func testEnum() {
Expand Down