Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check if function is an override in ComposeModifierWithoutDefault #87

Merged
merged 2 commits into from
Sep 30, 2022
Merged

Check if function is an override in ComposeModifierWithoutDefault #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc3e6fb
Check if function is an override
mmartosdev Sep 30, 2022
0054d4e
Update ktlint test for ModifierWithoutDefault
mmartosdev Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion rules/common/src/main/kotlin/com/twitter/compose/rules/ComposeModifierWithoutDefault.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 4 additions & 0 deletions ...rc/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierWithoutDefaultCheckTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ class ComposeModifierWithoutDefaultCheckTest {
@Composable
fun Something(modifier: Modifier)
}
class BlehImpl : Bleh {
mrmans0n marked this conversation as resolved.
Show resolved Hide resolved
@Composable
override fun Something(modifier: Modifier) {}
}
@Composable
actual fun Something(modifier: Modifier) {}
""".trimIndent()
Expand Down
4 changes: 4 additions & 0 deletions ...rc/test/kotlin/com/twitter/compose/rules/ktlint/ComposeModifierWithoutDefaultCheckTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down