Skip to content
Snippets Groups Projects
Commit cdd8a1a6 authored by Jean Chalard's avatar Jean Chalard
Browse files

[IL13] Inline restartSuggestionsOnWordBeforeCursor

It's only ever used in one place and makes unhealthy assumptions
about what the caller is doing. It's better inlined.

Bug: 8636060
Change-Id: I265d5d96894e929d09247ee2e3dc2e81efc2a276
parent bbe40835
No related branches found
No related tags found
No related merge requests found
......@@ -823,10 +823,17 @@ public final class InputLogic {
final CharSequence word = mConnection.getWordBeforeCursorIfAtEndOfWord(settingsValues);
if (null != word) {
final String wordString = word.toString();
restartSuggestionsOnWordBeforeCursor(settingsValues, wordString, keyboardSwitcher,
handler);
mWordComposer.setComposingWord(word,
// Previous word is the 2nd word before cursor because we are restarting on the
// 1st word before cursor.
getNthPreviousWordForSuggestion(settingsValues, 2 /* nthPreviousWord */),
keyboardSwitcher.getKeyboard());
final int length = word.length();
mConnection.deleteSurroundingText(length, 0);
mConnection.setComposingText(word, 1);
handler.postUpdateSuggestionStrip();
// TODO: Handle the case where the user manually moves the cursor and then backs up over
// a separator. In that case, the current log unit should not be uncommitted.
// a separator. In that case, the current log unit should not be uncommitted.
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.getInstance().uncommitCurrentLogUnit(wordString,
true /* dumpCurrentLogUnit */);
......@@ -834,25 +841,6 @@ public final class InputLogic {
}
}
/**
* Restart suggestions on the word passed as an argument, assuming it is before the cursor.
* @param settingsValues the current settings values.
*/
private void restartSuggestionsOnWordBeforeCursor(final SettingsValues settingsValues,
final String word,
// TODO: remove these two arguments
final KeyboardSwitcher keyboardSwitcher, final LatinIME.UIHandler handler) {
mWordComposer.setComposingWord(word,
// Previous word is the 2nd word before cursor because we are restarting on the
// 1st word before cursor.
getNthPreviousWordForSuggestion(settingsValues, 2 /* nthPreviousWord */),
keyboardSwitcher.getKeyboard());
final int length = word.length();
mConnection.deleteSurroundingText(length, 0);
mConnection.setComposingText(word, 1);
handler.postUpdateSuggestionStrip();
}
/**
* Reverts a previous commit with auto-correction.
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment