CUSTOM_GETTERS_SETTERS false positive on the override of fields (#1606)

### What's done: * added check for override getter Closes #1504
saveourtool · Feb 1, 2023 · 7954882 · 7954882
1 parent 98cdfaa
commit 7954882
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/...at-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/CustomGetterSetterRule.kt b/...at-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/CustomGetterSetterRule.kt
@@ -7,6 +7,7 @@ import org.cqfn.diktat.ruleset.utils.*
 
 import com.pinterest.ktlint.core.ast.ElementType.GET_KEYWORD
 import com.pinterest.ktlint.core.ast.ElementType.MODIFIER_LIST
+import com.pinterest.ktlint.core.ast.ElementType.OVERRIDE_KEYWORD
 import com.pinterest.ktlint.core.ast.ElementType.PRIVATE_KEYWORD
 import com.pinterest.ktlint.core.ast.ElementType.PROPERTY_ACCESSOR
 import com.pinterest.ktlint.core.ast.ElementType.SET_KEYWORD
@@ -30,6 +31,7 @@ class CustomGetterSetterRule(configRules: List<RulesConfig>) : DiktatRule(
         val getter = node.getFirstChildWithType(GET_KEYWORD)
         val setter = node.getFirstChildWithType(SET_KEYWORD)
         val isPrivateSetter = node.getFirstChildWithType(MODIFIER_LIST)?.hasAnyChildOfTypes(PRIVATE_KEYWORD) ?: false
+        val isOverrideGetter = node.treeParent.getFirstChildWithType(MODIFIER_LIST)?.hasAnyChildOfTypes(OVERRIDE_KEYWORD) ?: false
 
         setter?.let {
             // only private custom setters are allowed
@@ -39,7 +41,10 @@ class CustomGetterSetterRule(configRules: List<RulesConfig>) : DiktatRule(
         }
 
         getter?.let {
-            CUSTOM_GETTERS_SETTERS.warn(configRules, emitWarn, isFixMode, getter.text, getter.startOffset, node)
+            // only override getter are allowed
+            if (!isOverrideGetter) {
+                CUSTOM_GETTERS_SETTERS.warn(configRules, emitWarn, isFixMode, getter.text, getter.startOffset, node)
+            }
         }
     }
 

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt
@@ -49,6 +49,23 @@ class CustomGetterSetterWarnTest : LintTestBase(::CustomGetterSetterRule) {
         )
     }
 
+    @Test
+    @Tag(CUSTOM_GETTERS_SETTERS)
+    fun `override getter`() {
+        lintMethod(
+            """
+                    |interface A {
+                    |    val a: Int
+                    |}
+                    |
+                    |object B: A {
+                    |    override val a: int
+                    |        get() = 0
+                    |}
+            """.trimMargin(),
+        )
+    }
+
     @Test
     @Tag(CUSTOM_GETTERS_SETTERS)
     fun `exception case with private setter`() {