Merge branch 'master' into bugfix/andrey.shcheglov/indentation

saveourtool · Jul 13, 2022 · 93575ec · 93575ec
2 parents 4d07ceb + ad8718b
commit 93575ec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/SmartCastRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/SmartCastRule.kt
@@ -252,7 +252,7 @@ class SmartCastRule(configRules: List<RulesConfig>) : DiktatRule(
      * @property type a type to which the reference is being cast
      * @property node a node that holds the entire expression
      */
-    class AsExpressions(
+    data class AsExpressions(
         val identifier: String,
         val type: String,
         val node: ASTNode
@@ -262,7 +262,7 @@ class SmartCastRule(configRules: List<RulesConfig>) : DiktatRule(
      * @property identifier a reference that is checked
      * @property type a type with which the reference is being compared
      */
-    class IsExpressions(val identifier: String, val type: String)
+    data class IsExpressions(val identifier: String, val type: String)
 
     companion object {
         const val NAME_ID = "smart-cast-rule"

diff --git a/...t-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/DataClassesRule.kt b/...t-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/DataClassesRule.kt
@@ -104,7 +104,7 @@ class DataClassesRule(configRules: List<RulesConfig>) : DiktatRule(
                     ?: false &&
                 getFirstChildWithType(SUPER_TYPE_LIST) == null
         }
-        return classBody?.getAllChildrenWithType(FUN)?.isEmpty() ?: false &&
+        return classBody?.getFirstChildWithType(FUN) == null &&
             getFirstChildWithType(SUPER_TYPE_LIST) == null &&
             // if there is any prop with logic in accessor then don't recommend to convert class to data class
             classBody?.let(::areGoodProps)

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt
@@ -26,6 +26,18 @@ class DataClassesRuleWarnTest : LintTestBase(::DataClassesRule) {
         )
     }
 
+    @Test
+    @Tag(USE_DATA_CLASS)
+    fun `_regression_ trigger on default class without a body`() {
+        lintMethod(
+            """
+                    |class Some(val a: Int = 5)
+                    |
+            """.trimMargin(),
+            LintError(1, 1, ruleId, "${Warnings.USE_DATA_CLASS.warnText()} Some")
+        )
+    }
+
     @Test
     @Tag(USE_DATA_CLASS)
     fun `should trigger - dont forget to consider this class in fix`() {