Take nullable types into account for trailing lambdas in ComposeParam…

…eterOrder
mrmans0n · Jun 9, 2023 · a36890f · a36890f
1 parent e7ad72c
commit a36890f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/rules/common/src/main/kotlin/io/nlopez/compose/rules/ComposeParameterOrder.kt b/rules/common/src/main/kotlin/io/nlopez/compose/rules/ComposeParameterOrder.kt
@@ -9,6 +9,7 @@ import io.nlopez.rules.core.util.isModifier
 import io.nlopez.rules.core.util.runIf
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtFunctionType
+import org.jetbrains.kotlin.psi.KtNullableType
 import org.jetbrains.kotlin.psi.KtParameter
 
 class ComposeParameterOrder : ComposeKtVisitor {
@@ -52,7 +53,12 @@ class ComposeParameterOrder : ComposeKtVisitor {
     }
 
     private val KtFunction.hasTrailingFunction: Boolean
-        get() = valueParameters.lastOrNull()?.typeReference?.typeElement is KtFunctionType
+        get() =
+            when (val outerType = valueParameters.lastOrNull()?.typeReference?.typeElement) {
+                is KtFunctionType -> true
+                is KtNullableType -> outerType.innerType is KtFunctionType
+                else -> false
+            }
 
     companion object {
         fun createErrorMessage(currentOrder: List<KtParameter>, properOrder: List<KtParameter>): String =

diff --git a/...s/detekt/src/test/kotlin/io/nlopez/compose/rules/detekt/ComposeParameterOrderCheckTest.kt b/...s/detekt/src/test/kotlin/io/nlopez/compose/rules/detekt/ComposeParameterOrderCheckTest.kt
@@ -27,6 +27,9 @@ class ComposeParameterOrderCheckTest {
 
             @Composable
             fun MyComposable(text1: String, modifier: Modifier = Modifier, m2: Modifier = Modifier, trailing: () -> Unit) { }
+
+            @Composable
+            fun MyComposable(text1: String, modifier: Modifier = Modifier, m2: Modifier = Modifier, trailing: (() -> Unit)?) { }
         """.trimIndent()
         val errors = rule.lint(code)
         assertThat(errors).isEmpty()

diff --git a/...s/ktlint/src/test/kotlin/io/nlopez/compose/rules/ktlint/ComposeParameterOrderCheckTest.kt b/...s/ktlint/src/test/kotlin/io/nlopez/compose/rules/ktlint/ComposeParameterOrderCheckTest.kt
@@ -26,6 +26,9 @@ class ComposeParameterOrderCheckTest {
 
             @Composable
             fun MyComposable(text1: String, modifier: Modifier = Modifier, m2: Modifier = Modifier, trailing: () -> Unit) { }
+
+            @Composable
+            fun MyComposable(text1: String, modifier: Modifier = Modifier, m2: Modifier = Modifier, trailing: (() -> Unit)?) { }
         """.trimIndent()
         orderingRuleAssertThat(code).hasNoLintViolations()
     }