diff --git a/.gitignore b/.gitignore
index 76832436..ceba2ce9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,13 +4,8 @@
*.tmp
# Project files that should not be in the repo
-.project
-.settings/
-.settings.xml
-.settings
-.c9settings.xml
-.c9revisions
-.settings.xml.old
+.*
+!/.gitignore
.*.gz
# A handy place to put stuff that git should ignore:
diff --git a/install.js b/install.js
deleted file mode 100644
index dca36fff..00000000
--- a/install.js
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env node
-/* ***** BEGIN LICENSE BLOCK *****
- * Ace is distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the Ajax.org B.V.
- * 4. Neither the name of the Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY AJAX.ORG B.V. ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-var buildAce = require("./Makefile.dryice").buildAce;
-var fs = require("fs");
-
-var ACE_HOME = __dirname;
-
-function getVersion(path) {
- if (fs.existsSync(path + "/.git-ref"))
- return fs.readFileSync(path + "/.git-ref", "utf8");
- if (fs.existsSync(path + "/.git/ORIG_HEAD"))
- return fs.readFileSync(path + "/.git/ORIG_HEAD", "utf8");
- if (fs.existsSync(path + "/.sourcemint/source.json")) {
- var json = fs.readFileSync(path + "/.sourcemint/source.json", "utf8");
- return JSON.parse(json).url.split("/").pop();
- }
-}
-
-if (process.argv.indexOf("-c") > 0) try {
- var version = getVersion(ACE_HOME);
- var oldVersion = getVersion(ACE_HOME + "/build");
- if (version && oldVersion == version) {
- console.log("ace build is up to date");
- process.exit(0);
- }
- fs.writeFileSync(ACE_HOME + "/build/.git-ref", version, "utf8");
-} catch (e) {}
-
-try {
- buildAce({
- compress: false,
- noconflict: false,
- suffix: "",
- name: "ace"
- });
-
-} catch (err) {
- console.error("--- Ace Build error ---");
- console.error(err.stack);
- process.exit(1);
-}
\ No newline at end of file
diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index f6744907..a2faea1a 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -1642,6 +1642,7 @@ var EditSession = function(text, mode) {
len = lastRow - firstRow;
}
+ this.$updating = true;
if (len != 0) {
if (action.indexOf("remove") != -1) {
this[useWrapMode ? "$wrapData" : "$rowLengthCache"].splice(firstRow, len);
@@ -1734,6 +1735,7 @@ var EditSession = function(text, mode) {
if (useWrapMode && this.$wrapData.length != this.doc.getLength()) {
console.error("doc.getLength() and $wrapData.length have to be the same!");
}
+ this.$updating = false;
if (useWrapMode)
this.$updateWrapData(firstRow, lastRow);
@@ -2402,8 +2404,8 @@ config.defineOptions(EditSession.prototype, "session", {
this.setUseWrapMode(false);
} else {
var col = typeof value == "number" ? value : null;
- this.setUseWrapMode(true);
this.setWrapLimitRange(col, col);
+ this.setUseWrapMode(true);
}
this.$wrap = value;
},
diff --git a/lib/ace/edit_session/folding.js b/lib/ace/edit_session/folding.js
index 765ec81c..f0fc274a 100644
--- a/lib/ace/edit_session/folding.js
+++ b/lib/ace/edit_session/folding.js
@@ -384,11 +384,13 @@ function Folding() {
newFoldLine.start.column = folds[0].start.column;
}
- if (this.$useWrapMode)
- this.$updateWrapData(startRow, endRow);
- else
- this.$updateRowLengthCache(startRow, endRow);
-
+ if (!this.$updating) {
+ if (this.$useWrapMode)
+ this.$updateWrapData(startRow, endRow);
+ else
+ this.$updateRowLengthCache(startRow, endRow);
+ }
+
// Notify that fold data has changed.
this.$modified = true;
this._emit("changeFold", { data: fold });
diff --git a/lib/ace/edit_session_test.js b/lib/ace/edit_session_test.js
index 68581679..fd1c0508 100644
--- a/lib/ace/edit_session_test.js
+++ b/lib/ace/edit_session_test.js
@@ -899,7 +899,27 @@ module.exports = {
return session;
},
-
+
+ "test delete fold with wrap enabled": function() {
+ var session = new EditSession("");
+ session.setValue([
+ "This is some placeholder text that will be folded inline.",
+ "This is some placeholder text that will be folded inline.",
+ "More text.",
+ "The cursor in this paragraph text will be offset by 1 row.
",
+ "
Everything after this will be offset as well due to the folds in the row before too.
"
+ ].join("\n"));
+ session.addFold('...', new Range(0, 8, 0, 42));
+ session.addFold('...', new Range(1, 8, 1, 42));
+ session.addFold('...', new Range(3, 7, 3, 51));
+ session.setOption("wrap", 40);
+ session.remove(new Range(0,0, 2, 5));
+ // needed because adjustWrapLimit is called async from renderer
+ session.adjustWrapLimit(80);
+
+ assert.equal(session.$wrapData + "", [[], [], [40, 76]] + "");
+ },
+
"test add fold": function() {
var session = createFoldTestSession();
var fold;
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index b331f2ac..0abcecbf 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -1364,6 +1364,7 @@ var Editor = function(renderer, session) {
var sel = this.selection;
var doc = this.session;
var range = sel.getRange();
+ var reverse = sel.isBackwards();
if (range.isEmpty()) {
var row = range.start.row;
doc.duplicateLines(row, row);
diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js
index 81d83bf3..b9cf7851 100644
--- a/lib/ace/worker/worker_client.js
+++ b/lib/ace/worker/worker_client.js
@@ -45,16 +45,10 @@ var WorkerClient = function(topLevelNamespaces, mod, classname) {
workerUrl = config.moduleUrl(mod, "worker");
} else {
var normalizePath = this.$normalizePath;
- if (typeof require.supports !== "undefined" && require.supports.indexOf("ucjs2-pinf-0") >= 0) {
- // We are running in the sourcemint loader.
- workerUrl = require.nameToUrl("ace/worker/worker_sourcemint");
- } else {
- // We are running in RequireJS.
- // nameToUrl is renamed to toUrl in requirejs 2
- if (require.nameToUrl && !require.toUrl)
- require.toUrl = require.nameToUrl;
- workerUrl = normalizePath(require.toUrl("ace/worker/worker.js", null, "_"));
- }
+ // nameToUrl is renamed to toUrl in requirejs 2
+ if (require.nameToUrl && !require.toUrl)
+ require.toUrl = require.nameToUrl;
+ workerUrl = normalizePath(require.toUrl("ace/worker/worker.js", null, "_"));
var tlns = {};
topLevelNamespaces.forEach(function(ns) {