-
-
Notifications
You must be signed in to change notification settings - Fork 766
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
Replace KtLintMultiRule
#6094
Merged
chao2zhang
merged 13 commits into
detekt:main
from
marschwar:feature/5192-multi-rule-formatting
May 27, 2023
Merged
Replace KtLintMultiRule
#6094
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
63d8904
remove unused autoCorrect property
marschwar fdab15e
WIP
marschwar cbca76a
Merge remote-tracking branch 'upstream/main' into feature/5192-multi-…
marschwar 912c750
WIP
marschwar c78a25e
fix documentation generation
marschwar 4aff430
Merge branch 'main' into feature/5192-multi-rule-formatting
marschwar 7d3bf24
Allow multiple classes in rule set provider file
marschwar edd9698
remove multirule support in docs
marschwar 59d8b87
fix style and formatting violations
marschwar 37c820c
Merge remote-tracking branch 'upstream/main' into feature/5192-multi-…
marschwar b5d3565
revert removal of autocorrect prop
marschwar 8373fce
Merge remote-tracking branch 'upstream/main' into feature/5192-multi-…
marschwar 0d76036
Merge remote-tracking branch 'detekt/main' into feature/5192-multi-ru…
chao2zhang 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
14 changes: 14 additions & 0 deletions
14
...atting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/FormattingRuleComparator.kt
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 |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package io.gitlab.arturbosch.detekt.formatting | ||
|
||
/** | ||
* This serves as weak heuristic to order the wrapped rules according to their visitor modifiers. | ||
* Currently only RunAsLateAsPossible is supported. | ||
*/ | ||
internal object FormattingRuleComparator : Comparator<FormattingRule> { | ||
override fun compare(o1: FormattingRule, o2: FormattingRule): Int { | ||
if (o1.runAsLateAsPossible == o2.runAsLateAsPossible) { | ||
return 0 | ||
} | ||
return if (o1.runAsLateAsPossible) 1 else -1 | ||
} | ||
} |
Oops, something went wrong.
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.
Ktlint also defines
VisitorModifier.RunAfterRule
, and we should respect thatThere 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.
Yap, that is described in #5259
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.
😭. Would you mind if I contribute to this PR as well?
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.
I do not mind at all. But I would not want to fix the
RunAfterRule
issue with this pr or do you see them as strongly connected?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.
It seems that we agreed that this PR can be merged post 1.23
Let me just open a new PR post the merge of this PR.