Supported comments after latest enum element

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

@@ -9,10 +9,12 @@ import org.cqfn.diktat.ruleset.utils.getAllChildrenWithType
 import org.cqfn.diktat.ruleset.utils.hasChildOfType
 import org.cqfn.diktat.ruleset.utils.isClassEnum
 
+import com.pinterest.ktlint.core.ast.ElementType.BLOCK_COMMENT
 import com.pinterest.ktlint.core.ast.ElementType.CLASS
 import com.pinterest.ktlint.core.ast.ElementType.CLASS_BODY
 import com.pinterest.ktlint.core.ast.ElementType.COMMA
 import com.pinterest.ktlint.core.ast.ElementType.ENUM_ENTRY
+import com.pinterest.ktlint.core.ast.ElementType.EOL_COMMENT
 import com.pinterest.ktlint.core.ast.ElementType.IDENTIFIER
 import com.pinterest.ktlint.core.ast.ElementType.LBRACE
 import com.pinterest.ktlint.core.ast.ElementType.RBRACE
@@ -87,10 +89,19 @@ class EnumsSeparated(configRules: List<RulesConfig>) : DiktatRule(
         if (!node.hasChildOfType(COMMA)) {
             ENUMS_SEPARATED.warnAndFix(configRules, emitWarn, isFixMode, "last enum entry must end with a comma",
                 node.startOffset, node) {
-                node.addChild(LeafPsiElement(COMMA, ","), node.findChildByType(SEMICOLON)!!.treePrev)
+                val commaLocation = node.findChildByType(SEMICOLON)!!.findLatestTreePrevMatching {
+                    !setOf(EOL_COMMENT, BLOCK_COMMENT, WHITE_SPACE).contains(it.elementType)
+                }
+                node.addChild(LeafPsiElement(COMMA, ","), commaLocation.treeNext)
             }
         }
     }
+
+    private fun ASTNode.findLatestTreePrevMatching(predicate: (ASTNode) -> Boolean): ASTNode {
+        val result = this.treePrev
+        return if (predicate(result)) result else result.findLatestTreePrevMatching(predicate)
+    }
+
     companion object {
         const val NAME_ID = "abq-enum-separated"
         private val simpleValue = listOf(IDENTIFIER, WHITE_SPACE, COMMA, SEMICOLON)

diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedFixTest.kt

@@ -13,4 +13,10 @@ class EnumsSeparatedFixTest : FixTestBase("test/paragraph3/enum_separated", ::En
     fun `test enums split`() {
         fixAndCompare("EnumSeparatedExpected.kt", "EnumSeparatedTest.kt")
     }
+
+    @Test
+    @Tag(WarningNames.ENUMS_SEPARATED)
+    fun `last element with comment`() {
+        fixAndCompare("LastElementCommentExpected.kt", "LastElementCommentTest.kt")
+    }
 }

diktat-rules/src/test/resources/test/paragraph3/enum_separated/EnumSeparatedExpected.kt

@@ -7,7 +7,7 @@ enum class ENUM {
 enum class ENUM {
     RED(0xFF0000),
     GREEN(0x00FF00),
-    BLUE(0x0000FF) /*sdcsc*/,
+    BLUE(0x0000FF), /*sdcsc*/
 ;
 }
 

diktat-rules/src/test/resources/test/paragraph3/enum_separated/LastElementCommentExpected.kt

@@ -0,0 +1,29 @@
+package test.paragraph3.enum_separated
+
+enum class Foo1 {
+    A,
+    B,
+    C, // some commnet
+;
+}
+
+enum class Foo2 {
+    A,
+    B,
+    C,// some commnet
+;
+}
+
+enum class Foo3 {
+    A,
+    B,
+    C, /* some commnet */
+;
+}
+
+enum class Foo4 {
+    A,
+    B,
+    C,/* some commnet */
+;
+}

diktat-rules/src/test/resources/test/paragraph3/enum_separated/LastElementCommentTest.kt

@@ -0,0 +1,25 @@
+package test.paragraph3.enum_separated
+
+enum class Foo1 {
+    A,
+    B,
+    C // some commnet
+}
+
+enum class Foo2 {
+    A,
+    B,
+    C// some commnet
+}
+
+enum class Foo3 {
+    A,
+    B,
+    C /* some commnet */
+}
+
+enum class Foo4 {
+    A,
+    B,
+    C/* some commnet */
+}