Merge pull request #9001 from MarcelGerber/cm-findwordat

nethip · nethip · commit e1e54ad233ae · 2015-04-04T00:14:49.000+05:30
Use cm.findWordAt() in selectWordAt()
diff --git a/src/editor/Editor.js b/src/editor/Editor.js
@@ -1330,25 +1330,11 @@ define(function (require, exports, module) {
     /**
      * Selects word that the given pos lies within or adjacent to. If pos isn't touching a word
      * (e.g. within a token like "//"), moves the cursor to pos without selecting a range.
-     * Adapted from selectWordAt() in CodeMirror v2.
      * @param {!{line:number, ch:number}}
      */
     Editor.prototype.selectWordAt = function (pos) {
-        var line = this.document.getLine(pos.line),
-            start = pos.ch,
-            end = pos.ch;
-        
-        function isWordChar(ch) {
-            return (/\w/).test(ch) || ch.toUpperCase() !== ch.toLowerCase();
-        }
-        
-        while (start > 0 && isWordChar(line.charAt(start - 1))) {
-            --start;
-        }
-        while (end < line.length && isWordChar(line.charAt(end))) {
-            ++end;
-        }
-        this.setSelection({line: pos.line, ch: start}, {line: pos.line, ch: end});
+        var word = this._codeMirror.findWordAt(pos);
+        this.setSelection(word.anchor, word.head);
     };
     
     /**
