Skip to content

Commit d0191f4

Browse files
nullsnulls
committed
Fix ordering issue
- added ruleSetId to Rule.VisitorModifier.RunAfterRule - extracted ordering logic to OrderedRuleSet - removed all prefixes in rule_id
1 parent 7cb99e0 commit d0191f4

File tree

73 files changed

+103
-90
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+103
-90
lines changed

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/OrderedRuleSet.kt

+24-17
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ import org.jetbrains.kotlin.com.intellij.lang.ASTNode
1212
* @param id ID of RuleSet
1313
* @param rules rules which belongs to current RuleSet
1414
*/
15-
class OrderedRuleSet(id: String, vararg rules: Rule) : RuleSet(id, rules = rules) {
16-
17-
private val orderedIterator: Iterator<Rule> = adjustRules(id, listOf(super.iterator())).iterator()
18-
19-
/**
20-
* @return ordered iterator of rules
21-
*/
22-
override fun iterator(): Iterator<Rule> {
23-
return orderedIterator
24-
}
15+
class OrderedRuleSet(id: String, vararg rules: Rule) : RuleSet(id, rules = adjustRules(id, rules = rules)) {
2516

2617
companion object {
27-
private fun adjustRules(ruleSetId: String, rules: Sequence<Rule>): Sequence<Rule> {
28-
return rules.take(1) +
29-
rules.zipWithNext { prevRule, rule -> OrderedRule(ruleSetId, rule, prevRule) }
18+
private fun adjustRules(ruleSetId: String, vararg rules: Rule): Array<out Rule> {
19+
if (rules.isEmpty()) {
20+
return rules
21+
}
22+
return rules.mapIndexed { index, rule ->
23+
if (index == 0) {
24+
checkVisitorModifiers(rule)
25+
rule
26+
} else {
27+
OrderedRule(ruleSetId, rule, rules[index - 1])
28+
}
29+
}.toTypedArray()
3030
}
3131

3232
private class OrderedRule(ruleSetId: String, val rule: Rule, prevRule: Rule) : Rule(rule.id, adjustVisitorModifiers(ruleSetId, rule, prevRule)) {
@@ -44,9 +44,7 @@ class OrderedRuleSet(id: String, vararg rules: Rule) : RuleSet(id, rules = rules
4444

4545
private fun adjustVisitorModifiers(ruleSetId: String, rule: Rule, prevRule: Rule): Set<Rule.VisitorModifier> {
4646
val visitorModifiers: Set<Rule.VisitorModifier> = rule.visitorModifiers
47-
require(visitorModifiers.none { it is Rule.VisitorModifier.RunAfterRule }) {
48-
"Rule ${rule.id} already contains VisitorModifier.RunAfterRule"
49-
}
47+
checkVisitorModifiers(rule)
5048
require(rule.id != prevRule.id) {
5149
"PrevRule has same ID as rule: ${rule.id}"
5250
}
@@ -57,7 +55,16 @@ class OrderedRuleSet(id: String, vararg rules: Rule) : RuleSet(id, rules = rules
5755
)
5856
}
5957

60-
fun Rule.delegatee(): Rule = if (this is OrderedRule) this.rule else this
58+
private fun checkVisitorModifiers(rule: Rule) {
59+
require(rule.visitorModifiers.none { it is Rule.VisitorModifier.RunAfterRule }) {
60+
"Rule ${rule.id} contains VisitorModifier.RunAfterRule"
61+
}
62+
}
63+
64+
/**
65+
* @return a rule to which a logic is delegated
66+
*/
67+
internal fun Rule.delegatee(): Rule = if (this is OrderedRule) this.rule else this
6168

6269
/**
6370
* @return RuleSet with ordered rules

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/FileNaming.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class FileNaming(configRules: List<RulesConfig>) : DiktatRule(
7777

7878
companion object {
7979
// FixMe: should be moved to properties
80-
const val NAME_ID = "aag-file-naming"
80+
const val NAME_ID = "file-naming"
8181
val validExtensions = listOf(".kt", ".kts")
8282
}
8383
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/IdentifierNaming.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ class IdentifierNaming(configRules: List<RulesConfig>) : DiktatRule(
483483
companion object {
484484
const val MAX_IDENTIFIER_LENGTH = 64
485485
const val MIN_IDENTIFIER_LENGTH = 2
486-
const val NAME_ID = "aai-identifier-naming"
486+
const val NAME_ID = "identifier-naming"
487487

488488
// FixMe: this should be moved to properties
489489
val oneCharIdentifiers = setOf("i", "j", "k", "x", "y", "z")

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/PackageNaming.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ class PackageNaming(configRules: List<RulesConfig>) : DiktatRule(
282282

283283
companion object {
284284
private val log = LoggerFactory.getLogger(PackageNaming::class.java)
285-
const val NAME_ID = "aah-package-naming"
285+
const val NAME_ID = "package-naming"
286286

287287
/**
288288
* Directory which is considered the start of sources file tree

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/comments/CommentsRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class CommentsRule(configRules: List<RulesConfig>) : DiktatRule(
174174
@Suppress("MaxLineLength")
175175
companion object {
176176
private val logger = LoggerFactory.getLogger(CommentsRule::class.java)
177-
const val NAME_ID = "aaa-comments"
177+
const val NAME_ID = "comments"
178178
private val importKeywordWithSpace = "${KtTokens.IMPORT_KEYWORD.value} "
179179
private val packageKeywordWithSpace = "${KtTokens.PACKAGE_KEYWORD.value} "
180180
private val importOrPackage = """($importKeywordWithSpace|$packageKeywordWithSpace)""".toRegex()

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/comments/HeaderCommentRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ class HeaderCommentRule(configRules: List<RulesConfig>) : DiktatRule(
275275
companion object {
276276
private val log = LoggerFactory.getLogger(HeaderCommentRule::class.java)
277277
const val CURR_YEAR_PATTERN = ";@currYear;"
278-
const val NAME_ID = "zcp-header-comment"
278+
const val NAME_ID = "header-comment"
279279
val hyphenRegex = Regex("""\d+-\d+""")
280280
val afterCopyrightRegex = Regex("""((©|\([cC]\))+ *\d+)""")
281281
val curYear = LocalDate.now().year

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/CommentsFormatting.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,6 @@ class CommentsFormatting(configRules: List<RulesConfig>) : DiktatRule(
360360
companion object {
361361
private const val APPROPRIATE_COMMENT_SPACES = 1
362362
private const val MAX_SPACES = 1
363-
const val NAME_ID = "aaf-kdoc-comments-codeblocks-formatting"
363+
const val NAME_ID = "kdoc-comments-codeblocks-formatting"
364364
}
365365
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocComments.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ class KdocComments(configRules: List<RulesConfig>) : DiktatRule(
352352
private fun isTopLevelFunctionStandard(node: ASTNode): Boolean = node.elementType == FUN && node.isStandardMethod()
353353

354354
companion object {
355-
const val NAME_ID = "aac-kdoc-comments"
355+
const val NAME_ID = "kdoc-comments"
356356
private val statementsToDocument = TokenSet.create(CLASS, FUN, PROPERTY)
357357
}
358358
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocFormatting.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ class KdocFormatting(configRules: List<RulesConfig>) : DiktatRule(
379379
}
380380

381381
companion object {
382-
const val NAME_ID = "aae-kdoc-formatting"
382+
const val NAME_ID = "kdoc-formatting"
383383
val dateFormats: List<DateTimeFormatter> = listOf("yyyy-dd-mm", "yy-dd-mm", "yyyy-mm-dd", "yy-mm-dd", "yyyy.mm.dd", "yyyy.dd.mm")
384384
.map {
385385
DateTimeFormatter.ofPattern(it)

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocMethods.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ class KdocMethods(configRules: List<RulesConfig>) : DiktatRule(
309309
}
310310

311311
companion object {
312-
const val NAME_ID = "aad-kdoc-methods"
312+
const val NAME_ID = "kdoc-methods"
313313
private val expressionBodyTypes = setOf(CALL_EXPRESSION, REFERENCE_EXPRESSION)
314314
private val allExpressionBodyTypes = setOf(
315315
DOT_QUALIFIED_EXPRESSION,

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/AnnotationNewLineRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ class AnnotationNewLineRule(configRules: List<RulesConfig>) : DiktatRule(
7676
}
7777

7878
companion object {
79-
const val NAME_ID = "abo-annotation-new-line"
79+
const val NAME_ID = "annotation-new-line"
8080
}
8181
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/BlockStructureBraces.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,6 @@ class BlockStructureBraces(configRules: List<RulesConfig>) : DiktatRule(
273273
}
274274

275275
companion object {
276-
const val NAME_ID = "zcn-block-structure"
276+
const val NAME_ID = "block-structure"
277277
}
278278
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/BracesInConditionalsAndLoopsRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class BracesInConditionalsAndLoopsRule(configRules: List<RulesConfig>) : DiktatR
193193
}
194194
companion object {
195195
private const val INDENT_STEP = 4
196-
const val NAME_ID = "aam-races-rule"
196+
const val NAME_ID = "races-rule"
197197
private val scopeFunctions = listOf("let", "run", "apply", "also")
198198
}
199199
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/ClassLikeStructuresOrderRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ class ClassLikeStructuresOrderRule(configRules: List<RulesConfig>) : DiktatRule(
229229
}
230230

231231
companion object {
232-
const val NAME_ID = "aak-class-like-structures"
232+
const val NAME_ID = "class-like-structures"
233233
private val childrenTypes = listOf(PROPERTY, CLASS, CLASS_INITIALIZER, SECONDARY_CONSTRUCTOR, FUN, OBJECT_DECLARATION, ENUM_ENTRY)
234234
}
235235
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/CollapseIfStatementsRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,6 @@ class CollapseIfStatementsRule(configRules: List<RulesConfig>) : DiktatRule(
213213

214214
companion object {
215215
private const val DEFAULT_NESTED_LEVEL = 2
216-
const val NAME_ID = "abu-collapse-if"
216+
const val NAME_ID = "collapse-if"
217217
}
218218
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/ConsecutiveSpacesRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@ class ConsecutiveSpacesRule(configRules: List<RulesConfig>) : DiktatRule(
8484

8585
companion object {
8686
private const val MAX_SPACES = 1
87-
const val NAME_ID = "zco-too-many-spaces"
87+
const val NAME_ID = "too-many-spaces"
8888
}
8989
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/EmptyBlock.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,6 @@ class EmptyBlock(configRules: List<RulesConfig>) : DiktatRule(
134134
}
135135

136136
companion object {
137-
const val NAME_ID = "aan-empty-block-structure"
137+
const val NAME_ID = "empty-block-structure"
138138
}
139139
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/EnumsSeparated.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class EnumsSeparated(configRules: List<RulesConfig>) : DiktatRule(
112112
}
113113

114114
companion object {
115-
const val NAME_ID = "abq-enum-separated"
115+
const val NAME_ID = "enum-separated"
116116
private val simpleValue = listOf(IDENTIFIER, WHITE_SPACE, COMMA, SEMICOLON)
117117
private val simpleEnum = listOf(ENUM_ENTRY, WHITE_SPACE, LBRACE, RBRACE)
118118
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/LineLength.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ class LineLength(configRules: List<RulesConfig>) : DiktatRule(
772772
*/
773773
companion object {
774774
private const val MAX_LENGTH = 120L
775-
const val NAME_ID = "abv-line-length"
775+
const val NAME_ID = "line-length"
776776
private const val STRING_PART_OFFSET = 4
777777
private val propertyList = listOf(INTEGER_CONSTANT, LITERAL_STRING_TEMPLATE_ENTRY, FLOAT_CONSTANT,
778778
CHARACTER_CONSTANT, REFERENCE_EXPRESSION, BOOLEAN_CONSTANT, LONG_STRING_TEMPLATE_ENTRY,

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/LongNumericalValuesSeparatedRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,6 @@ class LongNumericalValuesSeparatedRule(configRules: List<RulesConfig>) : DiktatR
158158
companion object {
159159
private const val DELIMITER_LENGTH: Int = 3
160160
private const val MAX_NUMBER_LENGTH: Int = 3
161-
const val NAME_ID = "abm-long-numerical-values"
161+
const val NAME_ID = "long-numerical-values"
162162
}
163163
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/MagicNumberRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class MagicNumberRule(configRules: List<RulesConfig>) : DiktatRule(
114114

115115
companion object {
116116
const val IGNORE_TEST = true
117-
const val NAME_ID = "aca-magic-number"
117+
const val NAME_ID = "magic-number"
118118
val ignoreNumbersList = listOf("-1", "1", "0", "2", "0U", "1U", "2U", "-1L", "0L", "1L", "2L", "0UL", "1UL", "2UL")
119119
val mapConfiguration = mapOf(
120120
"ignoreHashCodeFunction" to true,

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/MultipleModifiersSequence.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class MultipleModifiersSequence(configRules: List<RulesConfig>) : DiktatRule(
7373
}
7474

7575
companion object {
76-
const val NAME_ID = "aar-multiple-modifiers"
76+
const val NAME_ID = "multiple-modifiers"
7777
private val modifierOrder = listOf(KtTokens.PUBLIC_KEYWORD, KtTokens.INTERNAL_KEYWORD, KtTokens.PROTECTED_KEYWORD,
7878
KtTokens.PRIVATE_KEYWORD, KtTokens.EXPECT_KEYWORD, KtTokens.ACTUAL_KEYWORD, KtTokens.FINAL_KEYWORD,
7979
KtTokens.OPEN_KEYWORD, KtTokens.ABSTRACT_KEYWORD, KtTokens.SEALED_KEYWORD, KtTokens.CONST_KEYWORD,

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/NullableTypeRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class NullableTypeRule(configRules: List<RulesConfig>) : DiktatRule(
162162
)
163163

164164
companion object {
165-
const val NAME_ID = "acg-nullable-type"
165+
const val NAME_ID = "nullable-type"
166166
private val allowExpression = listOf("emptyList", "emptySequence", "emptyArray", "emptyMap", "emptySet",
167167
"listOf", "mapOf", "arrayOf", "sequenceOf", "setOf")
168168
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/RangeConventionalRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ class RangeConventionalRule(configRules: List<RulesConfig>) : DiktatRule(
115115
}
116116

117117
companion object {
118-
const val NAME_ID = "abj-range"
118+
const val NAME_ID = "range"
119119
}
120120
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/SingleLineStatementsRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class SingleLineStatementsRule(configRules: List<RulesConfig>) : DiktatRule(
4747
}
4848

4949
companion object {
50-
const val NAME_ID = "aaq-statement"
50+
const val NAME_ID = "statement"
5151
private val semicolonToken = TokenSet.create(SEMICOLON)
5252
}
5353
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/SortRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,6 @@ class SortRule(configRules: List<RulesConfig>) : DiktatRule(
186186
}
187187

188188
companion object {
189-
const val NAME_ID = "abp-sort-rule"
189+
const val NAME_ID = "sort-rule"
190190
}
191191
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/StringConcatenationRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,6 @@ class StringConcatenationRule(configRules: List<RulesConfig>) : DiktatRule(
217217
this.right is KtExpression
218218

219219
companion object {
220-
const val NAME_ID = "abr-string-concatenation"
220+
const val NAME_ID = "string-concatenation"
221221
}
222222
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/StringTemplateFormatRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,6 @@ class StringTemplateFormatRule(configRules: List<RulesConfig>) : DiktatRule(
109109
}
110110

111111
companion object {
112-
const val NAME_ID = "abs-string-template-format"
112+
const val NAME_ID = "string-template-format"
113113
}
114114
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/TrailingCommaRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class TrailingCommaRule(configRules: List<RulesConfig>) : DiktatRule(
134134

135135
companion object {
136136
private val log = LoggerFactory.getLogger(TrailingCommaRule::class.java)
137-
const val NAME_ID = "abh-trailing-comma"
137+
const val NAME_ID = "trailing-comma"
138138
val ktVersion = KotlinVersion(1, 4)
139139
val whenChildrenTypes = listOf(WHEN_CONDITION_WITH_EXPRESSION, WHEN_CONDITION_IS_PATTERN, WHEN_CONDITION_IN_RANGE)
140140
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/WhenMustHaveElseRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,6 @@ class WhenMustHaveElseRule(configRules: List<RulesConfig>) : DiktatRule(
164164
}
165165

166166
companion object {
167-
const val NAME_ID = "aal-no-else-in-when"
167+
const val NAME_ID = "no-else-in-when"
168168
}
169169
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/BlankLinesRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ class BlankLinesRule(configRules: List<RulesConfig>) : DiktatRule(
7373
}
7474

7575
companion object {
76-
const val NAME_ID = "acd-blank-lines"
76+
const val NAME_ID = "blank-lines"
7777
}
7878
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/FileSize.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ class FileSize(configRules: List<RulesConfig>) : DiktatRule(
5151

5252
companion object {
5353
const val MAX_SIZE = 2000L
54-
const val NAME_ID = "ace-file-size"
54+
const val NAME_ID = "file-size"
5555
}
5656
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/FileStructureRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,6 @@ class FileStructureRule(configRules: List<RulesConfig>) : DiktatRule(
409409
}
410410

411411
companion object {
412-
const val NAME_ID = "zcq-file-structure"
412+
const val NAME_ID = "file-structure"
413413
}
414414
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/NewlinesRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ class NewlinesRule(configRules: List<RulesConfig>) : DiktatRule(
707707
companion object {
708708
private val log = LoggerFactory.getLogger(NewlinesRule::class.java)
709709
const val MAX_CALLS_IN_ONE_LINE = 3
710-
const val NAME_ID = "zcr-newlines"
710+
const val NAME_ID = "newlines"
711711

712712
// fixme: these token sets can be not full, need to add new once as corresponding cases are discovered.
713713
// error is raised if these operators are prepended by newline

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/TopLevelOrderRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class TopLevelOrderRule(configRules: List<RulesConfig>) : DiktatRule(
113113
}
114114

115115
companion object {
116-
const val NAME_ID = "aap-top-level-order"
116+
const val NAME_ID = "top-level-order"
117117

118118
/**
119119
* List of children that should be sort

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/WhiteSpaceRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ class WhiteSpaceRule(configRules: List<RulesConfig>) : DiktatRule(
457457

458458
companion object {
459459
private val log = LoggerFactory.getLogger(CompactInitialization::class.java)
460-
const val NAME_ID = "zcs-horizontal-whitespace"
460+
const val NAME_ID = "horizontal-whitespace"
461461

462462
private const val NUM_PARENTS_FOR_LAMBDA = 3 // this is the number of parent nodes needed to check if this node is lambda from argument list
463463
private val keywordsWithSpaceAfter = TokenSet.create(

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/identifiers/LocalVariablesRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ class LocalVariablesRule(configRules: List<RulesConfig>) : DiktatRule(
218218
) = "<$name> is declared on line <$declared> and is used for the first time on line <$used>"
219219

220220
companion object {
221-
const val NAME_ID = "abc-local-variables"
221+
const val NAME_ID = "local-variables"
222222
private val functionInitializers = listOf(
223223
"emptyList", "emptySet", "emptyMap", "emptyArray", "emptySequence",
224224
"listOf", "setOf", "mapOf", "arrayOf", "arrayListOf",

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/ImmutableValNoVarRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ class ImmutableValNoVarRule(configRules: List<RulesConfig>) : DiktatRule(
5555
}
5656
}
5757
companion object {
58-
const val NAME_ID = "aci-no-var-rule"
58+
const val NAME_ID = "no-var-rule"
5959
}
6060
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/NullChecksRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,6 @@ class NullChecksRule(configRules: List<RulesConfig>) : DiktatRule(
287287
referenceExpression.elementType == REFERENCE_EXPRESSION && referenceExpression.firstChildNode.text == "require"
288288

289289
companion object {
290-
const val NAME_ID = "ach-null-checks"
290+
const val NAME_ID = "null-checks"
291291
}
292292
}

‎diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/SmartCastRule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,6 @@ class SmartCastRule(configRules: List<RulesConfig>) : DiktatRule(
265265
class IsExpressions(val identifier: String, val type: String)
266266

267267
companion object {
268-
const val NAME_ID = "abd-smart-cast-rule"
268+
const val NAME_ID = "smart-cast-rule"
269269
}
270270
}

0 commit comments

Comments
 (0)