Fix parsing of rule disable command comments containing a URL #2985
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
svenmuennich
force-pushed
the
svenmuennich/fix-rule-disable-comment-with-url
branch
from
9ccb9de to
0e600df
Compare
Generated by 🚫 Danger |
marcelofabri
reviewed
Jan 2, 2020
| return match(pattern: pattern, with: [.comment], range: range).compactMap { range in | ||
| return Command(string: contents, range: range) | ||
| return match(pattern: pattern, range: range).filter { match in | ||
| return Set(match.1).isSubset(of: [.comment, .commentURL]) |
There was a problem hiding this comment.
maybe we should use SyntaxKind.commentKinds just to be safe?
There was a problem hiding this comment.
SyntaxKind.commentKinds contains
.comment,.commentUrl,.docComment,.docCommentField, and.commentMark.
Changing this as proposed would allow adding SwiftLint commands to doc comments as well as MARK: comments, which is currently not supported. I'm not sure whether such a change should be part of this PR.
marcelofabri
reviewed
Jan 2, 2020
| @@ -14,7 +14,8 @@ | |||
|
|
|||
| #### Bug Fixes | |||
|
|
|||
| * None. | |||
| * Fix parsing of SwiftLint commands containing a URL in their trailing comment. | |||
There was a problem hiding this comment.
can you please rebase and fix this conflict? Thanks!
There was a problem hiding this comment.
I merged rebased on master and resolved this conflict.
svenmuennich
force-pushed
the
svenmuennich/fix-rule-disable-comment-with-url
branch
from
7069f8a to
e0205d8
Compare
|
Lovely, thank you for the fix! |
svenmuennich
deleted the
svenmuennich/fix-rule-disable-comment-with-url
branch
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.
PR #2721 introduced support for trailing comments in
swiftlint:disablecommands. However, if such a trailing comment contains a URL, the command is currently not parsed correctly and as a result is not recognized at all.This PR fixes parsing
swiftlint:disablecommands having a URL in their trailing comment, e.g.: