Add autocorrection to MarkRule #893
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
Current coverage is 86.27% (diff: 100%)@@ master #893 diff @@
==========================================
Files 114 114
Lines 5058 5121 +63
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
+ Hits 4355 4418 +63
Misses 703 703
Partials 0 0
|
jpsim
requested changes
Nov 25, 2016
| @@ -39,20 +39,112 @@ public struct MarkRule: ConfigurationProviderRule { | |||
| ] | |||
There was a problem hiding this comment.
please add corrections to this RuleDescription to cover correctable test scenarios.
| return "(\(mark) -\(nonSpace))" | ||
| } | ||
|
|
||
| private var pattern: String { |
There was a problem hiding this comment.
Suggested formatting:
private var pattern: String {
return [
spaceStartPattern,
endNonSpacePattern,
endTwoOrMoreSpacePattern,
twoOrMoreSpacesAfterHyphenPattern,
nonSpaceAfterHyphenPattern
].joinWithSeparator("|")
}| return corrections | ||
| } | ||
|
|
||
| private func violationRangesInFile(file: File, withPattern pattern: String) -> [NSRange] { |
There was a problem hiding this comment.
Suggested formatting:
private func violationRangesInFile(file: File, withPattern pattern: String) -> [NSRange] {
let nsstring = file.contents as NSString
return file.rangesAndTokensMatching(pattern).filter { range, syntaxTokens in
let syntaxKinds = syntaxTokens.flatMap { SyntaxKind(rawValue: $0.type) }
return syntaxKinds.startsWith([.Comment])
}.flatMap { range, syntaxTokens in
let identifierRange = nsstring
.byteRangeToNSRange(start: syntaxTokens[0].offset, length: 0)
return identifierRange.map { NSUnionRange($0, range) }
}
}| var corrections = [Correction]() | ||
| for var range in matches.reverse() { | ||
| if keepLastChar { | ||
| range.length = range.length - 1 |
| return result | ||
| } | ||
|
|
||
| public func correctFile(file: File, |
|
Good points, all fixed |
jpsim
approved these changes
Nov 29, 2016
jpsim
added a commit
that referenced
this pull request
Nov 29, 2016
norio-nomura
added a commit
that referenced
this pull request
Nov 30, 2016
* commit 'e0cafea80ffba746a103d8d5a25be8fcd0993c81': remove unnecessary file.invalidateCache() add changelog entry for #893 fix up indentation in MarkRule.swift omit self if it can be inferred Corrections for mark rule Update regex part to be more precise. Add autocorrection to MarkRule # Conflicts: # Source/SwiftLintFramework/Rules/ConditionalReturnsOnNewline.swift # Source/SwiftLintFramework/Rules/MarkRule.swift # Source/SwiftLintFramework/Rules/StatementPositionRule.swift
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.
This pull request about adding autocorrect functionality to newly added MarkRule, in order to make updating code even simpler.