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

am 89df8029: Merge "Fix: spell checker wrongly sorts suggestions." 

* commit '89df80292ea98a1430687786a9e2c1b9bf165b9d':
  Fix: spell checker wrongly sorts suggestions.
main
Keisuke Kuroyanagi 2014-03-28 14:49:49 +00:00 committed by Android Git Automerger
parent 82166382fd 89df80292e
commit e7a4330ccf
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
View File

@ -268,6 +268,7 @@ public final class AndroidSpellCheckerService extends SpellCheckerService
// if it doesn't. See documentation for binarySearch. // if it doesn't. See documentation for binarySearch.
final int insertIndex = positionIndex >= 0 ? positionIndex : -positionIndex - 1; final int insertIndex = positionIndex >= 0 ? positionIndex : -positionIndex - 1;
// Weak <- insertIndex == 0, ..., insertIndex == mLength -> Strong
if (insertIndex == 0 && mLength >= mMaxLength) { if (insertIndex == 0 && mLength >= mMaxLength) {
// In the future, we may want to keep track of the best suggestion score even if // In the future, we may want to keep track of the best suggestion score even if
// we are asked for 0 suggestions. In this case, we can use the following // we are asked for 0 suggestions. In this case, we can use the following
@ -285,11 +286,6 @@ public final class AndroidSpellCheckerService extends SpellCheckerService
// } // }
return true; return true;
} }
if (insertIndex >= mMaxLength) {
// We found a suggestion, but its score is too weak to be kept considering
// the suggestion limit.
return true;
}
final String wordString = new String(word, wordOffset, wordLength); final String wordString = new String(word, wordOffset, wordLength);
if (mLength < mMaxLength) { if (mLength < mMaxLength) {
@ -297,12 +293,13 @@ public final class AndroidSpellCheckerService extends SpellCheckerService
++mLength; ++mLength;
System.arraycopy(mScores, insertIndex, mScores, insertIndex + 1, copyLen); System.arraycopy(mScores, insertIndex, mScores, insertIndex + 1, copyLen);
mSuggestions.add(insertIndex, wordString); mSuggestions.add(insertIndex, wordString);
mScores[insertIndex] = score;
} else { } else {
System.arraycopy(mScores, 1, mScores, 0, insertIndex); System.arraycopy(mScores, 1, mScores, 0, insertIndex - 1);
mSuggestions.add(insertIndex, wordString); mSuggestions.add(insertIndex, wordString);
mSuggestions.remove(0); mSuggestions.remove(0);
mScores[insertIndex - 1] = score;
} }
mScores[insertIndex] = score;
return true; return true;
} }