nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am c155f7f5: Merge "Strip quotes from begining/end of a word before checking its validity."

Browse source 
* commit 'c155f7f5fd4aeefcce69a06755a0b3c1360277b8':
  Strip quotes from begining/end of a word before checking its validity.
This commit is contained in:
Martin Paraskevov 2015-04-16 23:58:23 +00:00 committed by Android Git Automerger
commit f93aea6545
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
View file

@ -58,6 +58,9 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session {
protected final SuggestionsCache mSuggestionsCache = new SuggestionsCache(); protected final SuggestionsCache mSuggestionsCache = new SuggestionsCache();
private final ContentObserver mObserver; private final ContentObserver mObserver;
private static final String quotesRegexp =
"\\u0022|\\u0027|\\u0060|\\u00B4|\\u2018|\\u2018|\\u201C|\\u201D";
private static final class SuggestionsParams { private static final class SuggestionsParams {
public final String[] mSuggestions; public final String[] mSuggestions;
public final int mFlags; public final int mFlags;
@ -224,12 +227,16 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session {
protected SuggestionsInfo onGetSuggestionsInternal( protected SuggestionsInfo onGetSuggestionsInternal(
final TextInfo textInfo, final NgramContext ngramContext, final int suggestionsLimit) { final TextInfo textInfo, final NgramContext ngramContext, final int suggestionsLimit) {
try { try {
final String inText = textInfo.getText(); final String text = textInfo.getText().
replaceAll(AndroidSpellCheckerService.APOSTROPHE,
AndroidSpellCheckerService.SINGLE_QUOTE).
replaceAll("^" + quotesRegexp, "").
replaceAll(quotesRegexp + "$", "");
final SuggestionsParams cachedSuggestionsParams = final SuggestionsParams cachedSuggestionsParams =
mSuggestionsCache.getSuggestionsFromCache(inText, ngramContext); mSuggestionsCache.getSuggestionsFromCache(text, ngramContext);
if (cachedSuggestionsParams != null) { if (cachedSuggestionsParams != null) {
Log.d(TAG, "onGetSuggestionsInternal() : Cache hit for [" + inText + "]"); Log.d(TAG, "onGetSuggestionsInternal() : Cache hit for [" + text + "]");
return new SuggestionsInfo( return new SuggestionsInfo(
cachedSuggestionsParams.mFlags, cachedSuggestionsParams.mSuggestions); cachedSuggestionsParams.mFlags, cachedSuggestionsParams.mSuggestions);
} }
@ -241,10 +248,10 @@ 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(inText, mScript); final int checkability = getCheckabilityInScript(text, mScript);
if (CHECKABILITY_CHECKABLE != checkability) { if (CHECKABILITY_CHECKABLE != checkability) {
if (CHECKABILITY_CONTAINS_PERIOD == checkability) { if (CHECKABILITY_CONTAINS_PERIOD == checkability) {
final String[] splitText = inText.split(Constants.REGEXP_PERIOD); final String[] splitText = text.split(Constants.REGEXP_PERIOD);
boolean allWordsAreValid = true; boolean allWordsAreValid = true;
for (final String word : splitText) { for (final String word : splitText) {
if (!mService.isValidWord(mLocale, word)) { if (!mService.isValidWord(mLocale, word)) {
@ -259,15 +266,13 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session {
TextUtils.join(Constants.STRING_SPACE, splitText) }); TextUtils.join(Constants.STRING_SPACE, splitText) });
} }
} }
return mService.isValidWord(mLocale, inText) ? return mService.isValidWord(mLocale, text) ?
AndroidSpellCheckerService.getInDictEmptySuggestions() : AndroidSpellCheckerService.getInDictEmptySuggestions() :
AndroidSpellCheckerService.getNotInDictEmptySuggestions( AndroidSpellCheckerService.getNotInDictEmptySuggestions(
CHECKABILITY_CONTAINS_PERIOD == checkability /* reportAsTypo */); CHECKABILITY_CONTAINS_PERIOD == checkability /* reportAsTypo */);
} }
// Handle normal words. // Handle normal words.
final String text = inText.replaceAll(
AndroidSpellCheckerService.APOSTROPHE, AndroidSpellCheckerService.SINGLE_QUOTE);
final int capitalizeType = StringUtils.getCapitalizationType(text); final int capitalizeType = StringUtils.getCapitalizationType(text);
if (isInDictForAnyCapitalization(text, capitalizeType)) { if (isInDictForAnyCapitalization(text, capitalizeType)) {