Skip to content

Fix for autocompleting with cursor in the middle #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 1, 2016
Merged

Fix for autocompleting with cursor in the middle #198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afd1f0f
Get the end of a word instead of cursor position
Jan 19, 2016
8a78979
Make use of findTokenEnd
Feb 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,9 @@ protected String currentCompletionText() {
if (hintVisible) return ""; //Can't have any text if the hint is visible

Editable editable = getText();
int end = getSelectionEnd();
int start = tokenizer.findTokenStart(editable, end);
int cursorPosition = getSelectionEnd();
int end = tokenizer.findTokenEnd(editable, cursorPosition);
int start = tokenizer.findTokenStart(editable, cursorPosition);
if (start < prefix.length()) {
start = prefix.length();
}
Expand Down Expand Up @@ -428,12 +429,19 @@ public void invalidate() {
public boolean enoughToFilter() {
Editable text = getText();

int end = getSelectionEnd();
if (end < 0 || tokenizer == null) {
if (tokenizer == null)
{
return false;
}

int start = tokenizer.findTokenStart(text, end);
int cursorPosition = getSelectionEnd();

if (cursorPosition < 0) {
return false;
}

int end = tokenizer.findTokenEnd(text, cursorPosition);
int start = tokenizer.findTokenStart(text, cursorPosition);
if (start < prefix.length()) {
start = prefix.length();
}
Expand Down Expand Up @@ -774,8 +782,9 @@ protected void replaceText(CharSequence text) {
TokenImageSpan tokenSpan = buildSpanForObject(selectedObject);

Editable editable = getText();
int end = getSelectionEnd();
int start = tokenizer.findTokenStart(editable, end);
int cursorPosition = getSelectionEnd();
int end = tokenizer.findTokenEnd(editable, cursorPosition);
int start = tokenizer.findTokenStart(editable, cursorPosition);
if (start < prefix.length()) {
start = prefix.length();
}
Expand Down