Skip to content

Commit

Permalink
Fix ordering issue
Browse files Browse the repository at this point in the history
### What's done:
- added ruleSetId to Rule.VisitorModifier.RunAfterRule
- extracted ordering logic to OrderedRuleSet
- removed all prefixes in rule_id
  • Loading branch information
nulls committed Jun 22, 2022
1 parent d0191f4 commit 9c122cf
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package org.cqfn.diktat.util

import org.cqfn.diktat.common.config.rules.RulesConfig
import org.cqfn.diktat.common.config.rules.RulesConfigReader
import org.cqfn.diktat.ruleset.constants.EmitType
import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID
import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider
import org.cqfn.diktat.ruleset.rules.OrderedRuleSet.Companion.delegatee
Expand All @@ -15,7 +14,6 @@ import com.pinterest.ktlint.core.Rule
import com.pinterest.ktlint.core.RuleSet
import com.pinterest.ktlint.core.RuleSetProvider
import org.assertj.core.api.Assertions.assertThat
import org.jetbrains.kotlin.com.intellij.lang.ASTNode
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test

Expand Down Expand Up @@ -65,6 +63,7 @@ class DiktatRuleSetProviderTest {
private val ignoreFile = listOf(
"DiktatRuleSetProvider",
"DiktatRule",
"IndentationError")
"IndentationError",
"OrderedRuleSet")
}
}

0 comments on commit 9c122cf

Please sign in to comment.