Honor .sortedKeys #11
Conversation
This reverts commit 7f71095. # Conflicts: # .swiftformat
Codecov Report
@@ Coverage Diff @@
## master #11 +/- ##
=========================================
+ Coverage 24.58% 26.3% +1.72%
=========================================
Files 12 12
Lines 1554 1589 +35
=========================================
+ Hits 382 418 +36
+ Misses 1172 1171 -1
Continue to review full report at Codecov.
|
# Conflicts: # Sources/XMLCoder/Decoder/XMLDecoder.swift
There was a problem hiding this comment.
Thank you very much for your contribution! I'd be happy to merge this after we get some consistency in trailing whitespaces on empty newlines, spaces around range operators and CI failures are fixed. I'd see no problem in merging this PR after that, but in the future it would be great if unrelated changes are split into multiple PRs, in this case one PR could be a fix for .sortedKeys and another one only related to SwiftFormat.
| @@ -23,7 +23,7 @@ internal extension DecodingError { | |||
| let description = "Expected to decode \(expectation) but found \(_typeDescription(of: reality)) instead." | |||
| return .typeMismatch(expectation, Context(codingPath: path, debugDescription: description)) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
This looks like trailing whitespaces on a blank line, was this committed by mistake or added by SwiftFormat? In either case it would be great to avoid these
| let trailingUnderscoreRange = stringKey.index(after: lastNonUnderscore)..<stringKey.endIndex | ||
| let keyRange = firstNonUnderscore ... lastNonUnderscore | ||
| let leadingUnderscoreRange = stringKey.startIndex ..< firstNonUnderscore | ||
| let trailingUnderscoreRange = stringKey.index(after: lastNonUnderscore) ..< stringKey.endIndex |
There was a problem hiding this comment.
Adding spaces around range operators is an interesting style I haven't seen before, including this library. In general I'd prefer to stick to having no spaces around those, which is the same as what the Swift standard library does for example. Does SwiftFormat support that?
| let result: Item = try! decode(xml) | ||
|
|
||
| // then | ||
| let expected = Item(id: "1542637462", creator: "Francisco Moya", children: nil) |
There was a problem hiding this comment.
I'm a bit confused why children gets a nil value here, isn't it supposed to be Attribute(name: "Xpos", value: "0")?
There was a problem hiding this comment.
Hey Max! Thanks—by mistake, I pushed some things to this PR that should have gone elsewhere. My last intended commit was ‘Complete if #availables’. I’ll revert as appropriate and fix the automated formatting. Thanks!
Add benchmark baselines Pull in tests (CoreOffice#11) Add Decoding support for choice elements (CoreOffice#15) Fix indentation (CoreOffice#16) Replace usage of XCTUnrwap (CoreOffice#19) Add nested choice tests (CoreOffice#18) Add falsely passing double array roundtrip test (CoreOffice#17)
Add benchmark baselines Pull in tests (CoreOffice#11) Add Decoding support for choice elements (CoreOffice#15) Fix indentation (CoreOffice#16) Replace usage of XCTUnrwap (CoreOffice#19) Add nested choice tests (CoreOffice#18) Add falsely passing double array roundtrip test (CoreOffice#17)
I realized that the
.sortedKeysformatting option was being ignored. Sorting keys is a convenient thing to have, particularly when testing—else, comparing against strings breaks all the time.This PR wants to fix that.
It also adds a
.swiftformatfile. Its contents were inferred automatically by SwiftFormat itself. I just wanted my contribution to be consistent with the project’s de facto style, but I think all projects benefit from explicit formatting rules—thus this addition.