expect/actual removing abstract modifier

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/AbstractClassesRule.kt

@@ -13,8 +13,9 @@ import com.pinterest.ktlint.core.ast.ElementType.CLASS_BODY
 import com.pinterest.ktlint.core.ast.ElementType.FUN
 import com.pinterest.ktlint.core.ast.ElementType.IDENTIFIER
 import com.pinterest.ktlint.core.ast.ElementType.MODIFIER_LIST
-import com.pinterest.ktlint.core.ast.isWhiteSpace
+import com.pinterest.ktlint.core.ast.ElementType.OPEN_KEYWORD
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
+import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.LeafPsiElement
 
 /**
  * Checks if abstract class has any abstract method. If not, warns that class should not be abstract
@@ -45,25 +46,9 @@ class AbstractClassesRule(configRules: List<RulesConfig>) : DiktatRule(
         if (functions.isNotEmpty() && functions.none { hasAbstractModifier(it) }) {
             CLASS_SHOULD_NOT_BE_ABSTRACT.warnAndFix(configRules, emitWarn, isFixMode, identifier, node.startOffset, node) {
                 val modList = classNode.getFirstChildWithType(MODIFIER_LIST)!!
-                if (modList.getChildren(null).size > 1) {
-                    val abstractKeyword = modList.getFirstChildWithType(ABSTRACT_KEYWORD)!!
-
-                    // we are deleting one keyword, so we need to delete extra space
-                    val spaceInModifiers = if (abstractKeyword == modList.firstChildNode) {
-                        abstractKeyword.treeNext
-                    } else {
-                        abstractKeyword.treePrev
-                    }
-                    modList.removeChild(abstractKeyword)
-                    if (spaceInModifiers != null && spaceInModifiers.isWhiteSpace()) {
-                        modList.removeChild(spaceInModifiers)
-                    }
-                } else {
-                    if (modList.treeNext.isWhiteSpace()) {
-                        classNode.removeChild(modList.treeNext)
-                    }
-                    classNode.removeChild(modList)
-                }
+                val abstractKeyword = modList.getFirstChildWithType(ABSTRACT_KEYWORD)!!
+                val newOpenKeyword = LeafPsiElement(OPEN_KEYWORD, "open")
+                modList.replaceChild(abstractKeyword, newOpenKeyword)
             }
         }
     }

diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesFixTest.kt

@@ -11,6 +11,6 @@ class AbstractClassesFixTest : FixTestBase("test/chapter6/abstract_classes", ::A
     @Test
     @Tag(CLASS_SHOULD_NOT_BE_ABSTRACT)
     fun `fix abstract class`() {
-        fixAndCompare("ShouldRemoveAbstractKeywordExpected.kt", "ShouldRemoveAbstractKeywordTest.kt")
+        fixAndCompare("ShouldReplaceAbstractKeywordExpected.kt", "ShouldReplaceAbstractKeywordTest.kt")
     }
 }

diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesWarnTest.kt

@@ -15,7 +15,7 @@ class AbstractClassesWarnTest : LintTestBase(::AbstractClassesRule) {
 
     @Test
     @Tag(CLASS_SHOULD_NOT_BE_ABSTRACT)
-    fun `should not remove abstract`() {
+    fun `should not replace abstract with open`() {
         lintMethod(
             """
                 |abstract class Some(val a: Int = 5) {
@@ -29,7 +29,7 @@ class AbstractClassesWarnTest : LintTestBase(::AbstractClassesRule) {
 
     @Test
     @Tag(CLASS_SHOULD_NOT_BE_ABSTRACT)
-    fun `should remove abstract`() {
+    fun `should replace abstract on open`() {
         lintMethod(
             """
                 |abstract class Some(val a: Int = 5) {
@@ -42,7 +42,7 @@ class AbstractClassesWarnTest : LintTestBase(::AbstractClassesRule) {
 
     @Test
     @Tag(CLASS_SHOULD_NOT_BE_ABSTRACT)
-    fun `should remove abstract with inner`() {
+    fun `should replace abstract on open with inner`() {
         lintMethod(
             """
                 |class Some(val a: Int = 5) {
@@ -56,4 +56,34 @@ class AbstractClassesWarnTest : LintTestBase(::AbstractClassesRule) {
             LintError(4, 32, ruleId, "${Warnings.CLASS_SHOULD_NOT_BE_ABSTRACT.warnText()} Inner", true)
         )
     }
+
+    @Test
+    @Tag(CLASS_SHOULD_NOT_BE_ABSTRACT)
+    fun `should replace abstract on open in actual or expect classes`() {
+        lintMethod(
+            """
+                |actual abstract class CoroutineTest actual constructor() {
+                |    /**
+                |     * Test rule
+                |     */
+                |    @get:Rule
+                |    var coroutineTestRule = CoroutineTestRule()
+                |    
+                |    /**
+                |     * Run test
+                |     *
+                |     * @param T
+                |     * @param block
+                |     * @receiver a Coroutine Scope
+                |     */
+                |    actual fun <T> runTest(block: suspend CoroutineScope.() -> T) {
+                |       runBlocking {
+                |       block()
+                |       }
+                |    }
+                |}
+            """.trimMargin(),
+            LintError(1, 58, ruleId, "${Warnings.CLASS_SHOULD_NOT_BE_ABSTRACT.warnText()} CoroutineTest", true)
+        )
+    }
 }

diktat-rules/src/test/resources/test/chapter6/abstract_classes/ShouldReplaceAbstractKeywordExpected.kt

@@ -0,0 +1,29 @@
+package test.paragraph6.abstract_classes
+
+actual open class CoroutineTest actual constructor() {
+    actual fun <T> runTest(block: suspend CoroutineScope.() -> T) {
+        runBlocking {
+            block()
+        }
+    }
+}
+
+open class Some() {
+    fun some(){}
+
+    fun another(){}
+
+    @SomeAnnotation @Another open inner class Any {
+        fun func(){}
+    }
+
+    inner open class Second {
+        fun someFunc(){}
+    }
+}
+
+abstract class Another {
+    abstract fun absFunc()
+
+    fun someFunc(){}
+}

diktat-rules/src/test/resources/test/chapter6/abstract_classes/ShouldRemoveAbstractKeywordTest.kt → diktat-rules/src/test/resources/test/chapter6/abstract_classes/ShouldReplaceAbstractKeywordTest.kt

@@ -1,5 +1,13 @@
 package test.paragraph6.abstract_classes
 
+actual abstract class CoroutineTest actual constructor() {
+    actual fun <T> runTest(block: suspend CoroutineScope.() -> T) {
+        runBlocking {
+            block()
+        }
+    }
+}
+
 abstract class Some() {
     fun some(){}