-
Notifications
You must be signed in to change notification settings - Fork 250
Fix type mismatch error in reflowMultilineStringLiterals
#979
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.
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
allevato
merged 9 commits into
swiftlang:main
from
dongdong867:fix_enum_raw_type_mismatch_in_configuration
Apr 8, 2025
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c13cd26
Add `String` raw type to `MultilineStringReflowBehavior`
dongdong867 fbac9f5
Create a `LegacyMultilineStringReflowBehavior` to avoid version bump
dongdong867 52ca716
Add document and notes for legacy object type in `reflowMultilineStri…
dongdong867 7de00b4
refactor: make code in `MultilineStringReflowBehavior` concise
dongdong867 1a1f336
Remove unused var getter from `LegacyMultilineStringReflowBehavior`
dongdong867 adbbbe2
Add backquote to value in documentation
dongdong867 28a70a2
Add test for decoding `reflowMultilineStringLiterals`
dongdong867 0927ba6
Replace dict value with enum shorthand in tests
dongdong867 547dcfe
Add detected breaking changes to `api-breakages.txt`
dongdong867 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -64,4 +64,47 @@ final class ConfigurationTests: XCTestCase { | |||||||||||||||||||||||||
let path = #"\\mount\test.swift"# | ||||||||||||||||||||||||||
XCTAssertNil(Configuration.url(forConfigurationFileApplyingTo: URL(fileURLWithPath: path))) | ||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||
|
||||||||||||||||||||||||||
func testDecodingReflowMultilineStringLiteralsAsString() throws { | ||||||||||||||||||||||||||
typealias MultilineStringReflowBehavior = Configuration.MultilineStringReflowBehavior | ||||||||||||||||||||||||||
|
||||||||||||||||||||||||||
let testCases = [ | ||||||||||||||||||||||||||
"never": MultilineStringReflowBehavior.never, | ||||||||||||||||||||||||||
"always": MultilineStringReflowBehavior.always, | ||||||||||||||||||||||||||
"onlyLinesOverLength": MultilineStringReflowBehavior.onlyLinesOverLength, | ||||||||||||||||||||||||||
] | ||||||||||||||||||||||||||
|
||||||||||||||||||||||||||
for (jsonString, expectedBehavior) in testCases { | ||||||||||||||||||||||||||
let jsonData = """ | ||||||||||||||||||||||||||
{ | ||||||||||||||||||||||||||
"reflowMultilineStringLiterals": "\(jsonString)" | ||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||
""".data(using: .utf8)! | ||||||||||||||||||||||||||
|
||||||||||||||||||||||||||
let config = try JSONDecoder().decode(Configuration.self, from: jsonData) | ||||||||||||||||||||||||||
XCTAssertEqual(config.reflowMultilineStringLiterals, expectedBehavior) | ||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||
|
||||||||||||||||||||||||||
func testDecodingReflowMultilineStringLiteralsAsObject() throws { | ||||||||||||||||||||||||||
typealias MultilineStringReflowBehavior = Configuration.MultilineStringReflowBehavior | ||||||||||||||||||||||||||
|
||||||||||||||||||||||||||
let testCases = [ | ||||||||||||||||||||||||||
"{ \"never\": {} }": MultilineStringReflowBehavior.never, | ||||||||||||||||||||||||||
"{ \"always\": {} }": MultilineStringReflowBehavior.always, | ||||||||||||||||||||||||||
"{ \"onlyLinesOverLength\": {} }": MultilineStringReflowBehavior.onlyLinesOverLength, | ||||||||||||||||||||||||||
] | ||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||||||
|
||||||||||||||||||||||||||
for (jsonString, expectedBehavior) in testCases { | ||||||||||||||||||||||||||
let jsonData = """ | ||||||||||||||||||||||||||
{ | ||||||||||||||||||||||||||
"reflowMultilineStringLiterals": \(jsonString) | ||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||
""".data(using: .utf8)! | ||||||||||||||||||||||||||
|
||||||||||||||||||||||||||
let config = try JSONDecoder().decode(Configuration.self, from: jsonData) | ||||||||||||||||||||||||||
XCTAssertEqual(config.reflowMultilineStringLiterals, expectedBehavior) | ||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||
|
||||||||||||||||||||||||||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.