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

cleanup

Browse source
This commit is contained in:
nightwing 2013-02-24 19:57:55 +04:00
commit 7eeb988f87
3 changed files with 75 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,13 +192,13 @@ function FoldLine(foldData, folds) {
} }
this.split = function(row, column) { this.split = function(row, column) {
var fold = this.getNextFoldTo(row, column).fold, var fold = this.getNextFoldTo(row, column).fold;
folds = this.folds; var folds = this.folds;
var foldData = this.foldData; var foldData = this.foldData;
if (!fold) { if (!fold)
return null; 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;

73
lib/ace/range.js
View file

@ -30,10 +30,10 @@
define(function(require, exports, module) { define(function(require, exports, module) {
"use strict"; "use strict";
var comparePoints = function(p1, p2) {
return p1.row - p2.row || p1.column - p2.column;
};
/** /**
*
*
* This object is used in various places to indicate a region within the editor. To better visualize how this works, imagine a rectangle. Each quadrant of the rectangle is analogus to a range, as ranges contain a starting row and starting column, and an ending row, and ending column. * This object is used in various places to indicate a region within the editor. To better visualize how this works, imagine a rectangle. Each quadrant of the rectangle is analogus to a range, as ranges contain a starting row and starting column, and an ending row, and ending column.
* @class Range * @class Range
**/ **/
@ -45,7 +45,6 @@ define(function(require, exports, module) {
* @param {Number} endRow The ending row * @param {Number} endRow The ending row
* @param {Number} endColumn The ending column * @param {Number} endColumn The ending column
* *
*
* @constructor * @constructor
**/ **/
var Range = function(startRow, startColumn, endRow, endColumn) { var Range = function(startRow, startColumn, endRow, endColumn) {
@ -65,14 +64,13 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* Returns `true` if and only if the starting row and column, and ending row and column, are equivalent to those given by `range`. * Returns `true` if and only if the starting row and column, and ending row and column, are equivalent to those given by `range`.
* @param {Range} range A range to check against * @param {Range} range A range to check against
* *
*
* @return {Boolean} * @return {Boolean}
**/ **/
this.isEqual = function(range) { this.isEqual = function(range) {
return this.start.row == range.start.row && return this.start.row === range.start.row &&
this.end.row == range.end.row && this.end.row === range.end.row &&
this.start.column == range.start.column && this.start.column === range.start.column &&
this.end.column == range.end.column this.end.column === range.end.column;
}; };
/** /**
@ -109,7 +107,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* Compares `this` range (A) with another range (B). * Compares `this` range (A) with another range (B).
* @param {Range} range A range to compare with * @param {Range} range A range to compare with
* *
*
* @related Range.compare * @related Range.compare
* @returns {Number} This method returns one of the following numbers:<br/> * @returns {Number} This method returns one of the following numbers:<br/>
* <br/> * <br/>
@ -150,7 +147,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
}; };
/** /**
*
* Checks the row and column points of `p` with the row and column points of the calling range. * Checks the row and column points of `p` with the row and column points of the calling range.
* *
* @param {Range} p A point to compare with * @param {Range} p A point to compare with
@ -179,7 +175,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* *
* @returns {Boolean} * @returns {Boolean}
* @related Range.comparePoint * @related Range.comparePoint
*
**/ **/
this.containsRange = function(range) { this.containsRange = function(range) {
return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0; return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
@ -189,7 +184,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* Returns `true` if passed in `range` intersects with the one calling this method. * Returns `true` if passed in `range` intersects with the one calling this method.
* @param {Range} range A range to compare with * @param {Range} range A range to compare with
* *
*
* @returns {Boolean} * @returns {Boolean}
**/ **/
this.intersects = function(range) { this.intersects = function(range) {
@ -202,7 +196,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @param {Number} row A row point to compare with * @param {Number} row A row point to compare with
* @param {Number} column A column point to compare with * @param {Number} column A column point to compare with
* *
*
* @returns {Boolean} * @returns {Boolean}
**/ **/
this.isEnd = function(row, column) { this.isEnd = function(row, column) {
@ -214,7 +207,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @param {Number} row A row point to compare with * @param {Number} row A row point to compare with
* @param {Number} column A column point to compare with * @param {Number} column A column point to compare with
* *
*
* @returns {Boolean} * @returns {Boolean}
**/ **/
this.isStart = function(row, column) { this.isStart = function(row, column) {
@ -226,8 +218,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @param {Number} row A row point to set * @param {Number} row A row point to set
* @param {Number} column A column point to set * @param {Number} column A column point to set
* *
*
*
**/ **/
this.setStart = function(row, column) { this.setStart = function(row, column) {
if (typeof row == "object") { if (typeof row == "object") {
@ -244,8 +234,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @param {Number} row A row point to set * @param {Number} row A row point to set
* @param {Number} column A column point to set * @param {Number} column A column point to set
* *
*
*
**/ **/
this.setEnd = function(row, column) { this.setEnd = function(row, column) {
if (typeof row == "object") { if (typeof row == "object") {
@ -282,7 +270,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @param {Number} row A row point to compare with * @param {Number} row A row point to compare with
* @param {Number} column A column point to compare with * @param {Number} column A column point to compare with
* *
*
* @returns {Boolean} * @returns {Boolean}
* @related Range.compare * @related Range.compare
**/ **/
@ -302,7 +289,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @param {Number} row A row point to compare with * @param {Number} row A row point to compare with
* @param {Number} column A column point to compare with * @param {Number} column A column point to compare with
* *
*
* @returns {Boolean} * @returns {Boolean}
* @related Range.compare * @related Range.compare
* *
@ -364,8 +350,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @param {Number} row A row point to compare with * @param {Number} row A row point to compare with
* @param {Number} column A column point to compare with * @param {Number} column A column point to compare with
* *
*
*
* @returns {Number} This method returns one of the following numbers:<br/> * @returns {Number} This method returns one of the following numbers:<br/>
* <br/> * <br/>
* `0` if the two points are exactly equal<br/> * `0` if the two points are exactly equal<br/>
@ -448,33 +432,16 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @returns {Range} * @returns {Range}
**/ **/
this.clipRows = function(firstRow, lastRow) { this.clipRows = function(firstRow, lastRow) {
if (this.end.row > lastRow) { if (this.end.row > lastRow)
var end = { var end = {row: lastRow + 1, column: 0};
row: lastRow+1, else if (this.end.row < firstRow)
column: 0 var end = {row: firstRow, column: 0};
};
}
if (this.start.row > lastRow) { if (this.start.row > lastRow)
var start = { var start = {row: lastRow + 1, column: 0};
row: lastRow+1, else if (this.start.row < firstRow)
column: 0 var start = {row: firstRow, column: 0};
};
}
if (this.start.row < firstRow) {
var start = {
row: firstRow,
column: 0
};
}
if (this.end.row < firstRow) {
var end = {
row: firstRow,
column: 0
};
}
return Range.fromPoints(start || this.start, end || this.end); return Range.fromPoints(start || this.start, end || this.end);
}; };
@ -500,7 +467,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
}; };
this.isEmpty = function() { this.isEmpty = function() {
return (this.start.row == this.end.row && this.start.column == this.end.column); return (this.start.row === this.end.row && this.start.column === this.end.column);
}; };
/** /**
@ -541,10 +508,8 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @returns {Range} * @returns {Range}
**/ **/
this.toScreenRange = function(session) { this.toScreenRange = function(session) {
var screenPosStart = var screenPosStart = session.documentToScreenPosition(this.start);
session.documentToScreenPosition(this.start); var screenPosEnd = session.documentToScreenPosition(this.end);
var screenPosEnd =
session.documentToScreenPosition(this.end);
return new Range( return new Range(
screenPosStart.row, screenPosStart.column, screenPosStart.row, screenPosStart.column,
@ -559,12 +524,12 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
* @param {Range} start A starting point to use * @param {Range} start A starting point to use
* @param {Range} end An ending point to use * @param {Range} end An ending point to use
* *
*
* @returns {Range} * @returns {Range}
**/ **/
Range.fromPoints = function(start, end) { Range.fromPoints = function(start, end) {
return new Range(start.row, start.column, end.row, end.column); return new Range(start.row, start.column, end.row, end.column);
}; };
Range.comparePoints = comparePoints;
exports.Range = Range; exports.Range = Range;
}); });

15
lib/ace/range_list.js
View file

@ -30,29 +30,28 @@
define(function(require, exports, module) { define(function(require, exports, module) {
"use strict"; "use strict";
var Range = require("./range").Range;
var comparePoints = Range.comparePoints;
var RangeList = function() { var RangeList = function() {
this.ranges = []; this.ranges = [];
}; };
(function() { (function() {
this.comparePoints = function(p1, p2) { this.comparePoints = comparePoints;
return p1.row - p2.row || p1.column - p2.column;
};
this.pointIndex = function(pos, startIndex) { this.pointIndex = function(pos, startIndex) {
var list = this.ranges; var list = this.ranges;
for (var i = startIndex || 0; i < list.length; i++) { for (var i = startIndex || 0; i < list.length; i++) {
var range = list[i]; var range = list[i];
var cmp = this.comparePoints(pos, range.end); var cmp = comparePoints(pos, range.end);
if (cmp > 0) if (cmp > 0)
continue; continue;
if (cmp == 0) if (cmp == 0)
return i; return i;
cmp = this.comparePoints(pos, range.start); cmp = comparePoints(pos, range.start);
if (cmp >= 0) if (cmp >= 0)
return i; return i;
@ -99,14 +98,14 @@ var RangeList = function() {
for (var i = 1; i < list.length; i++) { for (var i = 1; i < list.length; i++) {
range = next; range = next;
next = list[i]; next = list[i];
var cmp = this.comparePoints(range.end, next.start); var cmp = comparePoints(range.end, next.start);
if (cmp < 0) if (cmp < 0)
continue; continue;
if (cmp == 0 && !(range.isEmpty() || next.isEmpty())) if (cmp == 0 && !(range.isEmpty() || next.isEmpty()))
continue; continue;
if (this.comparePoints(range.end, next.end) < 0) { if (comparePoints(range.end, next.end) < 0) {
range.end.row = next.end.row; range.end.row = next.end.row;
range.end.column = next.end.column; range.end.column = next.end.column;
} }