jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor selection support into a separate class

Browse source 
Merge branch 'master' into HEAD

Conflicts:
	src/Editor.js
	src/KeyBinding.js
	src/Selection.js
This commit is contained in:
Fabian Jakobs 2010-04-15 13:58:49 +02:00
commit 7529f90080
12 changed files with 887 additions and 680 deletions
Download patch file Download diff file Expand all files Collapse all files

187
test/NavigationTest.js
View file

@ -6,33 +6,17 @@ var NavigationTest = TestCase("NavigationTest",
return new ace.TextDocument(text);
},
"test: navigate to end of file should place the cursor on last row and column" : function() {
var doc = this.createTextDocument(200, 10);
var editor = new ace.Editor(new MockRenderer(), doc);
editor.navigateFileEnd();
assertPosition(199, 10, editor.getCursorPosition());
},
"test: navigate to end of file should scroll the last line into view" : function() {
var doc = this.createTextDocument(200, 10);
var editor = new ace.Editor(new MockRenderer(), doc);
editor.navigateFileEnd();
var cursor = editor.getCursorPosition();
var cursor = editor.getSelection().getCursor();
assertTrue(editor.getFirstVisibleRow() <= cursor.row);
assertTrue(editor.getLastVisibleRow() >= cursor.row);
},
"test: navigate to start of file should place the cursor on the first row and column" : function() {
var doc = this.createTextDocument(200, 10);
var editor = new ace.Editor(new MockRenderer(), doc);
editor.navigateFileStart();
assertPosition(0, 0, editor.getCursorPosition());
},
"test: navigate to start of file should scroll the first row into view" : function() {
var doc = this.createTextDocument(200, 10);
var editor = new ace.Editor(new MockRenderer(), doc);
@ -43,190 +27,37 @@ var NavigationTest = TestCase("NavigationTest",
assertEquals(0, editor.getFirstVisibleRow());
},
"test: move selection lead to end of file" : function() {
var doc = this.createTextDocument(200, 10);
var editor = new ace.Editor(new MockRenderer(), doc);
editor.moveCursorTo(100, 5);
editor.selectFileEnd();
var selection = editor.getSelectionRange();
assertPosition(100, 5, selection.start);
assertPosition(199, 10, selection.end);
},
"test: move selection lead to start of file" : function() {
var doc = this.createTextDocument(200, 10);
var editor = new ace.Editor(new MockRenderer(), doc);
editor.moveCursorTo(100, 5);
editor.selectFileStart();
var selection = editor.getSelectionRange();
assertPosition(0, 0, selection.start);
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(new MockRenderer(), doc);
editor.navigateDown();
assertPosition(1, 0, editor.getCursorPosition());
editor.navigateWordRight();
assertPosition(1, 1, editor.getCursorPosition());
editor.navigateWordRight();
assertPosition(1, 5, editor.getCursorPosition());
editor.navigateWordRight();
assertPosition(1, 6, editor.getCursorPosition());
editor.navigateWordRight();
assertPosition(1, 13, editor.getCursorPosition());
editor.navigateWordRight();
assertPosition(1, 15, editor.getCursorPosition());
editor.navigateWordRight();
assertPosition(1, 18, editor.getCursorPosition());
editor.navigateWordRight();
assertPosition(1, 20, editor.getCursorPosition());
editor.navigateWordRight();
assertPosition(1, 22, editor.getCursorPosition());
editor.navigateWordRight();
assertPosition(1, 23, editor.getCursorPosition());
// wrap line
editor.navigateWordRight();
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(new MockRenderer(), doc);
editor.moveCursorTo(0, 2);
editor.navigateWordRight();
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(new MockRenderer(), doc);
editor.navigateDown();
editor.navigateLineEnd();
assertPosition(1, 23, editor.getCursorPosition());
editor.navigateWordLeft();
assertPosition(1, 22, editor.getCursorPosition());
editor.navigateWordLeft();
assertPosition(1, 20, editor.getCursorPosition());
editor.navigateWordLeft();
assertPosition(1, 18, editor.getCursorPosition());
editor.navigateWordLeft();
assertPosition(1, 15, editor.getCursorPosition());
editor.navigateWordLeft();
assertPosition(1, 13, editor.getCursorPosition());
editor.navigateWordLeft();
assertPosition(1, 6, editor.getCursorPosition());
editor.navigateWordLeft();
assertPosition(1, 5, editor.getCursorPosition());
editor.navigateWordLeft();
assertPosition(1, 1, editor.getCursorPosition());
editor.navigateWordLeft();
assertPosition(1, 0, editor.getCursorPosition());
// wrap line
editor.navigateWordLeft();
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(new MockRenderer(), doc);
editor.moveCursorTo(0, 8);
editor.navigateWordLeft();
assertPosition(0, 5, editor.getCursorPosition());
},
"test: select word right and select" : function() {
var doc = new ace.TextDocument("Juhu Kinners");
var editor = new ace.Editor(new MockRenderer(), doc);
editor.moveCursorTo(0, 0);
editor.selectWordRight();
var selection = editor.getSelectionRange();
assertPosition(0, 0, selection.start);
assertPosition(0, 4, selection.end);
},
"test: select word left and select" : function() {
var doc = new ace.TextDocument("Juhu Kinners");
var editor = new ace.Editor(new MockRenderer(), doc);
editor.moveCursorTo(0, 3);
editor.selectWordLeft();
var selection = editor.getSelectionRange();
assertPosition(0, 0, selection.start);
assertPosition(0, 3, selection.end);
},
"test: goto hidden line should scroll the line into the middle of the viewport" : function() {
var editor = new ace.Editor(new MockRenderer(), this.createTextDocument(200, 5));
editor.navigateTo(0, 0);
editor.gotoLine(100);
assertPosition(100, 0, editor.getCursorPosition());
assertPosition(100, 0, editor.getSelection().getCursor());
assertEquals(90, editor.getFirstVisibleRow());
editor.navigateTo(100, 0);
editor.gotoLine(10);
assertPosition(10, 0, editor.getCursorPosition());
assertPosition(10, 0, editor.getSelection().getCursor());
assertEquals(0, editor.getFirstVisibleRow());
editor.navigateTo(100, 0);
editor.gotoLine(5);
assertPosition(5, 0, editor.getCursorPosition());
assertPosition(5, 0, editor.getSelection().getCursor());
assertEquals(0, editor.getFirstVisibleRow());
editor.navigateTo(100, 0);
editor.gotoLine(0);
assertPosition(0, 0, editor.getCursorPosition());
assertPosition(0, 0, editor.getSelection().getCursor());
assertEquals(0, editor.getFirstVisibleRow());
editor.navigateTo(0, 0);
editor.gotoLine(190);
assertPosition(190, 0, editor.getCursorPosition());
assertPosition(190, 0, editor.getSelection().getCursor());
assertEquals(180, editor.getFirstVisibleRow());
editor.navigateTo(0, 0);
editor.gotoLine(195);
assertPosition(195, 0, editor.getCursorPosition());
assertPosition(195, 0, editor.getSelection().getCursor());
assertEquals(180, editor.getFirstVisibleRow());
},
@ -235,12 +66,12 @@ var NavigationTest = TestCase("NavigationTest",
editor.navigateTo(0, 0);
editor.gotoLine(11);
assertPosition(11, 0, editor.getCursorPosition());
assertPosition(11, 0, editor.getSelection().getCursor());
assertEquals(0, editor.getFirstVisibleRow());
editor.navigateTo(30, 0);
editor.gotoLine(32);
assertPosition(32, 0, editor.getCursorPosition());
assertPosition(32, 0, editor.getSelection().getCursor());
assertEquals(30, editor.getFirstVisibleRow());
}
});