Merge branch 'master' of github.com:ajaxorg/ace

Conflicts:
	build/demo/kitchen-sink/kitchen-sink.js
	build/kitchen-sink.html
	build/src/ace.js
	build/textarea/src/ace.js

build/demo/kitchen-sink/kitchen-sink-uncompressed.js

@@ -6591,6 +6591,17 @@ var EditSession = function(text, mode) {
         return new Range(row, start, row, end);
     };
 
+    // Gets the range of a word including its right whitespace
+    this.getAWordRange = function(row, column) {
+        var wordRange = this.getWordRange(row, column);
+        var line = this.getLine(wordRange.end.row);
+
+        while (line.charAt(wordRange.end.column).match(/[ \t]/)) {
+            wordRange.end.column += 1;
+        }
+        return wordRange;
+    };
+
     this.setNewLineMode = function(newLineMode) {
         this.doc.setNewLineMode(newLineMode);
     };
@@ -8057,6 +8068,13 @@ var Selection = function(session) {
         this.setSelectionRange(range);
     };
 
+    // Selects a word including its right whitespace
+    this.selectAWord = function() {
+        var cursor = this.getCursor();
+        var range = this.session.getAWordRange(cursor.row, cursor.column);
+        this.setSelectionRange(range);
+    };
+
     this.selectLine = function() {
         var rowStart = this.selectionLead.row;
         var rowEnd;

build/src/ace-uncompressed.js

@@ -5731,6 +5731,17 @@ var EditSession = function(text, mode) {
         return new Range(row, start, row, end);
     };
 
+    // Gets the range of a word including its right whitespace
+    this.getAWordRange = function(row, column) {
+        var wordRange = this.getWordRange(row, column);
+        var line = this.getLine(wordRange.end.row);
+
+        while (line.charAt(wordRange.end.column).match(/[ \t]/)) {
+            wordRange.end.column += 1;
+        }
+        return wordRange;
+    };
+
     this.setNewLineMode = function(newLineMode) {
         this.doc.setNewLineMode(newLineMode);
     };
@@ -7197,6 +7208,13 @@ var Selection = function(session) {
         this.setSelectionRange(range);
     };
 
+    // Selects a word including its right whitespace
+    this.selectAWord = function() {
+        var cursor = this.getCursor();
+        var range = this.session.getAWordRange(cursor.row, cursor.column);
+        this.setSelectionRange(range);
+    };
+
     this.selectLine = function() {
         var rowStart = this.selectionLead.row;
         var rowEnd;

build/textarea/src/ace-uncompressed.js

@@ -5685,6 +5685,17 @@ var EditSession = function(text, mode) {
         return new Range(row, start, row, end);
     };
 
+    // Gets the range of a word including its right whitespace
+    this.getAWordRange = function(row, column) {
+        var wordRange = this.getWordRange(row, column);
+        var line = this.getLine(wordRange.end.row);
+
+        while (line.charAt(wordRange.end.column).match(/[ \t]/)) {
+            wordRange.end.column += 1;
+        }
+        return wordRange;
+    };
+
     this.setNewLineMode = function(newLineMode) {
         this.doc.setNewLineMode(newLineMode);
     };
@@ -7151,6 +7162,13 @@ var Selection = function(session) {
         this.setSelectionRange(range);
     };
 
+    // Selects a word including its right whitespace
+    this.selectAWord = function() {
+        var cursor = this.getCursor();
+        var range = this.session.getAWordRange(cursor.row, cursor.column);
+        this.setSelectionRange(range);
+    };
+
     this.selectLine = function() {
         var rowStart = this.selectionLead.row;
         var rowEnd;

lib/ace/edit_session.js

@@ -441,6 +441,17 @@ var EditSession = function(text, mode) {
         return new Range(row, start, row, end);
     };
 
+    // Gets the range of a word including its right whitespace
+    this.getAWordRange = function(row, column) {
+        var wordRange = this.getWordRange(row, column);
+        var line = this.getLine(wordRange.end.row);
+
+        while (line.charAt(wordRange.end.column).match(/[ \t]/)) {
+            wordRange.end.column += 1;
+        }
+        return wordRange;
+    };
+
     this.setNewLineMode = function(newLineMode) {
         this.doc.setNewLineMode(newLineMode);
     };

lib/ace/selection.js

@@ -253,6 +253,13 @@ var Selection = function(session) {
         this.setSelectionRange(range);
     };
 
+    // Selects a word including its right whitespace
+    this.selectAWord = function() {
+        var cursor = this.getCursor();
+        var range = this.session.getAWordRange(cursor.row, cursor.column);
+        this.setSelectionRange(range);
+    };
+
     this.selectLine = function() {
         var rowStart = this.selectionLead.row;
         var rowEnd;

lib/ace/selection_test.js

@@ -248,6 +248,18 @@ module.exports = {
         assert.position(range.end, 0, 12);
     },
 
+    "test: select word with cursor in word including right whitespace should select the word" : function() {
+        var session = new EditSession("Juhu Kinners      123");
+        var selection = session.getSelection();
+
+        selection.moveCursorTo(0, 8);
+        selection.selectAWord();
+
+        var range = selection.getRange();
+        assert.position(range.start, 0, 5);
+        assert.position(range.end, 0, 18);
+    },
+
     "test: select word with cursor betwen white space and word should select the word" : function() {
         var session = new EditSession("Juhu Kinners");
         var selection = session.getSelection();