Update legacy_constant to support CGFloat.pi
#1205
Merged
Conversation
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
Resolves #1198 `Prefer CGFloat.pi to CGFloat(M_PI)`.
Generated by 🚫 danger |
|
@marcelofabri @jpsim Could you re-run the Travis build without cache? They're all passing for me locally. |
|
@aamctustwo It's failing when using the |
Current coverage is 82.16% (diff: 100%)@@ master #1205 diff @@
==========================================
Files 166 166
Lines 8255 8249 -6
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
- Hits 6784 6778 -6
Misses 1471 1471
Partials 0 0
|
|
|
||
| let pattern = "\\b(" + constants.joined(separator: "|") + ")\\b" | ||
| private static let legacyConstants: [String] = { | ||
| switch SwiftVersion.current { |
There was a problem hiding this comment.
could this be refactored to return Array(legacyPatterns.keys)?
| }() | ||
|
|
||
| public func validate(file: File) -> [StyleViolation] { | ||
| let pattern = "\\b(" + LegacyConstantRule.legacyConstants.joined(separator: "|") + ")" |
There was a problem hiding this comment.
I know this was already in this way, but you can use a non-capture group here for a performance boost
| @@ -245,7 +245,7 @@ extension File { | |||
| typealias RangePatternTemplate = (NSRange, String, String) | |||
| let matches: [RangePatternTemplate] | |||
| matches = patterns.flatMap({ pattern, template -> [RangePatternTemplate] in | |||
| return match(pattern: pattern).filter { range, kinds in | |||
| return match(pattern: "\\b" + pattern).filter { range, kinds in | |||
There was a problem hiding this comment.
shouldn't this be changed on the caller?
marcelofabri
approved these changes
Jan 18, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #1198
Prefer CGFloat.pi to CGFloat(M_PI).Summary
legacy_constantinto its own file, similar totype_name, to allow for Swift 2 vs Swift 3 configurationsCGFloat.piandFloat.pisupport tolegacy_constantCGFloat(M_PI)legacy_constantin addition to the regular Swift 3 ones