-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into bugfix/AddInLongLineAnalysisEQEQEQAndEXCLE…
…QEQEQ
- Loading branch information
Showing
191 changed files
with
1,980 additions
and
1,048 deletions.
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
2 changes: 1 addition & 1 deletion
2
diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/DiktatJavaExecTaskBase.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
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
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
25 changes: 0 additions & 25 deletions
25
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/dummy/DummyWarning.kt
This file was deleted.
Oops, something went wrong.
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
84 changes: 84 additions & 0 deletions
84
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/OrderedRuleSet.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,84 @@ | ||
| package org.cqfn.diktat.ruleset.rules | ||
|
|
||
| import org.cqfn.diktat.ruleset.constants.EmitType | ||
| import com.pinterest.ktlint.core.Rule | ||
| import com.pinterest.ktlint.core.RuleSet | ||
| import org.jetbrains.kotlin.com.intellij.lang.ASTNode | ||
|
|
||
| /** | ||
| * This is a wrapper around Ktlint RuleSet which adjusts visitorModifiers for all rules to keep order with prevRule | ||
| * Added as a workaround after introducing a new logic for sorting KtLint Rules: https://github.com/pinterest/ktlint/issues/1478 | ||
| * | ||
| * @param id ID of RuleSet | ||
| * @param rules rules which belongs to current RuleSet | ||
| */ | ||
| class OrderedRuleSet(id: String, vararg rules: Rule) : RuleSet(id, rules = adjustRules(id, rules = rules)) { | ||
| companion object { | ||
| private fun adjustRules(ruleSetId: String, vararg rules: Rule): Array<out Rule> { | ||
| if (rules.isEmpty()) { | ||
| return rules | ||
| } | ||
| return rules.mapIndexed { index, rule -> | ||
| if (index == 0) { | ||
| checkVisitorModifiers(rule) | ||
| rule | ||
| } else { | ||
| OrderedRule(ruleSetId, rule, rules[index - 1]) | ||
| } | ||
| }.toTypedArray() | ||
| } | ||
|
|
||
| private fun adjustVisitorModifiers( | ||
| ruleSetId: String, | ||
| rule: Rule, | ||
| prevRule: Rule | ||
| ): Set<Rule.VisitorModifier> { | ||
| val visitorModifiers: Set<Rule.VisitorModifier> = rule.visitorModifiers | ||
| checkVisitorModifiers(rule) | ||
| require(rule.id != prevRule.id) { | ||
| "PrevRule has same ID as rule: ${rule.id}" | ||
| } | ||
| return visitorModifiers + Rule.VisitorModifier.RunAfterRule( | ||
| ruleId = ruleSetId + ":" + prevRule.id, | ||
| loadOnlyWhenOtherRuleIsLoaded = false, | ||
| runOnlyWhenOtherRuleIsEnabled = false | ||
| ) | ||
| } | ||
|
|
||
| private fun checkVisitorModifiers(rule: Rule) { | ||
| require(rule.visitorModifiers.none { it is Rule.VisitorModifier.RunAfterRule }) { | ||
| "Rule ${rule.id} contains VisitorModifier.RunAfterRule" | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @return a rule to which a logic is delegated | ||
| */ | ||
| internal fun Rule.delegatee(): Rule = if (this is OrderedRule) this.rule else this | ||
|
|
||
| /** | ||
| * @return RuleSet with ordered rules | ||
| */ | ||
| fun RuleSet.ordered(): OrderedRuleSet = OrderedRuleSet(id = id, rules = rules) | ||
|
|
||
| /** | ||
| * @property rule wraps this rule to keep order | ||
| */ | ||
| private class OrderedRule( | ||
| ruleSetId: String, | ||
| val rule: Rule, | ||
| prevRule: Rule | ||
| ) : Rule(rule.id, adjustVisitorModifiers(ruleSetId, rule, prevRule)) { | ||
| /** | ||
| * Delegating a call of this method | ||
| */ | ||
| override fun visit( | ||
| node: ASTNode, | ||
| autoCorrect: Boolean, | ||
| emit: EmitType | ||
| ) { | ||
| rule.visit(node, autoCorrect, emit) | ||
| } | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.