Adjust hint.fromList to consistenly use the cursor as end pos

Issue #5312
codemirror · Mar 20, 2018 · d49ef29 · d49ef29
1 parent e732d0e
commit d49ef29
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
@@ -397,13 +397,13 @@
   });
 
   CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    var to = CodeMirror.Pos(cur.line, token.end);
-    if (token.string && /\w/.test(token.string[token.string.length - 1])) {
-      var length = token.string.length - (token.end - cur.ch);
-      var term = token.string.substr(0, length), from = CodeMirror.Pos(cur.line, token.start);
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur)
+    var term, from = CodeMirror.Pos(cur.line, token.start), to = cur
+    if (token.start < cur.ch && /\w/.test(token.string.charAt(cur.ch - token.start - 1))) {
+      term = token.string.substr(0, cur.ch - token.start)
     } else {
-      var term = "", from = to;
+      term = ""
+      from = cur
     }
     var found = [];
     for (var i = 0; i < options.words.length; i++) {