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

Ensure there is always at least one line if a empty document is created

Browse source
This commit is contained in:
Julian Viereck 2011-02-06 19:18:14 +08:00 • committed by Fabian Jakobs
commit 3b29651731
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/ace/document.js
View file

@ -46,6 +46,11 @@ var Document = function(text) {
if (Array.isArray(text)) { if (Array.isArray(text)) {
this.insertLines(0, text); this.insertLines(0, text);
}
// There has to be one line at least in the document. If you pass an empty
// string to the insert function, nothing will happen. Workaround.
else if (text.length == 0) {
this.$lines = [""];
} else { } else {
this.insert({row: 0, column:0}, text); this.insert({row: 0, column:0}, text);
} }
@ -57,7 +62,7 @@ var Document = function(text) {
this.setValue = function(text) { this.setValue = function(text) {
var len = this.getLength(); var len = this.getLength();
this.remove(new Range(0, 0, len, this.getLine(len-1).length)); this.remove(new Range(0, 0, len, this.getLine(len-1).length));
this.insert({row: 0, column:0}, text); this.insert({row: 0, column:0}, text);
}; };
@ -262,16 +267,16 @@ var Document = function(text) {
var firstRow = range.start.row; var firstRow = range.start.row;
var lastRow = range.end.row; var lastRow = range.end.row;
if (range.isMultiLine()) { if (range.isMultiLine()) {
var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1; var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
var lastFullRow = lastRow - 1; var lastFullRow = lastRow - 1;
if (range.end.column > 0) if (range.end.column > 0)
this.removeInLine(lastRow, 0, range.end.column); this.removeInLine(lastRow, 0, range.end.column);
if (lastFullRow >= firstFullRow) if (lastFullRow >= firstFullRow)
this.removeLines(firstFullRow, lastFullRow); this.removeLines(firstFullRow, lastFullRow);
if (firstFullRow != firstRow) { if (firstFullRow != firstRow) {
this.removeInLine(firstRow, range.start.column, this.$lines[firstRow].length); this.removeInLine(firstRow, range.start.column, this.$lines[firstRow].length);
this.removeNewLine(range.start.row); this.removeNewLine(range.start.row);

13
lib/ace/test/document_test.js
View file

@ -279,19 +279,24 @@ var Test = {
doc.replace(new Range(0, 0, 2, 1), ["4", "5", "6"].join("\n")); doc.replace(new Range(0, 0, 2, 1), ["4", "5", "6"].join("\n"));
assert.equal(["4", "5", "6"].join("\n"), doc.getValue()); assert.equal(["4", "5", "6"].join("\n"), doc.getValue());
}, },
"test: set value": function() { "test: set value": function() {
var doc = new Document("1"); var doc = new Document("1");
assert.equal("1", doc.getValue()); assert.equal("1", doc.getValue());
doc.setValue(doc.getValue()); doc.setValue(doc.getValue());
assert.equal("1", doc.getValue()); assert.equal("1", doc.getValue());
var doc = new Document("1\n2"); var doc = new Document("1\n2");
assert.equal("1\n2", doc.getValue()); assert.equal("1\n2", doc.getValue());
doc.setValue(doc.getValue()); doc.setValue(doc.getValue());
assert.equal("1\n2", doc.getValue()); assert.equal("1\n2", doc.getValue());
},
"test: empty document has to contain one line": function() {
var doc = new Document("");
assert.equal(doc.$lines.length, 1);
} }
}; };