Skip to content

Fix regression in typeName output #77

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
stephencelis merged 3 commits into from
Mar 8, 2023
Merged

Fix regression in typeName output #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fc9df9
Fix regression in `typeName` output
stephencelis Mar 8, 2023
a724f7a
fix
stephencelis Mar 8, 2023
7f2fb85
wip
stephencelis Mar 8, 2023
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
6 changes: 5 additions & 1 deletion Sources/CustomDump/Conformances/KeyPath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ extension AnyKeyPath: CustomDumpStringConvertible {
}
return name
#else
return typeName(Self.self, genericsAbbreviated: false)
return """
\(typeName(Self.self))<\
\(typeName(Self.rootType)), \
\(typeName(Self.valueType,genericsAbbreviated: false))>
"""
#endif
}
}
Expand Down
8 changes: 4 additions & 4 deletions Sources/CustomDump/Internal/AnyType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ func typeName(
) -> String {
var name = _typeName(type, qualified: qualified)
.replacingOccurrences(
of: #"\w+\.(\w+)"#,
with: "$1",
of: #"\(unknown context at \$[[:xdigit:]]+\)\."#,
with: "",
options: .regularExpression
)
.replacingOccurrences(
of: #"\(unknown context at \$[[:xdigit:]]+\)\."#,
with: "",
of: #"\w+\.([\w.]+)"#,
with: "$1",
options: .regularExpression
)
if genericsAbbreviated {
Expand Down
21 changes: 21 additions & 0 deletions Tests/CustomDumpTests/DumpTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,27 @@ final class DumpTests: XCTestCase {
Foo.Bar.self
"""
)

struct Feature {
struct State {}
}
dump = ""
customDump(Feature.State.self, to: &dump)
XCTAssertNoDifference(
dump,
"""
DumpTests.Feature.State.self
Copy link
Member Author

@stephencelis stephencelis Mar 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without the change, this dumps DumpTests.State.self.

"""
)

dump = ""
customDump((x: Double, y: Double).self, to: &dump)
XCTAssertNoDifference(
dump,
"""
(x: Double, y: Double).self
"""
)
}

func testClass() {
Expand Down