Skip to content

Text expander word condition removed #352

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

Open
AZADAYAZ wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Text expander word condition removed #352

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dea64b
Update TextExpanderUtils.kt
AZADAYAZ Jul 26, 2026
614bc13
Update TextExpanderUtils.kt
AZADAYAZ Jul 26, 2026
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
9 changes: 4 additions & 5 deletions app/src/main/java/helium314/keyboard/latin/utils/TextExpanderUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package helium314.keyboard.latin.utils

import android.content.ClipboardManager
import android.content.Context
import android.content.res.ColorStateList
import org.json.JSONObject
import java.text.SimpleDateFormat
import java.util.Date
Expand All @@ -32,8 +31,6 @@ object TextExpanderUtils {
return context.prefs().getBoolean(PREF_BACKSPACE_REVERTS, false)
}



data class ShortcutEntry(
val template: String,
val prefix: String = ""
Expand Down Expand Up @@ -245,8 +242,9 @@ object TextExpanderUtils {
val regex = Regex(patternStr, RegexOption.IGNORE_CASE)
val expectedSuffix = prefix + word
if (textBeforeCursor.endsWith(expectedSuffix, ignoreCase = true)) {
if (regex.matches(expectedSuffix)) {
val replaced = regex.replace(expectedSuffix, entry.template)
val matchInput = if (expectedSuffix.startsWith(prefix)) expectedSuffix.substring(prefix.length) else expectedSuffix
if (regex.matches(matchInput)) {
val replaced = regex.replace(matchInput, entry.template)
return ExpandedResult(expand(replaced, context), prefix.length, expectedSuffix)
}
}
Expand Down Expand Up @@ -276,3 +274,4 @@ object TextExpanderUtils {
return null
}
}

Loading