Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b7aee515 authored by icburns's avatar icburns Committed by Michael Bestas
Browse files

Fix spellcheck on sentence end 

Issue:
Valid words are being erroneously flagged by the spellchecker when
followed by a period.

Resolution:
Valid words followed by periods are no longer flagged. Invalid words
followed by periods are still flagged, and the intent behind the
existing logic to flag and suggest valid words on either side of a
period within a token should not be impacted by this change.

Additional considerations for CHECKABILITY_CONTAINS_PERIOD:
* Empty words are considered invalid. In CHECKABILITY_CONTAINS_PERIOD,
  when a period was the first or last index of text, splitting that
  text on periods caused suggestions to consider potentially valid
  words to be invalid. For example, "this.example." should suggest
  "this example" or "this example.", but no suggestions were being
  given due to the trailing empty string resulting from the split
  operation being considered invalid. This PR modifies this behavior
  such that empty split tokens will not be considered toward word
  validity when generating suggestions for text containing periods.

* Single word sentences (like "Groovy.") were being flagged as invalid
  since the word only exists in the main dictionary as lower case, but
  the validity check within CHECKABILITY_CONTAINS_PERIOD sent text over
  as is. This PR adds, specific to the period checkability logic,
  a fallback validity check for words set to lower case.

Fixes: https://gitlab.com/LineageOS/issues/android/-/issues/4861
Change-Id: Ie445533544fb3ed4b8d2fa6b554e03e0ae5a960f
parent 60285cca

java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java

+10 −3
Original line number Original line Diff line number Diff line
@@ -237,16 +237,23 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session { 
            // Handle special patterns like email, URI, telephone number.

            // Handle special patterns like email, URI, telephone number.

            final int checkability = getCheckabilityInScript(text, mScript);

            final int checkability = getCheckabilityInScript(text, mScript);

            if (CHECKABILITY_CHECKABLE != checkability) {

            if (CHECKABILITY_CHECKABLE != checkability) {

                // CHECKABILITY_CONTAINS_PERIOD typo should not be reported when text

                // is a valid word followed by a single period (end of sentence).

                boolean periodOnlyAtLastIndex = text.indexOf(

                        Constants.CODE_PERIOD) == (text.length() - 1);

                if (CHECKABILITY_CONTAINS_PERIOD == checkability) {

                if (CHECKABILITY_CONTAINS_PERIOD == checkability) {

                    final String[] splitText = text.split(Constants.REGEXP_PERIOD);

                    final String[] splitText = text.split(Constants.REGEXP_PERIOD);

                    boolean allWordsAreValid = true;

                    boolean allWordsAreValid = true;

                    // Validate all words on both sides of periods,

                    // skip empty tokens due to periods at first/last index

                    for (final String word : splitText) {

                    for (final String word : splitText) {

                        if (!mService.isValidWord(mLocale, word)) {

                        if (!word.isEmpty() && !mService.isValidWord(mLocale, word) &&

                                !mService.isValidWord(mLocale, word.toLowerCase(mLocale))) {

                            allWordsAreValid = false;

                            allWordsAreValid = false;

                            break;

                            break;

                        }

                        }

                    }

                    }

                    if (allWordsAreValid) {

                    if (allWordsAreValid && !periodOnlyAtLastIndex) {

                        return new SuggestionsInfo(SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO

                        return new SuggestionsInfo(SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO

                                | SuggestionsInfo.RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS,

                                | SuggestionsInfo.RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS,

                                new String[] {

                                new String[] {
@@ -256,7 +263,7 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session { 
                return mService.isValidWord(mLocale, text) ?

                return mService.isValidWord(mLocale, text) ?

                        AndroidSpellCheckerService.getInDictEmptySuggestions() :

                        AndroidSpellCheckerService.getInDictEmptySuggestions() :

                        AndroidSpellCheckerService.getNotInDictEmptySuggestions(

                        AndroidSpellCheckerService.getNotInDictEmptySuggestions(

                                CHECKABILITY_CONTAINS_PERIOD == checkability /* reportAsTypo */);

                                !periodOnlyAtLastIndex);

            }

            }





            // Handle normal words.

            // Handle normal words.