navigate/select word left/right
This commit is contained in:
parent
4ad2a8cf66
commit
895e5b77c1
3 changed files with 878 additions and 668 deletions
1336
src/Editor.js
1336
src/Editor.js
File diff suppressed because it is too large
Load diff
|
|
@ -97,6 +97,10 @@ if (!window.ace)
|
||||||
return height;
|
return height;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ace.stringReverse = function(string) {
|
||||||
|
return string.split("").reverse().join("");
|
||||||
|
};
|
||||||
|
|
||||||
ace.bind = function(fcn, context) {
|
ace.bind = function(fcn, context) {
|
||||||
return function() {
|
return function() {
|
||||||
return fcn.apply(context, arguments);
|
return fcn.apply(context, arguments);
|
||||||
|
|
|
||||||
|
|
@ -1,83 +1,205 @@
|
||||||
var NavigationTest = TestCase("NavigationTest", {
|
var NavigationTest = TestCase("NavigationTest",
|
||||||
|
{
|
||||||
createTextDocument : function(rows, cols) {
|
createTextDocument : function(rows, cols) {
|
||||||
var line = new Array(cols+1).join("a");
|
var line = new Array(cols + 1).join("a");
|
||||||
var text = new Array(rows).join(line + "\n") + line;
|
var text = new Array(rows).join(line + "\n") + line;
|
||||||
return new ace.TextDocument(text);
|
return new ace.TextDocument(text);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
assertPosition : function(row, column, cursor) {
|
||||||
|
assertEquals(row, cursor.row);
|
||||||
|
assertEquals(column, cursor.column);
|
||||||
|
},
|
||||||
|
|
||||||
|
// End of file, start of files tests
|
||||||
|
|
||||||
"test: navigate to end of file should place the cursor on last row and column" : function() {
|
"test: navigate to end of file should place the cursor on last row and column" : function() {
|
||||||
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
||||||
new MockRenderer());
|
new MockRenderer());
|
||||||
|
|
||||||
editor.navigateFileEnd();
|
editor.navigateFileEnd();
|
||||||
|
this.assertPosition(199, 10, editor.getCursorPosition());
|
||||||
var cursor = editor.getCursorPosition();
|
|
||||||
assertEquals(199, cursor.row);
|
|
||||||
assertEquals(10, cursor.column);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
"test: navigate to end of file should scroll the last line into view" : function() {
|
"test: navigate to end of file should scroll the last line into view" : function() {
|
||||||
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
||||||
new MockRenderer());
|
new MockRenderer());
|
||||||
|
|
||||||
editor.navigateFileEnd();
|
editor.navigateFileEnd();
|
||||||
var cursor = editor.getCursorPosition();
|
var cursor = editor.getCursorPosition();
|
||||||
|
|
||||||
assertTrue(editor.getFirstVisibleRow() <= cursor.row);
|
assertTrue(editor.getFirstVisibleRow() <= cursor.row);
|
||||||
assertTrue(editor.getLastVisibleRow() >= cursor.row);
|
assertTrue(editor.getLastVisibleRow() >= cursor.row);
|
||||||
},
|
},
|
||||||
|
|
||||||
"test: navigate to start of file should place the cursor on the first row and column" : function() {
|
"test: navigate to start of file should place the cursor on the first row and column" : function() {
|
||||||
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
||||||
new MockRenderer());
|
new MockRenderer());
|
||||||
|
|
||||||
editor.navigateFileStart();
|
editor.navigateFileStart();
|
||||||
|
this.assertPosition(0, 0, editor.getCursorPosition());
|
||||||
var cursor = editor.getCursorPosition();
|
|
||||||
assertEquals(0, cursor.row);
|
|
||||||
assertEquals(0, cursor.column);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
"test: navigate to start of file should scroll the first row into view" : function() {
|
"test: navigate to start of file should scroll the first row into view" : function() {
|
||||||
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
||||||
new MockRenderer());
|
new MockRenderer());
|
||||||
|
|
||||||
editor.scrollToRow(editor.getLastVisibleRow() + 20);
|
editor.scrollToRow(editor.getLastVisibleRow() + 20);
|
||||||
editor.navigateFileStart();
|
editor.navigateFileStart();
|
||||||
|
|
||||||
assertEquals(0, editor.getFirstVisibleRow());
|
assertEquals(0, editor.getFirstVisibleRow());
|
||||||
},
|
},
|
||||||
|
|
||||||
"test: move selection lead to end of file" : function() {
|
"test: move selection lead to end of file" : function() {
|
||||||
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
||||||
new MockRenderer());
|
new MockRenderer());
|
||||||
|
|
||||||
editor.moveCursorTo(100, 5);
|
editor.moveCursorTo(100, 5);
|
||||||
editor.selectFileEnd();
|
editor.selectFileEnd();
|
||||||
|
|
||||||
var selection = editor.getSelectionRange();
|
var selection = editor.getSelectionRange();
|
||||||
|
|
||||||
assertEquals(100, selection.start.row);
|
this.assertPosition(100, 5, selection.start);
|
||||||
assertEquals(5, selection.start.column);
|
this.assertPosition(199, 10, selection.end);
|
||||||
|
|
||||||
assertEquals(199, selection.end.row);
|
|
||||||
assertEquals(10, selection.end.column);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
"test: move selection lead to start of file" : function() {
|
"test: move selection lead to start of file" : function() {
|
||||||
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
var editor = new ace.Editor(this.createTextDocument(200, 10),
|
||||||
new MockRenderer());
|
new MockRenderer());
|
||||||
|
|
||||||
editor.moveCursorTo(100, 5);
|
editor.moveCursorTo(100, 5);
|
||||||
editor.selectFileStart();
|
editor.selectFileStart();
|
||||||
|
|
||||||
var selection = editor.getSelectionRange();
|
|
||||||
|
|
||||||
assertEquals(0, selection.start.row);
|
|
||||||
assertEquals(0, selection.start.column);
|
|
||||||
|
|
||||||
assertEquals(100, selection.end.row);
|
var selection = editor.getSelectionRange();
|
||||||
assertEquals(5, selection.end.column);
|
|
||||||
}
|
this.assertPosition(0, 0, selection.start);
|
||||||
|
this.assertPosition(100, 5, selection.end);
|
||||||
|
},
|
||||||
|
|
||||||
|
"test: navigate word right" : function() {
|
||||||
|
var doc = new ace.TextDocument( ["ab",
|
||||||
|
" Juhu Kinners (abc, 12)", " cde"].join("\n"));
|
||||||
|
var editor = new ace.Editor(doc, new MockRenderer());
|
||||||
|
|
||||||
|
editor.navigateDown();
|
||||||
|
this.assertPosition(1, 0, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(1, 1, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(1, 5, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(1, 6, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(1, 13, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(1, 15, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(1, 18, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(1, 20, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(1, 22, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(1, 23, editor.getCursorPosition());
|
||||||
|
|
||||||
|
// wrap line
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(2, 0, editor.getCursorPosition());
|
||||||
|
},
|
||||||
|
|
||||||
|
"test: select word right if cursor in word" : function() {
|
||||||
|
var doc = new ace.TextDocument("Juhu Kinners");
|
||||||
|
var editor = new ace.Editor(doc, new MockRenderer());
|
||||||
|
|
||||||
|
editor.moveCursorTo(0, 2);
|
||||||
|
|
||||||
|
editor.navigateWordRight();
|
||||||
|
this.assertPosition(0, 4, editor.getCursorPosition());
|
||||||
|
},
|
||||||
|
|
||||||
|
"test: navigate word left" : function() {
|
||||||
|
var doc = new ace.TextDocument( ["ab",
|
||||||
|
" Juhu Kinners (abc, 12)", " cde"].join("\n"));
|
||||||
|
var editor = new ace.Editor(doc, new MockRenderer());
|
||||||
|
|
||||||
|
editor.navigateDown();
|
||||||
|
editor.navigateLineEnd();
|
||||||
|
this.assertPosition(1, 23, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(1, 22, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(1, 20, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(1, 18, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(1, 15, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(1, 13, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(1, 6, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(1, 5, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(1, 1, editor.getCursorPosition());
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(1, 0, editor.getCursorPosition());
|
||||||
|
|
||||||
|
// wrap line
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(0, 2, editor.getCursorPosition());
|
||||||
|
},
|
||||||
|
|
||||||
|
"test: select word left if cursor in word" : function() {
|
||||||
|
var doc = new ace.TextDocument("Juhu Kinners");
|
||||||
|
var editor = new ace.Editor(doc, new MockRenderer());
|
||||||
|
|
||||||
|
editor.moveCursorTo(0, 8);
|
||||||
|
|
||||||
|
editor.navigateWordLeft();
|
||||||
|
this.assertPosition(0, 5, editor.getCursorPosition());
|
||||||
|
},
|
||||||
|
|
||||||
|
"test: select word right and select" : function() {
|
||||||
|
var doc = new ace.TextDocument("Juhu Kinners");
|
||||||
|
var editor = new ace.Editor(doc, new MockRenderer());
|
||||||
|
|
||||||
|
editor.moveCursorTo(0, 0);
|
||||||
|
editor.selectWordRight();
|
||||||
|
|
||||||
|
var selection = editor.getSelectionRange();
|
||||||
|
|
||||||
|
this.assertPosition(0, 0, selection.start);
|
||||||
|
this.assertPosition(0, 4, selection.end);
|
||||||
|
},
|
||||||
|
|
||||||
|
"test: select word left and select" : function() {
|
||||||
|
var doc = new ace.TextDocument("Juhu Kinners");
|
||||||
|
var editor = new ace.Editor(doc, new MockRenderer());
|
||||||
|
|
||||||
|
editor.moveCursorTo(0, 3);
|
||||||
|
editor.selectWordLeft();
|
||||||
|
|
||||||
|
var selection = editor.getSelectionRange();
|
||||||
|
|
||||||
|
this.assertPosition(0, 0, selection.start);
|
||||||
|
this.assertPosition(0, 3, selection.end);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue