Skip to content

Try fixing index OOB issues in Editable.checkSuggestionNeeded #6303

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

Merged
jmartinesp merged 1 commit into from
Mar 10, 2026
+21 −3
Merged

Try fixing index OOB issues in Editable.checkSuggestionNeeded #6303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 21 additions & 3 deletions ...kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import io.element.android.libraries.textcomposer.model.SuggestionType
import io.element.android.libraries.textcomposer.model.aMarkdownTextEditorState
import io.element.android.wysiwyg.compose.RichTextEditorStyle
import io.element.android.wysiwyg.compose.internal.applyStyleInCompose
import timber.log.Timber

@Suppress("ModifierMissing")
@Composable
Expand Down Expand Up @@ -149,8 +150,20 @@ fun MarkdownTextInput(

private fun Editable.checkSuggestionNeeded(): Suggestion? {
if (this.isEmpty()) return null
val start = Selection.getSelectionStart(this)
val end = Selection.getSelectionEnd(this)
var start = Selection.getSelectionStart(this)
var end = Selection.getSelectionEnd(this)
val range = 0..this.length

if (start !in range || end !in range) {
Timber.tag("checkSuggestionNeeded").e("Selection indices are out of bounds: start=$start, end=$end, text length=${this.length}")
return null
}

// Make sure the selection order is correct, if not swap them: sometimes we can get the end before the start
val tempEnd = end
end = maxOf(start, end)
start = minOf(start, tempEnd)

var startOfWord = start
while ((startOfWord > 0 || startOfWord == length) && !this[startOfWord - 1].isWhitespace()) {
startOfWord--
Expand All @@ -161,11 +174,16 @@ private fun Editable.checkSuggestionNeeded(): Suggestion? {
// If a mention span already exists we don't need suggestions
if (getSpans<MentionSpan>(startOfWord, startOfWord + 1).isNotEmpty()) return null

return if (firstChar in listOf('@', '#', '/')) {
return if (firstChar in listOf('@', '#', '/', ':')) {
var endOfWord = end
while (endOfWord < this.length && !this[endOfWord].isWhitespace()) {
endOfWord++
}
if (startOfWord + 1 > endOfWord) {
Timber.tag("checkSuggestionNeeded").e("No need to show suggestions for an invalid range (${startOfWord + 1}..$endOfWord)")
return null
}

val text = this.subSequence(startOfWord + 1, endOfWord).toString()
val suggestionType = when (firstChar) {
'@' -> SuggestionType.Mention
Expand Down
Loading