diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js index 5af21b4384a..58c19e74b08 100644 --- a/lib/ace/edit_session.js +++ b/lib/ace/edit_session.js @@ -1417,14 +1417,17 @@ var EditSession = function(text, mode) { var rowLength = 0; var rowCache = this.$rowCache; - var doCache = !rowCache.length; for (var i = 0; i < rowCache.length; i++) { if (rowCache[i].screenRow < screenRow) { row = rowCache[i].screenRow; docRow = rowCache[i].docRow; - doCache = i == rowCache.length - 1; + } + else { + break; } } + var doCache = !rowCache.length || i == rowCache.length; + // clamp row before clamping column, for selection on last line var maxRow = this.getLength() - 1; @@ -1432,12 +1435,6 @@ var EditSession = function(text, mode) { var foldStart = foldLine ? foldLine.start.row : Infinity; while (row <= screenRow) { - if (doCache) { - rowCache.push({ - docRow: docRow, - screenRow: row - }); - } rowLength = this.getRowLength(docRow); if (row + rowLength - 1 >= screenRow || docRow >= maxRow) { break; @@ -1450,6 +1447,12 @@ var EditSession = function(text, mode) { foldStart = foldLine ? foldLine.start.row : Infinity; } } + if (doCache) { + rowCache.push({ + docRow: docRow, + screenRow: row + }); + } } if (foldLine && foldLine.start.row <= docRow) @@ -1534,15 +1537,16 @@ var EditSession = function(text, mode) { var rowEnd, row = 0; var rowCache = this.$rowCache; - // - var doCache = !rowCache.length; + for (var i = 0; i < rowCache.length; i++) { if (rowCache[i].docRow < docRow) { screenRow = rowCache[i].screenRow; row = rowCache[i].docRow; - doCache = i == rowCache.length - 1; + } else { + break; } } + var doCache = !rowCache.length || i == rowCache.length; var foldLine = this.getNextFold(row); var foldStart = foldLine ?foldLine.start.row :Infinity; @@ -1554,18 +1558,20 @@ var EditSession = function(text, mode) { break; foldLine = this.getNextFold(rowEnd); foldStart = foldLine ?foldLine.start.row :Infinity; - } else { + } + else { rowEnd = row + 1; } + + screenRow += this.getRowLength(row); + row = rowEnd; + if (doCache) { rowCache.push({ docRow: row, screenRow: screenRow }); } - - screenRow += this.getRowLength(row); - row = rowEnd; } // Calculate the text line that is displayed in docRow on the screen. diff --git a/lib/ace/edit_session/folding.js b/lib/ace/edit_session/folding.js index 486599581ab..127081b569b 100644 --- a/lib/ace/edit_session/folding.js +++ b/lib/ace/edit_session/folding.js @@ -240,9 +240,6 @@ function Folding() { */ this.addFold = function(placeholder, range) { var foldData = this.$foldData; - var foldRow = null; - var foldLine; - var folds; var added = false; if (placeholder instanceof Fold) @@ -286,7 +283,7 @@ function Folding() { throw "End of fold is outside of the document."; // Check if there are folds in the range we create the new fold for. - folds = this.getFoldsInRange(fold.range); + var folds = this.getFoldsInRange(fold.range); if (folds.length > 0) { // Remove the folds from fold data. this.removeFolds(folds); @@ -295,7 +292,7 @@ function Folding() { } for (var i = 0; i < foldData.length; i++) { - foldLine = foldData[i]; + var foldLine = foldData[i]; if (endRow == foldLine.start.row) { foldLine.addFold(fold); added = true; diff --git a/lib/ace/test/benchmark.js b/lib/ace/test/benchmark.js new file mode 100644 index 00000000000..36241f60d7b --- /dev/null +++ b/lib/ace/test/benchmark.js @@ -0,0 +1,85 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Ajax.org Code Editor (ACE). + * + * The Initial Developer of the Original Code is + * Ajax.org B.V. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Fabian Jakobs + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +if (typeof process !== "undefined") { + require("../../../support/paths"); +} + +define(function(require, exports, module) { + +var assert = require("ace/test/assertions"); +var EditSession = require("ace/edit_session").EditSession; + +module.exports = { + setUp : function() { + this.start = Date.now(); + }, + + tearDown : function() { + console.log("took: ", Date.now() - this.start + "ms"); + }, + + "test: document to screen position": function() { + var s = new EditSession(Array(6000).join('someText\n')); + + for (var i=0; i<6000; i++) + s.documentToScreenPosition(i, 0); + + for (var i=0; i<6000; i++) + s.documentToScreenPosition(i, 0); + + console.log(s.$rowCache.length); + }, + + "test: screen to document position": function() { + var s = new EditSession(Array(6000).join('someText\n')); + + for (var i=0; i<6000; i++) + s.screenToDocumentPosition(i, 0); + + for (var i=0; i<6000; i++) + s.documentToScreenPosition(i, 0); + + console.log(s.$rowCache.length); + } +}; + +}); + +if (typeof module !== "undefined" && module === require.main) { + require("asyncjs").test.testcase(module.exports).exec(); +} \ No newline at end of file