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

Merge pull request #2088 from ajaxorg/misc

Browse source 
Code cleanup + minor fixes
This commit is contained in:
Lennart Kats 2014-08-10 11:24:41 +02:00
commit 2fda9268f3
12 changed files with 146 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/ace/autocomplete/popup.js
View file

@ -52,6 +52,7 @@ var $singleLineEditor = function(el) {
editor.renderer.setHighlightGutterLine(false); editor.renderer.setHighlightGutterLine(false);
editor.$mouseHandler.$focusWaitTimout = 0; editor.$mouseHandler.$focusWaitTimout = 0;
editor.$highlightTagPending = true;
return editor; return editor;
}; };
@ -103,7 +104,7 @@ var AcePopup = function(parentNode) {
popup.session.removeMarker(hoverMarker.id); popup.session.removeMarker(hoverMarker.id);
hoverMarker.id = null; hoverMarker.id = null;
} }
} };
popup.setSelectOnHover(false); popup.setSelectOnHover(false);
popup.on("mousemove", function(e) { popup.on("mousemove", function(e) {
if (!lastMouseEvent) { if (!lastMouseEvent) {
@ -171,8 +172,8 @@ var AcePopup = function(parentNode) {
}; };
var bgTokenizer = popup.session.bgTokenizer; var bgTokenizer = popup.session.bgTokenizer;
bgTokenizer.$tokenizeRow = function(i) { bgTokenizer.$tokenizeRow = function(row) {
var data = popup.data[i]; var data = popup.data[row];
var tokens = []; var tokens = [];
if (!data) if (!data)
return tokens; return tokens;
@ -206,7 +207,7 @@ var AcePopup = function(parentNode) {
popup.session.$computeWidth = function() { popup.session.$computeWidth = function() {
return this.screenWidth = 0; return this.screenWidth = 0;
} };
// public // public
popup.isOpen = false; popup.isOpen = false;

10
lib/ace/edit_session.js
View file

@ -950,6 +950,9 @@ var EditSession = function(text, mode) {
if (!$isPlaceholder) { if (!$isPlaceholder) {
// experimental method, used by c9 findiniles
if (mode.attachToSession)
mode.attachToSession(this);
this.$options.wrapMethod.set.call(this, this.$wrapMethod); this.$options.wrapMethod.set.call(this, this.$wrapMethod);
this.$setFolding(mode.foldingRules); this.$setFolding(mode.foldingRules);
this.bgTokenizer.start(0); this.bgTokenizer.start(0);
@ -1731,9 +1734,10 @@ var EditSession = function(text, mode) {
// Inside of the foldLine range. Need to split stuff up. // Inside of the foldLine range. Need to split stuff up.
if (cmp == 0) { if (cmp == 0) {
foldLine = foldLine.split(start.row, start.column); foldLine = foldLine.split(start.row, start.column);
foldLine.shiftRow(len); if (foldLine) {
foldLine.addRemoveChars( foldLine.shiftRow(len);
lastRow, 0, end.column - start.column); foldLine.addRemoveChars(lastRow, 0, end.column - start.column);
}
} else } else
// Infront of the foldLine but same row. Need to shift column. // Infront of the foldLine but same row. Need to shift column.
if (cmp == -1) { if (cmp == -1) {

53
lib/ace/edit_session/fold_line.js
View file

@ -44,7 +44,7 @@ function FoldLine(foldData, folds) {
folds = this.folds = [ folds ]; folds = this.folds = [ folds ];
} }
var last = folds[folds.length - 1] var last = folds[folds.length - 1];
this.range = new Range(folds[0].start.row, folds[0].start.column, this.range = new Range(folds[0].start.row, folds[0].start.column,
last.end.row, last.end.column); last.end.row, last.end.column);
this.start = this.range.start; this.start = this.range.start;
@ -66,7 +66,7 @@ function FoldLine(foldData, folds) {
fold.start.row += shift; fold.start.row += shift;
fold.end.row += shift; fold.end.row += shift;
}); });
} };
this.addFold = function(fold) { this.addFold = function(fold) {
if (fold.sameRow) { if (fold.sameRow) {
@ -96,17 +96,17 @@ function FoldLine(foldData, folds) {
throw new Error("Trying to add fold to FoldRow that doesn't have a matching row"); throw new Error("Trying to add fold to FoldRow that doesn't have a matching row");
} }
fold.foldLine = this; fold.foldLine = this;
} };
this.containsRow = function(row) { this.containsRow = function(row) {
return row >= this.start.row && row <= this.end.row; return row >= this.start.row && row <= this.end.row;
} };
this.walk = function(callback, endRow, endColumn) { this.walk = function(callback, endRow, endColumn) {
var lastEnd = 0, var lastEnd = 0,
folds = this.folds, folds = this.folds,
fold, fold,
comp, stop, isNewRow = true; cmp, stop, isNewRow = true;
if (endRow == null) { if (endRow == null) {
endRow = this.end.row; endRow = this.end.row;
@ -116,9 +116,9 @@ function FoldLine(foldData, folds) {
for (var i = 0; i < folds.length; i++) { for (var i = 0; i < folds.length; i++) {
fold = folds[i]; fold = folds[i];
comp = fold.range.compareStart(endRow, endColumn); cmp = fold.range.compareStart(endRow, endColumn);
// This fold is after the endRow/Column. // This fold is after the endRow/Column.
if (comp == -1) { if (cmp == -1) {
callback(null, endRow, endColumn, lastEnd, isNewRow); callback(null, endRow, endColumn, lastEnd, isNewRow);
return; return;
} }
@ -127,8 +127,8 @@ function FoldLine(foldData, folds) {
stop = !stop && callback(fold.placeholder, fold.start.row, fold.start.column, lastEnd); stop = !stop && callback(fold.placeholder, fold.start.row, fold.start.column, lastEnd);
// If the user requested to stop the walk or endRow/endColumn is // If the user requested to stop the walk or endRow/endColumn is
// inside of this fold (comp == 0), then end here. // inside of this fold (cmp == 0), then end here.
if (stop || comp == 0) { if (stop || cmp === 0) {
return; return;
} }
@ -138,7 +138,7 @@ function FoldLine(foldData, folds) {
lastEnd = fold.end.column; lastEnd = fold.end.column;
} }
callback(null, endRow, endColumn, lastEnd, isNewRow); callback(null, endRow, endColumn, lastEnd, isNewRow);
} };
this.getNextFoldTo = function(row, column) { this.getNextFoldTo = function(row, column) {
var fold, cmp; var fold, cmp;
@ -150,15 +150,15 @@ function FoldLine(foldData, folds) {
fold: fold, fold: fold,
kind: "after" kind: "after"
}; };
} else if (cmp == 0) { } else if (cmp === 0) {
return { return {
fold: fold, fold: fold,
kind: "inside" kind: "inside"
} };
} }
} }
return null; return null;
} };
this.addRemoveChars = function(row, column, len) { this.addRemoveChars = function(row, column, len) {
var ret = this.getNextFoldTo(row, column), var ret = this.getNextFoldTo(row, column),
@ -175,7 +175,7 @@ function FoldLine(foldData, folds) {
} else if (fold.start.row == row) { } else if (fold.start.row == row) {
folds = this.folds; folds = this.folds;
var i = folds.indexOf(fold); var i = folds.indexOf(fold);
if (i == 0) { if (i === 0) {
this.start.column += len; this.start.column += len;
} }
for (i; i < folds.length; i++) { for (i; i < folds.length; i++) {
@ -189,16 +189,18 @@ function FoldLine(foldData, folds) {
this.end.column += len; this.end.column += len;
} }
} }
} };
this.split = function(row, column) { this.split = function(row, column) {
var fold = this.getNextFoldTo(row, column).fold; var pos = this.getNextFoldTo(row, column);
if (!pos || pos.kind == "inside")
return null;
var fold = pos.fold;
var folds = this.folds; var folds = this.folds;
var foldData = this.foldData; var foldData = this.foldData;
if (!fold)
return null;
var i = folds.indexOf(fold); var i = folds.indexOf(fold);
var foldBefore = folds[i - 1]; var foldBefore = folds[i - 1];
this.end.row = foldBefore.end.row; this.end.row = foldBefore.end.row;
@ -211,7 +213,7 @@ function FoldLine(foldData, folds) {
var newFoldLine = new FoldLine(foldData, folds); var newFoldLine = new FoldLine(foldData, folds);
foldData.splice(foldData.indexOf(this) + 1, 0, newFoldLine); foldData.splice(foldData.indexOf(this) + 1, 0, newFoldLine);
return newFoldLine; return newFoldLine;
} };
this.merge = function(foldLineNext) { this.merge = function(foldLineNext) {
var folds = foldLineNext.folds; var folds = foldLineNext.folds;
@ -222,7 +224,7 @@ function FoldLine(foldData, folds) {
// it's merged now with foldLineNext. // it's merged now with foldLineNext.
var foldData = this.foldData; var foldData = this.foldData;
foldData.splice(foldData.indexOf(foldLineNext), 1); foldData.splice(foldData.indexOf(foldLineNext), 1);
} };
this.toString = function() { this.toString = function() {
var ret = [this.range.toString() + ": [" ]; var ret = [this.range.toString() + ": [" ];
@ -230,13 +232,12 @@ function FoldLine(foldData, folds) {
this.folds.forEach(function(fold) { this.folds.forEach(function(fold) {
ret.push(" " + fold.toString()); ret.push(" " + fold.toString());
}); });
ret.push("]") ret.push("]");
return ret.join("\n"); return ret.join("\n");
} };
this.idxToPosition = function(idx) { this.idxToPosition = function(idx) {
var lastFoldEndColumn = 0; var lastFoldEndColumn = 0;
var fold;
for (var i = 0; i < this.folds.length; i++) { for (var i = 0; i < this.folds.length; i++) {
var fold = this.folds[i]; var fold = this.folds[i];
@ -261,7 +262,7 @@ function FoldLine(foldData, folds) {
row: this.end.row, row: this.end.row,
column: this.end.column + idx column: this.end.column + idx
}; };
} };
}).call(FoldLine.prototype); }).call(FoldLine.prototype);
exports.FoldLine = FoldLine; exports.FoldLine = FoldLine;

115
lib/ace/editor.js
View file

@ -521,25 +521,23 @@ var Editor = function(renderer, session) {
this.$highlightPending = true; this.$highlightPending = true;
setTimeout(function() { setTimeout(function() {
self.$highlightPending = false; self.$highlightPending = false;
var session = self.session;
var pos = self.session.findMatchingBracket(self.getCursorPosition()); if (!session || !session.bgTokenizer) return;
var pos = session.findMatchingBracket(self.getCursorPosition());
if (pos) { if (pos) {
var range = new Range(pos.row, pos.column, pos.row, pos.column+1); var range = new Range(pos.row, pos.column, pos.row, pos.column + 1);
} else if (self.session.$mode.getMatching) { } else if (session.$mode.getMatching) {
var range = self.session.$mode.getMatching(self.session); var range = session.$mode.getMatching(self.session);
} }
if (range) if (range)
self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket", "text"); session.$bracketHighlight = session.addMarker(range, "ace_bracket", "text");
}, 50); }, 50);
}; };
// todo: move to mode.getMatching // todo: move to mode.getMatching
this.$highlightTags = function() { this.$highlightTags = function() {
var session = this.session; if (this.$highlightTagPending)
if (this.$highlightTagPending) {
return; return;
}
// perform highlight async to not block the browser during navigation // perform highlight async to not block the browser during navigation
var self = this; var self = this;
@ -547,6 +545,9 @@ var Editor = function(renderer, session) {
setTimeout(function() { setTimeout(function() {
self.$highlightTagPending = false; self.$highlightTagPending = false;
var session = self.session;
if (!session || !session.bgTokenizer) return;
var pos = self.getCursorPosition(); var pos = self.getCursorPosition();
var iterator = new TokenIterator(self.session, pos.row, pos.column); var iterator = new TokenIterator(self.session, pos.row, pos.column);
var token = iterator.getCurrentToken(); var token = iterator.getCurrentToken();
@ -568,28 +569,28 @@ var Editor = function(renderer, session) {
token = iterator.stepForward(); token = iterator.stepForward();
if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) { if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) {
if (prevToken.value==='<'){ if (prevToken.value === '<'){
depth++; depth++;
} else if (prevToken.value==='</'){ } else if (prevToken.value === '</'){
depth--; depth--;
} }
} }
} while (token && depth>=0); } while (token && depth >= 0);
}else{ } else {
//find opening tag //find opening tag
do { do {
token = prevToken; token = prevToken;
prevToken = iterator.stepBackward(); prevToken = iterator.stepBackward();
if(token && token.value === tag && token.type.indexOf('tag-name') !== -1) { if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) {
if (prevToken.value==='<') { if (prevToken.value === '<') {
depth++; depth++;
} else if( prevToken.value==='</') { } else if (prevToken.value === '</') {
depth--; depth--;
} }
} }
} while (prevToken && depth<=0); } while (prevToken && depth <= 0);
//select tag again //select tag again
iterator.stepForward(); iterator.stepForward();
@ -2012,17 +2013,13 @@ var Editor = function(renderer, session) {
* Moves the cursor's row and column to the next matching bracket or HTML tag. * Moves the cursor's row and column to the next matching bracket or HTML tag.
* *
**/ **/
this.jumpToMatching = function(select) { this.jumpToMatching = function(select, expand) {
var cursor = this.getCursorPosition(); var cursor = this.getCursorPosition();
var iterator = new TokenIterator(this.session, cursor.row, cursor.column); var iterator = new TokenIterator(this.session, cursor.row, cursor.column);
var prevToken = iterator.getCurrentToken(); var prevToken = iterator.getCurrentToken();
var token = prevToken; var token = prevToken || iterator.stepForward();
if (!token) if (!token) return;
token = iterator.stepForward();
if (!token)
return;
//get next closing tag or bracket //get next closing tag or bracket
var matchType; var matchType;
@ -2041,12 +2038,12 @@ var Editor = function(renderer, session) {
do { do {
if (token.value.match(/[{}()\[\]]/g)) { if (token.value.match(/[{}()\[\]]/g)) {
for (; i<token.value.length && !found; i++) { for (; i < token.value.length && !found; i++) {
if (!brackets[token.value[i]]) { if (!brackets[token.value[i]]) {
continue; continue;
} }
bracketType = brackets[token.value[i]]+'.'+token.type.replace("rparen", "lparen"); bracketType = brackets[token.value[i]] + '.' + token.type.replace("rparen", "lparen");
if (isNaN(depth[bracketType])) { if (isNaN(depth[bracketType])) {
depth[bracketType] = 0; depth[bracketType] = 0;
@ -2057,27 +2054,29 @@ var Editor = function(renderer, session) {
case '[': case '[':
case '{': case '{':
depth[bracketType]++; depth[bracketType]++;
break; break;
case ')': case ')':
case ']': case ']':
case '}': case '}':
depth[bracketType]--; depth[bracketType]--;
if (depth[bracketType]===-1) { if (depth[bracketType] === -1) {
matchType = 'bracket'; matchType = 'bracket';
found = true; found = true;
} }
break; break;
} }
} }
} else if (token && token.type.indexOf('tag-name') !== -1) { }
else if (token && token.type.indexOf('tag-name') !== -1) {
if (isNaN(depth[token.value])) { if (isNaN(depth[token.value])) {
depth[token.value] = 0; depth[token.value] = 0;
} }
if (prevToken.value === '<') { if (prevToken.value === '<') {
depth[token.value]++; depth[token.value]++;
} else if (prevToken.value === '</') { }
else if (prevToken.value === '</') {
depth[token.value]--; depth[token.value]--;
} }
@ -2095,37 +2094,35 @@ var Editor = function(renderer, session) {
} while (token && !found); } while (token && !found);
//no match found //no match found
if (!matchType) { if (!matchType)
return; return;
}
var range; var range, pos;
if (matchType==='bracket') { if (matchType === 'bracket') {
range = this.session.getBracketRange(cursor); range = this.session.getBracketRange(cursor);
if (!range) { if (!range) {
range = new Range( range = new Range(
iterator.getCurrentTokenRow(), iterator.getCurrentTokenRow(),
iterator.getCurrentTokenColumn()+i-1, iterator.getCurrentTokenColumn() + i - 1,
iterator.getCurrentTokenRow(), iterator.getCurrentTokenRow(),
iterator.getCurrentTokenColumn()+i-1 iterator.getCurrentTokenColumn() + i - 1
); );
if (!range) pos = range.start;
return; if (expand || pos.row === cursor.row && Math.abs(pos.column - cursor.column) < 2)
var pos = range.start;
if (pos.row === cursor.row && Math.abs(pos.column - cursor.column) < 2)
range = this.session.getBracketRange(pos); range = this.session.getBracketRange(pos);
} }
} else if(matchType==='tag') { }
if (token && token.type.indexOf('tag-name') !== -1) else if (matchType === 'tag') {
if (token && token.type.indexOf('tag-name') !== -1)
var tag = token.value; var tag = token.value;
else else
return; return;
var range = new Range( range = new Range(
iterator.getCurrentTokenRow(), iterator.getCurrentTokenRow(),
iterator.getCurrentTokenColumn()-2, iterator.getCurrentTokenColumn() - 2,
iterator.getCurrentTokenRow(), iterator.getCurrentTokenRow(),
iterator.getCurrentTokenColumn()-2 iterator.getCurrentTokenColumn() - 2
); );
//find matching tag //find matching tag
@ -2137,17 +2134,18 @@ var Editor = function(renderer, session) {
if (prevToken) { if (prevToken) {
if (prevToken.type.indexOf('tag-close') !== -1) { if (prevToken.type.indexOf('tag-close') !== -1) {
range.setEnd(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn()+1); range.setEnd(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn() + 1);
} }
if (token.value === tag && token.type.indexOf('tag-name') !== -1) { if (token.value === tag && token.type.indexOf('tag-name') !== -1) {
if (prevToken.value === '<') { if (prevToken.value === '<') {
depth[tag]++; depth[tag]++;
} else if ( prevToken.value === '</') { }
else if (prevToken.value === '</') {
depth[tag]--; depth[tag]--;
} }
if (depth[tag]===0) if (depth[tag] === 0)
found = true; found = true;
} }
} }
@ -2156,7 +2154,7 @@ var Editor = function(renderer, session) {
//we found it //we found it
if (token && token.type.indexOf('tag-name')) { if (token && token.type.indexOf('tag-name')) {
var pos = range.start; pos = range.start;
if (pos.row == cursor.row && Math.abs(pos.column - cursor.column) < 2) if (pos.row == cursor.row && Math.abs(pos.column - cursor.column) < 2)
pos = range.end; pos = range.end;
} }
@ -2165,10 +2163,13 @@ var Editor = function(renderer, session) {
pos = range && range.cursor || pos; pos = range && range.cursor || pos;
if (pos) { if (pos) {
if (select) { if (select) {
if (range && range.isEqual(this.getSelectionRange())) if (range && expand) {
this.selection.setRange(range);
} else if (range && range.isEqual(this.getSelectionRange())) {
this.clearSelection(); this.clearSelection();
else } else {
this.selection.selectTo(pos.row, pos.column); this.selection.selectTo(pos.row, pos.column);
}
} else { } else {
this.selection.moveTo(pos.row, pos.column); this.selection.moveTo(pos.row, pos.column);
} }

9
lib/ace/ext/whitespace.js
View file

@ -76,11 +76,14 @@ exports.$detectIndentation = function(lines, fallback) {
var first = {score: 0, length: 0}; var first = {score: 0, length: 0};
var spaceIndents = 0; var spaceIndents = 0;
for (var i = 1; i < 12; i++) { for (var i = 1; i < 12; i++) {
var score = getScore(i);
if (i == 1) { if (i == 1) {
spaceIndents = getScore(i); spaceIndents = score;
var score = stats.length && 1; score = stats[1] ? 0.9 : 0.8;
if (!stats.length)
score = 0
} else } else
var score = getScore(i) / spaceIndents; score /= spaceIndents;
if (changes[i]) if (changes[i])
score += changes[i] / changesTotal; score += changes[i] / changesTotal;

10
lib/ace/keyboard/vim/maps/motions.js
View file

@ -426,7 +426,7 @@ module.exports = {
var column = util.getRightNthChar(editor, cursor, param, count || 1); var column = util.getRightNthChar(editor, cursor, param, count || 1);
if (isRepeat && column == 0 && !(count > 1)) if (isRepeat && column == 0 && !(count > 1))
var column = util.getRightNthChar(editor, cursor, param, 2); column = util.getRightNthChar(editor, cursor, param, 2);
if (typeof column === "number") { if (typeof column === "number") {
cursor.column += column + (isSel ? 1 : 0); cursor.column += column + (isSel ? 1 : 0);
@ -444,8 +444,8 @@ module.exports = {
var cursor = editor.getCursorPosition(); var cursor = editor.getCursorPosition();
var column = util.getLeftNthChar(editor, cursor, param, count || 1); var column = util.getLeftNthChar(editor, cursor, param, count || 1);
if (isRepeat && column == 0 && !(count > 1)) if (isRepeat && column === 0 && !(count > 1))
var column = util.getLeftNthChar(editor, cursor, param, 2); column = util.getLeftNthChar(editor, cursor, param, 2);
if (typeof column === "number") { if (typeof column === "number") {
cursor.column -= column; cursor.column -= column;
@ -558,7 +558,7 @@ module.exports = {
content += "\n"; content += "\n";
if (content.length) { if (content.length) {
editor.navigateLineEnd() editor.navigateLineEnd();
editor.insert(content); editor.insert(content);
util.insertMode(editor); util.insertMode(editor);
} }
@ -575,7 +575,7 @@ module.exports = {
if (content.length) { if (content.length) {
if(row > 0) { if(row > 0) {
editor.navigateUp(); editor.navigateUp();
editor.navigateLineEnd() editor.navigateLineEnd();
editor.insert(content); editor.insert(content);
} else { } else {
editor.session.insert({row: 0, column: 0}, content); editor.session.insert({row: 0, column: 0}, content);

2
lib/ace/lib/dom.js
View file

@ -49,7 +49,7 @@ exports.createElement = function(tag, ns) {
}; };
exports.hasCssClass = function(el, name) { exports.hasCssClass = function(el, name) {
var classes = el.className.split(/\s+/g); var classes = (el.className || "").split(/\s+/g);
return classes.indexOf(name) !== -1; return classes.indexOf(name) !== -1;
}; };

6
lib/ace/multi_select.js
View file

@ -690,7 +690,7 @@ var Editor = require("./editor").Editor;
* @param {Boolean} skip If `true`, removes the active selection range * @param {Boolean} skip If `true`, removes the active selection range
* @method Editor.selectMore * @method Editor.selectMore
**/ **/
this.selectMore = function(dir, skip) { this.selectMore = function(dir, skip, stopAtFirst) {
var session = this.session; var session = this.session;
var sel = session.multiSelect; var sel = session.multiSelect;
@ -699,8 +699,8 @@ var Editor = require("./editor").Editor;
range = session.getWordRange(range.start.row, range.start.column); range = session.getWordRange(range.start.row, range.start.column);
range.cursor = dir == -1 ? range.start : range.end; range.cursor = dir == -1 ? range.start : range.end;
this.multiSelect.addRange(range); this.multiSelect.addRange(range);
// todo add option for sublime like behavior if (stopAtFirst)
// return; return;
} }
var needle = session.getTextRange(range); var needle = session.getTextRange(range);

13
lib/ace/placeholder.js
View file

@ -37,7 +37,6 @@ var oop = require("./lib/oop");
/** /**
* @class PlaceHolder * @class PlaceHolder
* *
*
**/ **/
/** /**
@ -47,7 +46,6 @@ var oop = require("./lib/oop");
* - others (String): * - others (String):
* - mainClass (String): * - mainClass (String):
* - othersClass (String): * - othersClass (String):
*
* *
* @constructor * @constructor
**/ **/
@ -93,6 +91,10 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
var doc = this.doc; var doc = this.doc;
var session = this.session; var session = this.session;
var pos = this.$pos; var pos = this.$pos;
this.selectionBefore = session.selection.toJSON();
if (session.selection.inMultiSelectMode)
session.selection.toSingleRange();
this.pos = doc.createAnchor(pos.row, pos.column); this.pos = doc.createAnchor(pos.row, pos.column);
this.markerId = session.addMarker(new Range(pos.row, pos.column, pos.row, pos.column + this.length), this.mainClass, null, false); this.markerId = session.addMarker(new Range(pos.row, pos.column, pos.row, pos.column + this.length), this.mainClass, null, false);
@ -218,9 +220,9 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
**/ **/
this.onCursorChange = function(event) { this.onCursorChange = function(event) {
if (this.$updating) return; if (this.$updating || !this.session) return;
var pos = this.session.selection.getCursor(); var pos = this.session.selection.getCursor();
if(pos.row === this.pos.row && pos.column >= this.pos.column && pos.column <= this.pos.column + this.length) { if (pos.row === this.pos.row && pos.column >= this.pos.column && pos.column <= this.pos.column + this.length) {
this.showOtherMarkers(); this.showOtherMarkers();
this._emit("cursorEnter", event); this._emit("cursorEnter", event);
} else { } else {
@ -245,6 +247,7 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
this.others[i].detach(); this.others[i].detach();
} }
this.session.setUndoSelect(true); this.session.setUndoSelect(true);
this.session = null;
}; };
/** /**
@ -261,6 +264,8 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
for (var i = 0; i < undosRequired; i++) { for (var i = 0; i < undosRequired; i++) {
undoManager.undo(true); undoManager.undo(true);
} }
if (this.selectionBefore)
this.session.selection.fromJSON(this.selectionBefore);
}; };
}).call(PlaceHolder.prototype); }).call(PlaceHolder.prototype);

36
lib/ace/selection.js
View file

@ -143,7 +143,7 @@ var Selection = function(session) {
**/ **/
this.getSelectionAnchor = function() { this.getSelectionAnchor = function() {
if (this.$isEmpty) if (this.$isEmpty)
return this.getSelectionLead() return this.getSelectionLead();
else else
return this.anchor.getPosition(); return this.anchor.getPosition();
}; };
@ -168,7 +168,7 @@ var Selection = function(session) {
if (this.$isEmpty) { if (this.$isEmpty) {
this.moveCursorTo(this.lead.row, this.lead.column + columns); this.moveCursorTo(this.lead.row, this.lead.column + columns);
return; return;
}; }
var anchor = this.getSelectionAnchor(); var anchor = this.getSelectionAnchor();
var lead = this.getSelectionLead(); var lead = this.getSelectionLead();
@ -474,7 +474,7 @@ var Selection = function(session) {
if (fold = this.session.getFoldAt(cursor.row, cursor.column, -1)) { if (fold = this.session.getFoldAt(cursor.row, cursor.column, -1)) {
this.moveCursorTo(fold.start.row, fold.start.column); this.moveCursorTo(fold.start.row, fold.start.column);
} else if (cursor.column == 0) { } else if (cursor.column === 0) {
// cursor is a line (start // cursor is a line (start
if (cursor.row > 0) { if (cursor.row > 0) {
this.moveCursorTo(cursor.row - 1, this.doc.getLine(cursor.row - 1).length); this.moveCursorTo(cursor.row - 1, this.doc.getLine(cursor.row - 1).length);
@ -639,7 +639,7 @@ var Selection = function(session) {
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);
@ -691,13 +691,13 @@ var Selection = function(session) {
index ++; index ++;
if (whitespaceRe.test(ch)) { if (whitespaceRe.test(ch)) {
if (index > 2) { if (index > 2) {
index-- index--;
break; break;
} else { } else {
while ((ch = rightOfCursor[index]) && whitespaceRe.test(ch)) while ((ch = rightOfCursor[index]) && whitespaceRe.test(ch))
index ++; index ++;
if (index > 2) if (index > 2)
break break;
} }
} }
} }
@ -722,11 +722,11 @@ var Selection = function(session) {
var l = this.doc.getLength(); var l = this.doc.getLength();
do { do {
row++; row++;
rightOfCursor = this.doc.getLine(row) rightOfCursor = this.doc.getLine(row);
} while (row < l && /^\s*$/.test(rightOfCursor)) } while (row < l && /^\s*$/.test(rightOfCursor));
if (!/^\s+/.test(rightOfCursor)) if (!/^\s+/.test(rightOfCursor))
rightOfCursor = "" rightOfCursor = "";
column = 0; column = 0;
} }
@ -744,15 +744,15 @@ var Selection = function(session) {
return this.moveCursorTo(fold.start.row, fold.start.column); return this.moveCursorTo(fold.start.row, fold.start.column);
var line = this.session.getLine(row).substring(0, column); var line = this.session.getLine(row).substring(0, column);
if (column == 0) { if (column === 0) {
do { do {
row--; row--;
line = this.doc.getLine(row); line = this.doc.getLine(row);
} while (row > 0 && /^\s*$/.test(line)) } while (row > 0 && /^\s*$/.test(line));
column = line.length; column = line.length;
if (!/\s+$/.test(line)) if (!/\s+$/.test(line))
line = "" line = "";
} }
var leftOfCursor = lang.stringReverse(line); var leftOfCursor = lang.stringReverse(line);
@ -859,12 +859,12 @@ var Selection = function(session) {
this.lead.detach(); this.lead.detach();
this.anchor.detach(); this.anchor.detach();
this.session = this.doc = null; this.session = this.doc = null;
} };
this.fromOrientedRange = function(range) { this.fromOrientedRange = function(range) {
this.setSelectionRange(range, range.cursor == range.start); this.setSelectionRange(range, range.cursor == range.start);
this.$desiredColumn = range.desiredColumn || this.$desiredColumn; this.$desiredColumn = range.desiredColumn || this.$desiredColumn;
} };
this.toOrientedRange = function(range) { this.toOrientedRange = function(range) {
var r = this.getRange(); var r = this.getRange();
@ -880,7 +880,7 @@ var Selection = function(session) {
range.cursor = this.isBackwards() ? range.start : range.end; range.cursor = this.isBackwards() ? range.start : range.end;
range.desiredColumn = this.$desiredColumn; range.desiredColumn = this.$desiredColumn;
return range; return range;
} };
/** /**
* Saves the current cursor position and calls `func` that can change the cursor * Saves the current cursor position and calls `func` that can change the cursor
@ -901,7 +901,7 @@ var Selection = function(session) {
} finally { } finally {
this.moveCursorToPosition(start); this.moveCursorToPosition(start);
} }
} };
this.toJSON = function() { this.toJSON = function() {
if (this.rangeCount) { if (this.rangeCount) {
@ -944,10 +944,10 @@ var Selection = function(session) {
for (var i = this.ranges.length; i--; ) { for (var i = this.ranges.length; i--; ) {
if (!this.ranges[i].isEqual(data[i])) if (!this.ranges[i].isEqual(data[i]))
return false return false;
} }
return true; return true;
} };
}).call(Selection.prototype); }).call(Selection.prototype);

6
lib/ace/snippets.js
View file

@ -497,6 +497,10 @@ var SnippetManager = function() {
var snippetMap = this.snippetMap; var snippetMap = this.snippetMap;
var snippetNameMap = this.snippetNameMap; var snippetNameMap = this.snippetNameMap;
var self = this; var self = this;
if (!snippets)
snippets = [];
function wrapRegexp(src) { function wrapRegexp(src) {
if (src && !/^\^?\(.*\)\$?$|^\\b$/.test(src)) if (src && !/^\^?\(.*\)\$?$|^\\b$/.test(src))
src = "(?:" + src + ")"; src = "(?:" + src + ")";
@ -549,7 +553,7 @@ var SnippetManager = function() {
s.endTriggerRe = new RegExp(s.endTrigger, "", true); s.endTriggerRe = new RegExp(s.endTrigger, "", true);
} }
if (snippets.content) if (snippets && snippets.content)
addSnippet(snippets); addSnippet(snippets);
else if (Array.isArray(snippets)) else if (Array.isArray(snippets))
snippets.forEach(addSnippet); snippets.forEach(addSnippet);

2
lib/ace/virtual_renderer.js
View file

@ -914,6 +914,8 @@ var VirtualRenderer = function(container, theme) {
this.$updateCachedSize(true, this.$gutterWidth, w, desiredHeight); this.$updateCachedSize(true, this.$gutterWidth, w, desiredHeight);
// this.$loop.changes = 0; // this.$loop.changes = 0;
this.desiredHeight = desiredHeight; this.desiredHeight = desiredHeight;
this._signal("autosize");
} }
}; };