fix(common): handle empty groups

NeoUtils · Nov 20, 2024 · 0ddbb82 · 0ddbb82
1 parent 6994dbb
commit 0ddbb82
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/build-logic/src/main/kotlin/extension/Project.kt b/build-logic/src/main/kotlin/extension/Project.kt
@@ -7,7 +7,7 @@ val config = Config(
         major = 2,
         minor = 2,
         patch = 0,
-        release = Config.Release.Candidate()
+        release = Config.Release.Candidate(number = 2)
     ),
     android = Config.Android(
         compileSdk = 34,

diff --git a/...compose/src/androidMain/kotlin/com/neoutils/highlight/compose/extension/String.android.kt b/...compose/src/androidMain/kotlin/com/neoutils/highlight/compose/extension/String.android.kt
@@ -13,9 +13,9 @@ actual fun String.matchAll(
             add(
                 Match(
                     text = match.value,
-                    groups = match.groups.mapNotNull {
+                    groups = match.groups.map {
 
-                        if (it == null) return@mapNotNull null
+                        if (it == null) return@map null
 
                         Match.Group(
                             text = it.value,

diff --git a/...light/compose/src/commonMain/kotlin/com/neoutils/highlight/compose/extension/Highlight.kt b/...light/compose/src/commonMain/kotlin/com/neoutils/highlight/compose/extension/Highlight.kt
@@ -19,6 +19,8 @@ fun Highlight.toAnnotatedString(text: String): AnnotatedString {
 
             for ((index, group) in result.groups.withIndex()) {
 
+                if (group == null) continue
+
                 spanStyles.add(
                     AnnotatedString.Range(
                         item = spans.getOrNull(index) ?: continue,

diff --git a/highlight/compose/src/commonMain/kotlin/com/neoutils/highlight/compose/extension/String.kt b/highlight/compose/src/commonMain/kotlin/com/neoutils/highlight/compose/extension/String.kt
@@ -2,7 +2,7 @@ package com.neoutils.highlight.compose.extension
 
 data class Match(
     val text: String,
-    val groups: List<Group>
+    val groups: List<Group?>
 ) {
     data class Group(
         val text: String,

diff --git a/highlight/compose/src/jsMain/kotlin/com/neoutils/highlight/compose/extension/String.js.kt b/highlight/compose/src/jsMain/kotlin/com/neoutils/highlight/compose/extension/String.js.kt
@@ -20,14 +20,16 @@ actual fun String.matchAll(
                 Match(
                     text = match.toString(),
                     groups = buildList {
-                        groupsWithIndex.forEach { (index, it) ->
-                            val range = indices[index].unsafeCast<IntArray>()
+                        groupsWithIndex.forEach { (index, group) ->
+                            val range = indices[index]?.unsafeCast<IntArray>()
 
                             add(
-                                Match.Group(
-                                    text = it.toString(),
-                                    range = range.toRange()
-                                )
+                                range?.let {
+                                    Match.Group(
+                                        text = group.unsafeCast<String>(),
+                                        range = range.toRange()
+                                    )
+                                }
                             )
                         }
                     }

diff --git a/highlight/compose/src/jvmMain/kotlin/com/neoutils/highlight/compose/extension/String.jvm.kt b/highlight/compose/src/jvmMain/kotlin/com/neoutils/highlight/compose/extension/String.jvm.kt
@@ -13,9 +13,9 @@ actual fun String.matchAll(
             add(
                 Match(
                     text = match.value,
-                    groups = match.groups.mapNotNull {
+                    groups = match.groups.map {
 
-                        if (it == null) return@mapNotNull null
+                        if (it == null) return@map null
 
                         Match.Group(
                             text = it.value,