Fixes incorrect input parsing, causing backspace & suggestion issues (#836)

Author: urikdev

app/src/main/java/com/urik/keyboard/service/BackspaceHandler.kt

@@ -306,7 +306,10 @@ class BackspaceHandler(
                         }
                     }
 
-                    if (!inputState.isAcceleratedDeletion && !inputState.isUrlOrEmailField) {
+                    if (!inputState.isAcceleratedDeletion &&
+                        !inputState.isUrlOrEmailField &&
+                        !inputState.isSuggestionsDisabled
+                    ) {
                         val remainingText = textBeforeCursor.dropLast(graphemeLength)
 
                         if (remainingText.isNotEmpty() && remainingText.last() == '\n') {

app/src/main/java/com/urik/keyboard/service/InputFieldClassifier.kt

@@ -46,7 +46,11 @@ object InputFieldClassifier {
         if (inputClass == InputType.TYPE_CLASS_TEXT) {
             val flags = inputType and InputType.TYPE_MASK_FLAGS
             val variation = inputType and InputType.TYPE_MASK_VARIATION
-            if (flags and InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS != 0) return true
+            if (flags and InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS != 0 &&
+                flags and InputType.TYPE_TEXT_FLAG_AUTO_CORRECT == 0
+            ) {
+                return true
+            }
             if (flags and InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE != 0) return true
             if (variation == InputType.TYPE_TEXT_VARIATION_FILTER) return true
         }

app/src/main/java/com/urik/keyboard/service/SwipeWordHandler.kt

@@ -31,7 +31,7 @@ class SwipeWordHandler(
 
             if (inputState.isRawKeyEventField) return
 
-            if (inputState.requiresDirectCommit) {
+            if (inputState.requiresDirectCommit || inputState.isSuggestionsDisabled) {
                 if (!inputState.isSecureField && !inputState.isTerminalField) {
                     outputBridge.beginBatchEdit()
                     try {

app/src/test/java/com/urik/keyboard/service/BackspaceHandlerTest.kt

@@ -134,4 +134,24 @@ class BackspaceHandlerTest {
         verify(mockSuggestionPipeline, never()).learnWordAndInvalidateCache(any(), any())
         verify(mockSuggestionPipeline, never()).recordWordUsage(any())
     }
+
+    @Test
+    fun `backspace in suggestions-disabled field deletes without recomposition`() = runTest(testDispatcher) {
+        realInputState.isSuggestionsDisabled = true
+        realInputState.displayBuffer = ""
+        realInputState.composingRegionStart = -1
+        whenever(mockOutputBridge.safeGetCursorPosition()).thenReturn(4)
+        whenever(mockOutputBridge.safeGetTextBeforeCursor(any(), any())).thenReturn("word")
+        whenever(mockOutputBridge.calculateParagraphBoundedComposingRegion("wor", 3))
+            .thenReturn(Triple(0, 3, "wor"))
+
+        handler.handle()
+        advanceUntilIdle()
+
+        verify(mockOutputBridge, never()).setComposingRegion(any(), any())
+        assertEquals("", realInputState.displayBuffer)
+        assertEquals(-1, realInputState.composingRegionStart)
+        verify(mockSuggestionPipeline, never()).requestSuggestions(any(), any())
+        verify(mockOutputBridge).deleteSurroundingText(1, 0)
+    }
 }

app/src/test/java/com/urik/keyboard/service/InputFieldClassifierTest.kt

@@ -147,6 +147,25 @@ class InputFieldClassifierTest {
         assertTrue(InputFieldClassifier.classify(info).isSuggestionsDisabled)
     }
 
+    @Test
+    fun `classify NO_SUGGESTIONS with AUTO_CORRECT isSuggestionsDisabled false`() {
+        val info = createEditorInfo(
+            inputFlags = InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS or InputType.TYPE_TEXT_FLAG_AUTO_CORRECT
+        )
+        assertFalse(InputFieldClassifier.classify(info).isSuggestionsDisabled)
+    }
+
+    @Test
+    fun `classify instagram message field flags isSuggestionsDisabled false`() {
+        val info = createEditorInfo(
+            inputFlags = InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS or
+                InputType.TYPE_TEXT_FLAG_AUTO_CORRECT or
+                InputType.TYPE_TEXT_FLAG_MULTI_LINE or
+                InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
+        )
+        assertFalse(InputFieldClassifier.classify(info).isSuggestionsDisabled)
+    }
+
     @Test
     fun `classify TYPE_TEXT_FLAG_AUTO_COMPLETE isSuggestionsDisabled true`() {
         val info = createEditorInfo(inputFlags = InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE)

app/src/test/java/com/urik/keyboard/service/SwipeWordHandlerTest.kt

@@ -7,12 +7,15 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mockito.mock
+import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.mockito.MockitoAnnotations
 import org.mockito.kotlin.any
@@ -99,6 +102,26 @@ class SwipeWordHandlerTest {
         verify(mockOutputBridge).commitText("hello", 1)
     }
 
+    @Test
+    fun `swipe in suggestions-disabled field commits directly without composing region`() = runTest(testDispatcher) {
+        realInputState.isSuggestionsDisabled = true
+        whenever(mockOutputBridge.safeGetTextBeforeCursor(1)).thenReturn("")
+        whenever(mockOutputBridge.safeGetTextBeforeCursor(50)).thenReturn("")
+        whenever(mockCaseTransformer.applyCasing(any(), any(), any(), any())).thenAnswer { invocation ->
+            (invocation.arguments[0] as SpellingSuggestion).word
+        }
+
+        handler.handle("hello")
+        advanceUntilIdle()
+
+        verify(mockOutputBridge).commitText("hello", 1)
+        verify(mockOutputBridge, never()).setComposingText(any(), any())
+        assertEquals("", realInputState.displayBuffer)
+        assertEquals(-1, realInputState.composingRegionStart)
+        verify(mockTextInputProcessor, never()).processWordInput(any(), any())
+        verify(mockSuggestionPipeline, never()).coordinateStateTransition(any())
+    }
+
     @Test
     fun `empty validated word returns early without side effects`() {
         handler.handle("")