From 5964591a19f204c4be7120676f8506fea08fb671 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 28 Sep 2023 16:55:21 +0200
Subject: [PATCH] Fix lint `UnnecessaryComposedModifier` and make it an error

---
 .../element/android/libraries/designsystem/modifiers/Blur.kt | 5 ++---
 tools/lint/lint.xml                                          | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Blur.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Blur.kt
index fb3eb86c96..bb3dbec175 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Blur.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Blur.kt
@@ -21,7 +21,6 @@ import android.os.Build
 import androidx.annotation.ChecksSdkIntAtLeast
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
 import androidx.compose.ui.draw.BlurredEdgeTreatment
 import androidx.compose.ui.draw.blur
 import androidx.compose.ui.draw.drawBehind
@@ -94,8 +93,8 @@ fun Modifier.blurredShapeShadow(
 fun Modifier.blurCompat(
     radius: Dp,
     edgeTreatment: BlurredEdgeTreatment = BlurredEdgeTreatment.Rectangle
-): Modifier = composed {
-    when {
+): Modifier {
+    return when {
         radius.value == 0f -> this
         canUseBlur() -> blur(radius, edgeTreatment)
         else -> this // Added in case we find a way to make this work on older devices
diff --git a/tools/lint/lint.xml b/tools/lint/lint.xml
index 715131226a..4da7a0bba3 100644
--- a/tools/lint/lint.xml
+++ b/tools/lint/lint.xml
@@ -124,4 +124,7 @@
 
     <!-- DI -->
     <!-- issue id="JvmStaticProvidesInObjectDetector" severity="error" /-->
+
+    <!-- Compose -->
+    <issue id="UnnecessaryComposedModifier" severity="error" />
 </lint>