WRONG_DECLARATIONS_ORDER conflicts with ENUM_SEPARATED (#1195)

### What's done: * fixed order of rules closes #1078
saveourtool · Jan 28, 2022 · 297417a · 297417a
1 parent e170e33
commit 297417a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleSetProvider.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleSetProvider.kt
@@ -159,7 +159,6 @@ class DiktatRuleSetProvider(private var diktatConfigFile: String = DIKTAT_ANALYS
             ::BracesInConditionalsAndLoopsRule,
             ::EmptyBlock,
             ::AvoidEmptyPrimaryConstructor,
-            ::EnumsSeparated,
             ::TopLevelOrderRule,
             ::SingleLineStatementsRule,
             ::MultipleModifiersSequence,
@@ -187,6 +186,7 @@ class DiktatRuleSetProvider(private var diktatConfigFile: String = DIKTAT_ANALYS
             ::NestedFunctionBlock,
             ::AnnotationNewLineRule,
             ::SortRule,
+            ::EnumsSeparated,
             ::StringConcatenationRule,
             ::StringTemplateFormatRule,
             ::AccurateCalculationsRule,

diff --git a/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt b/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt
@@ -52,6 +52,14 @@ enum class IssueType2 {
     companion object
 }
 
+enum class IssueType3 {
+    A,
+    B,
+    C,
+    D,
+    ;
+}
+
 class Foo {
     /**
      * @implNote lorem ipsum

diff --git a/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt b/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt
@@ -52,6 +52,14 @@ enum class IssueType2 {
     fun foo(bar: Int) = bar
 }
 
+enum class IssueType3 {
+    A,
+    C,
+    B,
+    D,
+    ;
+}
+
 class Foo {
     /**
      * @implNote lorem ipsum