Check if function is an override in ComposeModifierWithoutDefault (#87)

* Check if function is an override * Update ktlint test for ModifierWithoutDefault
twitter · Sep 30, 2022 · fbd7261 · fbd7261
1 parent 09677f3
commit fbd7261
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/rules/common/src/main/kotlin/com/twitter/compose/rules/ComposeModifierWithoutDefault.kt b/rules/common/src/main/kotlin/com/twitter/compose/rules/ComposeModifierWithoutDefault.kt
@@ -7,14 +7,15 @@ import com.twitter.rules.core.Emitter
 import com.twitter.rules.core.util.definedInInterface
 import com.twitter.rules.core.util.isActual
 import com.twitter.rules.core.util.isModifier
+import com.twitter.rules.core.util.isOverride
 import com.twitter.rules.core.util.lastChildLeafOrSelf
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.psi.KtFunction
 
 class ComposeModifierWithoutDefault : ComposeKtVisitor {
 
     override fun visitComposable(function: KtFunction, autoCorrect: Boolean, emitter: Emitter) {
-        if (function.definedInInterface || function.isActual) return
+        if (function.definedInInterface || function.isActual || function.isOverride) return
 
         // Look for modifier params in the composable signature, and if any without a default value is found, error out.
         function.valueParameters.filter { it.isModifier }

diff --git a/...rc/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierWithoutDefaultCheckTest.kt b/...rc/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierWithoutDefaultCheckTest.kt
@@ -41,6 +41,10 @@ class ComposeModifierWithoutDefaultCheckTest {
                     @Composable
                     fun Something(modifier: Modifier)
                 }
+                class BlehImpl : Bleh {
+                    @Composable
+                    override fun Something(modifier: Modifier) {}
+                }
                 @Composable
                 actual fun Something(modifier: Modifier) {}
         """.trimIndent()

diff --git a/...rc/test/kotlin/com/twitter/compose/rules/ktlint/ComposeModifierWithoutDefaultCheckTest.kt b/...rc/test/kotlin/com/twitter/compose/rules/ktlint/ComposeModifierWithoutDefaultCheckTest.kt
@@ -53,6 +53,10 @@ class ComposeModifierWithoutDefaultCheckTest {
                     @Composable
                     fun Something(modifier: Modifier)
                 }
+                class BlehImpl : Bleh {
+                    @Composable
+                    override fun Something(modifier: Modifier) {}
+                }
                 @Composable
                 actual fun Something(modifier: Modifier) {}
         """.trimIndent()