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

package

Browse source
This commit is contained in:
Fabian Jakobs 2011-12-08 18:51:28 +01:00
commit 5f03c6b48c
7 changed files with 112 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

49
build/demo/kitchen-sink/kitchen-sink-uncompressed.js
View file

@ -5491,19 +5491,31 @@ var Selection = function(session) {
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
var fold; // skip folds
if (fold = this.session.getFoldAt(row, column, 1)) { var fold = this.session.getFoldAt(row, column, 1);
if (fold) {
this.moveCursorTo(fold.end.row, fold.end.column); this.moveCursorTo(fold.end.row, fold.end.column);
return; return;
} else if (column == line.length) {
this.moveCursorRight();
return;
} }
else if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
// first skip space
if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
column += this.session.nonTokenRe.lastIndex; column += this.session.nonTokenRe.lastIndex;
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
rightOfCursor = line.substring(column);
} }
else if (match = this.session.tokenRe.exec(rightOfCursor)) {
// if at line end proceed with next line
if (column >= line.length) {
this.moveCursorTo(row, line.length);
this.moveCursorRight();
if (row < this.doc.getLength() - 1)
this.moveCursorWordRight();
return;
}
// advance to the end of the next token
if (match = this.session.tokenRe.exec(rightOfCursor)) {
column += this.session.tokenRe.lastIndex; column += this.session.tokenRe.lastIndex;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
} }
@ -5515,32 +5527,41 @@ var Selection = function(session) {
var row = this.selectionLead.row; var row = this.selectionLead.row;
var column = this.selectionLead.column; var column = this.selectionLead.column;
// skip folds
var fold; var fold;
if (fold = this.session.getFoldAt(row, column, -1)) { if (fold = this.session.getFoldAt(row, column, -1)) {
this.moveCursorTo(fold.start.row, fold.start.column); this.moveCursorTo(fold.start.row, fold.start.column);
return; return;
} }
if (column == 0) {
this.moveCursorLeft();
return;
}
var str = this.session.getFoldStringAt(row, column, -1); var str = this.session.getFoldStringAt(row, column, -1);
if (str == null) { if (str == null) {
str = this.doc.getLine(row).substring(0, column) str = this.doc.getLine(row).substring(0, column)
} }
var leftOfCursor = lang.stringReverse(str);
var leftOfCursor = lang.stringReverse(str);
var match; var match;
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
// skip whitespace
if (match = this.session.nonTokenRe.exec(leftOfCursor)) { if (match = this.session.nonTokenRe.exec(leftOfCursor)) {
column -= this.session.nonTokenRe.lastIndex; column -= this.session.nonTokenRe.lastIndex;
leftOfCursor = leftOfCursor.slice(this.session.nonTokenRe.lastIndex);
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
} }
else if (match = this.session.tokenRe.exec(leftOfCursor)) {
// if at begin of the line proceed in line above
if (column <= 0) {
this.moveCursorTo(row, 0);
this.moveCursorLeft();
if (row > 0)
this.moveCursorWordLeft();
return;
}
// move to the begin of the word
if (match = this.session.tokenRe.exec(leftOfCursor)) {
column -= this.session.tokenRe.lastIndex; column -= this.session.tokenRe.lastIndex;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
} }

2
build/demo/kitchen-sink/kitchen-sink.js
View file

File diff suppressed because one or more lines are too long

2
build/kitchen-sink.html
View file

@ -11,7 +11,7 @@
Ace Ace
version 0.2.0 version 0.2.0
commit 6a6c4c4c1559f660210131fe83f60eb2beed8091 commit 9cb05c2e56c866be5da702c0d920dd16064d53a0
--> -->

49
build/src/ace-uncompressed.js
View file

@ -7396,19 +7396,31 @@ var Selection = function(session) {
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
var fold; // skip folds
if (fold = this.session.getFoldAt(row, column, 1)) { var fold = this.session.getFoldAt(row, column, 1);
if (fold) {
this.moveCursorTo(fold.end.row, fold.end.column); this.moveCursorTo(fold.end.row, fold.end.column);
return; return;
} else if (column == line.length) {
this.moveCursorRight();
return;
} }
else if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
// first skip space
if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
column += this.session.nonTokenRe.lastIndex; column += this.session.nonTokenRe.lastIndex;
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
rightOfCursor = line.substring(column);
} }
else if (match = this.session.tokenRe.exec(rightOfCursor)) {
// if at line end proceed with next line
if (column >= line.length) {
this.moveCursorTo(row, line.length);
this.moveCursorRight();
if (row < this.doc.getLength() - 1)
this.moveCursorWordRight();
return;
}
// advance to the end of the next token
if (match = this.session.tokenRe.exec(rightOfCursor)) {
column += this.session.tokenRe.lastIndex; column += this.session.tokenRe.lastIndex;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
} }
@ -7420,32 +7432,41 @@ var Selection = function(session) {
var row = this.selectionLead.row; var row = this.selectionLead.row;
var column = this.selectionLead.column; var column = this.selectionLead.column;
// skip folds
var fold; var fold;
if (fold = this.session.getFoldAt(row, column, -1)) { if (fold = this.session.getFoldAt(row, column, -1)) {
this.moveCursorTo(fold.start.row, fold.start.column); this.moveCursorTo(fold.start.row, fold.start.column);
return; return;
} }
if (column == 0) {
this.moveCursorLeft();
return;
}
var str = this.session.getFoldStringAt(row, column, -1); var str = this.session.getFoldStringAt(row, column, -1);
if (str == null) { if (str == null) {
str = this.doc.getLine(row).substring(0, column) str = this.doc.getLine(row).substring(0, column)
} }
var leftOfCursor = lang.stringReverse(str);
var leftOfCursor = lang.stringReverse(str);
var match; var match;
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
// skip whitespace
if (match = this.session.nonTokenRe.exec(leftOfCursor)) { if (match = this.session.nonTokenRe.exec(leftOfCursor)) {
column -= this.session.nonTokenRe.lastIndex; column -= this.session.nonTokenRe.lastIndex;
leftOfCursor = leftOfCursor.slice(this.session.nonTokenRe.lastIndex);
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
} }
else if (match = this.session.tokenRe.exec(leftOfCursor)) {
// if at begin of the line proceed in line above
if (column <= 0) {
this.moveCursorTo(row, 0);
this.moveCursorLeft();
if (row > 0)
this.moveCursorWordLeft();
return;
}
// move to the begin of the word
if (match = this.session.tokenRe.exec(leftOfCursor)) {
column -= this.session.tokenRe.lastIndex; column -= this.session.tokenRe.lastIndex;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
} }

2
build/src/ace.js
View file

File diff suppressed because one or more lines are too long

49
build/textarea/src/ace-uncompressed.js
View file

@ -7390,19 +7390,31 @@ var Selection = function(session) {
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
var fold; // skip folds
if (fold = this.session.getFoldAt(row, column, 1)) { var fold = this.session.getFoldAt(row, column, 1);
if (fold) {
this.moveCursorTo(fold.end.row, fold.end.column); this.moveCursorTo(fold.end.row, fold.end.column);
return; return;
} else if (column == line.length) {
this.moveCursorRight();
return;
} }
else if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
// first skip space
if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
column += this.session.nonTokenRe.lastIndex; column += this.session.nonTokenRe.lastIndex;
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
rightOfCursor = line.substring(column);
} }
else if (match = this.session.tokenRe.exec(rightOfCursor)) {
// if at line end proceed with next line
if (column >= line.length) {
this.moveCursorTo(row, line.length);
this.moveCursorRight();
if (row < this.doc.getLength() - 1)
this.moveCursorWordRight();
return;
}
// advance to the end of the next token
if (match = this.session.tokenRe.exec(rightOfCursor)) {
column += this.session.tokenRe.lastIndex; column += this.session.tokenRe.lastIndex;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
} }
@ -7414,32 +7426,41 @@ var Selection = function(session) {
var row = this.selectionLead.row; var row = this.selectionLead.row;
var column = this.selectionLead.column; var column = this.selectionLead.column;
// skip folds
var fold; var fold;
if (fold = this.session.getFoldAt(row, column, -1)) { if (fold = this.session.getFoldAt(row, column, -1)) {
this.moveCursorTo(fold.start.row, fold.start.column); this.moveCursorTo(fold.start.row, fold.start.column);
return; return;
} }
if (column == 0) {
this.moveCursorLeft();
return;
}
var str = this.session.getFoldStringAt(row, column, -1); var str = this.session.getFoldStringAt(row, column, -1);
if (str == null) { if (str == null) {
str = this.doc.getLine(row).substring(0, column) str = this.doc.getLine(row).substring(0, column)
} }
var leftOfCursor = lang.stringReverse(str);
var leftOfCursor = lang.stringReverse(str);
var match; var match;
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
// skip whitespace
if (match = this.session.nonTokenRe.exec(leftOfCursor)) { if (match = this.session.nonTokenRe.exec(leftOfCursor)) {
column -= this.session.nonTokenRe.lastIndex; column -= this.session.nonTokenRe.lastIndex;
leftOfCursor = leftOfCursor.slice(this.session.nonTokenRe.lastIndex);
this.session.nonTokenRe.lastIndex = 0; this.session.nonTokenRe.lastIndex = 0;
} }
else if (match = this.session.tokenRe.exec(leftOfCursor)) {
// if at begin of the line proceed in line above
if (column <= 0) {
this.moveCursorTo(row, 0);
this.moveCursorLeft();
if (row > 0)
this.moveCursorWordLeft();
return;
}
// move to the begin of the word
if (match = this.session.tokenRe.exec(leftOfCursor)) {
column -= this.session.tokenRe.lastIndex; column -= this.session.tokenRe.lastIndex;
this.session.tokenRe.lastIndex = 0; this.session.tokenRe.lastIndex = 0;
} }

2
build/textarea/src/ace.js
View file

File diff suppressed because one or more lines are too long