This repository has been archived by the owner on Sep 6, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 8
Fixed format string parsing #29
Merged
Merged
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
4a1fe7a
Added failing test to demonstrate flaw
lvsti 411995e
Corrected format string regex to support placeholders that are direct…
lvsti cd08e91
Fixed https://github.com/SwiftGen/SwiftGenKit/pull/29#pullrequestrevi…
lvsti 556a69e
Updated changelog
lvsti d86650d
Fixed https://github.com/SwiftGen/SwiftGenKit/pull/29#discussion_r117…
lvsti 0768385
Merge branch 'master' into master
djbe 45e2d01
Fix enum compilation error
djbe e023945
Merge branch 'master' of github.com:SwiftGen/SwiftGenKit
djbe 0ba730f
fix whitespace
djbe 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 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 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 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 |
---|---|---|
|
@@ -132,10 +132,16 @@ class StringsTests: XCTestCase { | |
XCTAssertEqual(placeholders, [.Unknown, .Int, .Object, .Float, .Char]) | ||
} | ||
|
||
func testParseEscapePercentSign() { | ||
func testParseEvenEscapePercentSign() { | ||
let placeholders = StringsFileParser.PlaceholderType.placeholders(fromFormat: "%%foo") | ||
// Must NOT map to [.Float] | ||
XCTAssertEqual(placeholders, []) | ||
} | ||
|
||
func testParseOddEscapePercentSign() { | ||
let placeholders = StringsFileParser.PlaceholderType.placeholders(fromFormat: "%%%foo") | ||
// Should map to [.Float] | ||
XCTAssertEqual(placeholders, [.Float]) | ||
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. Right, so your branch was based on an older version of SwiftGenKit. This needs to be |
||
} | ||
|
||
} |
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.
Please use the same format as the other entries (with . and 2 spaces at the end of the description).