From acef3fc20d39dfaa8457b587c1f582605f58b1a1 Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Tue, 24 Jan 2023 08:08:40 +0200
Subject: [PATCH] fixed unexpected or disappearing suggestions when changing
 the language in the middle of a word

---
 src/io/github/sspanak/tt9/ime/TraditionalT9.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/io/github/sspanak/tt9/ime/TraditionalT9.java b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
index 89af5197..e3c04132 100644
--- a/src/io/github/sspanak/tt9/ime/TraditionalT9.java
+++ b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
@@ -283,7 +283,16 @@ public class TraditionalT9 extends KeyPadHandler {
 
 
 	protected boolean onKeyNextLanguage() {
-		return nextLang();
+		if (nextLang()) {
+			commitCurrentSuggestion(false);
+			mInputMode.reset();
+			resetKeyRepeat();
+			clearSuggestions();
+
+			return true;
+		}
+
+		return false;
 	}
 
 
@@ -497,8 +506,6 @@ public class TraditionalT9 extends KeyPadHandler {
 			return false;
 		}
 
-		clearSuggestions();
-
 		// select the next language
 		int previousLangId = mEnabledLanguages.indexOf(mLanguage.getId());
 		int nextLangId = previousLangId == -1 ? 0 : (previousLangId + 1) % mEnabledLanguages.size();