Make use of findTokenEnd

Author: Jarno Goossens

library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java

@@ -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 = getSelectionWordEnd();
-        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();
         }
@@ -428,12 +429,19 @@ public void invalidate() {
     public boolean enoughToFilter() {
         Editable text = getText();
 
-        int end = getSelectionWordEnd();
-        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();
         }
@@ -747,24 +755,6 @@ protected CharSequence convertSelectionToString(Object object) {
         }
     }
 
-    /**
-     * Get the position of the end of the word were the cursor is positioned. A word is defined as
-     * a sequence of characters without the presence of a character in {@link #splitChar}.
-     *
-     * @return The position of the end of the word were the cursor is positioned.
-     */
-    public int getSelectionWordEnd()
-    {
-        int end = getSelectionEnd();
-
-        //Increase end until the end is reached or a split char is detected
-        while (end < length() && !isSplitChar(getText().charAt(end))) {
-            end++;
-        }
-
-        return end;
-    }
-
     private SpannableStringBuilder buildSpannableForText(CharSequence text) {
         //Add a sentinel , at the beginning so the user can remove an inner token and keep auto-completing
         //This is a hack to work around the fact that the tokenizer cannot directly detect spans
@@ -792,8 +782,9 @@ protected void replaceText(CharSequence text) {
         TokenImageSpan tokenSpan = buildSpanForObject(selectedObject);
 
         Editable editable = getText();
-        int end = getSelectionWordEnd();
-        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();
         }
@@ -1405,7 +1396,7 @@ public boolean canDeleteSelection(int beforeLength) {
         // if beforeLength is 1, we either have no selection or the call is coming from OnKey Event.
         // In these scenarios, getSelectionStart() will return the correct value.
 
-        int endSelection = getSelectionWordEnd();
+        int endSelection = getSelectionEnd();
         int startSelection = beforeLength == 1 ? getSelectionStart() : endSelection - beforeLength;
 
         Editable text = getText();