Merge https://github.com/ajaxorg/ace

Makefile.dryice.js

@@ -359,7 +359,7 @@ function buildAce(options) {
         buildSubmodule(options, {
             projectType: "theme",
             require: ["ace/theme/" + name]
-        }, "theme-" +  name.replace("_theme", ""));
+        }, "theme-" +  name);
     });
     // keybindings
     ["vim", "emacs"].forEach(function(name) {

lib/ace/autocomplete/popup.js

@@ -52,6 +52,7 @@ var $singleLineEditor = function(el) {
     editor.renderer.setHighlightGutterLine(false);
 
     editor.$mouseHandler.$focusWaitTimout = 0;
+    editor.$highlightTagPending = true;
 
     return editor;
 };
@@ -103,7 +104,7 @@ var AcePopup = function(parentNode) {
             popup.session.removeMarker(hoverMarker.id);
             hoverMarker.id = null;
         }
-    }
+    };
     popup.setSelectOnHover(false);
     popup.on("mousemove", function(e) {
         if (!lastMouseEvent) {
@@ -171,8 +172,8 @@ var AcePopup = function(parentNode) {
     };
 
     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 = [];
         if (!data)
             return tokens;
@@ -206,7 +207,7 @@ var AcePopup = function(parentNode) {
 
     popup.session.$computeWidth = function() {
         return this.screenWidth = 0;
-    }
+    };
 
     // public
     popup.isOpen = false;
@@ -240,6 +241,7 @@ var AcePopup = function(parentNode) {
     popup.on("changeSelection", function() {
         if (popup.isOpen)
             popup.setRow(popup.selection.lead.row);
+        popup.renderer.scrollCursorIntoView();
     });
 
     popup.hide = function() {

lib/ace/commands/default_commands.js

@@ -205,12 +205,14 @@ exports.commands = [{
     bindKey: bindKey("Shift-Up", "Shift-Up"),
     exec: function(editor) { editor.getSelection().selectUp(); },
     multiSelectAction: "forEach",
+    scrollIntoView: "cursor",
     readOnly: true
 }, {
     name: "golineup",
     bindKey: bindKey("Up", "Up|Ctrl-P"),
     exec: function(editor, args) { editor.navigateUp(args.times); },
     multiSelectAction: "forEach",
+    scrollIntoView: "cursor",
     readOnly: true
 }, {
     name: "selecttoend",
@@ -395,12 +397,21 @@ exports.commands = [{
     bindKey: bindKey("Ctrl-P", "Ctrl-P"),
     exec: function(editor) { editor.jumpToMatching(); },
     multiSelectAction: "forEach",
+    scrollIntoView: "animate",
     readOnly: true
 }, {
     name: "selecttomatching",
     bindKey: bindKey("Ctrl-Shift-P", "Ctrl-Shift-P"),
     exec: function(editor) { editor.jumpToMatching(true); },
     multiSelectAction: "forEach",
+    scrollIntoView: "animate",
+    readOnly: true
+}, {
+    name: "expandToMatching",
+    bindKey: bindKey("Ctrl-Shift-M", "Ctrl-Shift-M"),
+    exec: function(editor) { editor.jumpToMatching(true, true); },
+    multiSelectAction: "forEach",
+    scrollIntoView: "animate",
     readOnly: true
 }, {
     name: "passKeysToBrowser",
@@ -458,11 +469,13 @@ exports.commands = [{
     name: "modifyNumberUp",
     bindKey: bindKey("Ctrl-Shift-Up", "Alt-Shift-Up"),
     exec: function(editor) { editor.modifyNumber(1); },
+    scrollIntoView: "cursor",
     multiSelectAction: "forEach"
 }, {
     name: "modifyNumberDown",
     bindKey: bindKey("Ctrl-Shift-Down", "Alt-Shift-Down"),
     exec: function(editor) { editor.modifyNumber(-1); },
+    scrollIntoView: "cursor",
     multiSelectAction: "forEach"
 }, {
     name: "replace",
@@ -629,7 +642,7 @@ exports.commands = [{
         var isBackwards = editor.selection.isBackwards();
         var selectionStart = isBackwards ? editor.selection.getSelectionLead() : editor.selection.getSelectionAnchor();
         var selectionEnd = isBackwards ? editor.selection.getSelectionAnchor() : editor.selection.getSelectionLead();
-        var firstLineEndCol = editor.session.doc.getLine(selectionStart.row).length
+        var firstLineEndCol = editor.session.doc.getLine(selectionStart.row).length;
         var selectedText = editor.session.doc.getTextRange(editor.selection.getRange());
         var selectedCount = selectedText.replace(/\n\s*/, " ").length;
         var insertLine = editor.session.doc.getLine(selectionStart.row);
@@ -640,7 +653,7 @@ exports.commands = [{
                 curLine = " " + curLine;
             }
             insertLine += curLine;
-        };
+        }
 
         if (selectionEnd.row + 1 < (editor.session.doc.getLength() - 1)) {
             // Don't insert a newline at the end of the document

lib/ace/commands/multi_select_commands.js

@@ -35,41 +35,49 @@ exports.defaultCommands = [{
     name: "addCursorAbove",
     exec: function(editor) { editor.selectMoreLines(-1); },
     bindKey: {win: "Ctrl-Alt-Up", mac: "Ctrl-Alt-Up"},
+    scrollIntoView: "cursor",
     readonly: true
 }, {
     name: "addCursorBelow",
     exec: function(editor) { editor.selectMoreLines(1); },
     bindKey: {win: "Ctrl-Alt-Down", mac: "Ctrl-Alt-Down"},
+    scrollIntoView: "cursor",
     readonly: true
 }, {
     name: "addCursorAboveSkipCurrent",
     exec: function(editor) { editor.selectMoreLines(-1, true); },
     bindKey: {win: "Ctrl-Alt-Shift-Up", mac: "Ctrl-Alt-Shift-Up"},
+    scrollIntoView: "cursor",
     readonly: true
 }, {
     name: "addCursorBelowSkipCurrent",
     exec: function(editor) { editor.selectMoreLines(1, true); },
     bindKey: {win: "Ctrl-Alt-Shift-Down", mac: "Ctrl-Alt-Shift-Down"},
+    scrollIntoView: "cursor",
     readonly: true
 }, {
     name: "selectMoreBefore",
     exec: function(editor) { editor.selectMore(-1); },
     bindKey: {win: "Ctrl-Alt-Left", mac: "Ctrl-Alt-Left"},
+    scrollIntoView: "cursor",
     readonly: true
 }, {
     name: "selectMoreAfter",
     exec: function(editor) { editor.selectMore(1); },
     bindKey: {win: "Ctrl-Alt-Right", mac: "Ctrl-Alt-Right"},
+    scrollIntoView: "cursor",
     readonly: true
 }, {
     name: "selectNextBefore",
     exec: function(editor) { editor.selectMore(-1, true); },
     bindKey: {win: "Ctrl-Alt-Shift-Left", mac: "Ctrl-Alt-Shift-Left"},
+    scrollIntoView: "cursor",
     readonly: true
 }, {
     name: "selectNextAfter",
     exec: function(editor) { editor.selectMore(1, true); },
     bindKey: {win: "Ctrl-Alt-Shift-Right", mac: "Ctrl-Alt-Shift-Right"},
+    scrollIntoView: "cursor",
     readonly: true
 }, {
     name: "splitIntoLines",
@@ -79,11 +87,13 @@ exports.defaultCommands = [{
 }, {
     name: "alignCursors",
     exec: function(editor) { editor.alignCursors(); },
-    bindKey: {win: "Ctrl-Alt-A", mac: "Ctrl-Alt-A"}
+    bindKey: {win: "Ctrl-Alt-A", mac: "Ctrl-Alt-A"},
+    scrollIntoView: "cursor"
 }, {
     name: "findAll",
     exec: function(editor) { editor.findAll(); },
     bindKey: {win: "Ctrl-Alt-K", mac: "Ctrl-Alt-G"},
+    scrollIntoView: "cursor",
     readonly: true
 }];
 
@@ -92,6 +102,7 @@ exports.multiSelectCommands = [{
     name: "singleSelection",
     bindKey: "esc",
     exec: function(editor) { editor.exitMultiSelectMode(); },
+    scrollIntoView: "cursor",
     readonly: true,
     isAvailable: function(editor) {return editor && editor.inMultiSelectMode}
 }];

lib/ace/config.js

@@ -81,10 +81,6 @@ exports.moduleUrl = function(name, component) {
     // todo make this configurable or get rid of '-'
     var sep = component == "snippets" ? "/" : "-";
     var base = parts[parts.length - 1];
-    if (sep == "-") {
-        var re = new RegExp("^" + component + "[\\-_]|[\\-_]" + component + "$", "g");
-        base = base.replace(re, "");
-    }
 
     if ((!base || base == component) && parts.length > 1)
         base = parts[parts.length - 2];

lib/ace/config_test.js

@@ -43,7 +43,7 @@ module.exports = {
     "test: path resolution" : function() {
         config.set("packaged", "true");
         var url = config.moduleUrl("kr_theme", "theme");
-        assert.equal(url, "theme-kr.js");
+        assert.equal(url, "theme-kr_theme.js");
         
         config.set("basePath", "a/b");
         url = config.moduleUrl("m/theme", "theme");

lib/ace/css/editor.css

@@ -155,8 +155,8 @@
 }
 
 .ace_text-input.ace_composition {
-    background: #f8f8f8;
+    background: inherit;
-    color: #111;
+    color: inherit;
     z-index: 1000;
     opacity: 1;
     text-indent: 0;

lib/ace/edit_session.js

@@ -268,7 +268,7 @@ var EditSession = function(text, mode) {
             this.$informUndoManager.schedule();
         }
 
-        this.bgTokenizer.$updateOnChange(delta);
+        this.bgTokenizer && this.bgTokenizer.$updateOnChange(delta);
         this._signal("change", e);
     };
 
@@ -276,8 +276,6 @@ var EditSession = function(text, mode) {
     * Sets the session text.
     * @param {String} text The new text to place
     *
-    *
-    *
     **/
     this.setValue = function(text) {
         this.doc.setValue(text);
@@ -950,6 +948,9 @@ var EditSession = function(text, mode) {
 
         
         if (!$isPlaceholder) {
+            // experimental method, used by c9 findiniles
+            if (mode.attachToSession)
+                mode.attachToSession(this);
             this.$options.wrapMethod.set.call(this, this.$wrapMethod);
             this.$setFolding(mode.foldingRules);
             this.bgTokenizer.start(0);
@@ -957,12 +958,11 @@ var EditSession = function(text, mode) {
         }
     };
 
-
     this.$stopWorker = function() {
-        if (this.$worker)
+        if (this.$worker) {
             this.$worker.terminate();
-
             this.$worker = null;
+        }
     };
 
     this.$startWorker = function() {
@@ -1731,9 +1731,10 @@ var EditSession = function(text, mode) {
                     // Inside of the foldLine range. Need to split stuff up.
                     if (cmp == 0) {
                         foldLine = foldLine.split(start.row, start.column);
+                        if (foldLine) {
                             foldLine.shiftRow(len);
-                        foldLine.addRemoveChars(
+                            foldLine.addRemoveChars(lastRow, 0, end.column - start.column);
-                            lastRow, 0, end.column - start.column);
+                        }
                     } else
                     // Infront of the foldLine but same row. Need to shift column.
                     if (cmp == -1) {
@@ -2400,7 +2401,15 @@ var EditSession = function(text, mode) {
      */
     this.$setFontMetrics = function(fm) {
         // todo
+    };
+    
+    this.destroy = function() {
+        if (this.bgTokenizer) {
+            this.bgTokenizer.setDocument(null);
+            this.bgTokenizer = null;
         }
+        this.$stopWorker();
+    };
 
     // For every keystroke this gets called once per char in the whole doc!!
     // Wouldn't hurt to make it a bit faster for c >= 0x1100

lib/ace/edit_session/fold_line.js

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

lib/ace/editor.js

@@ -82,7 +82,6 @@ var Editor = function(renderer, session) {
     this.$mouseHandler = new MouseHandler(this);
     new FoldHandler(this);
 
-    this.$blockScrolling = 0;
     this.$search = new Search().set({
         wrap: true
     });
@@ -94,7 +93,8 @@ var Editor = function(renderer, session) {
     
     this._$emitInputEvent = lang.delayedCall(function() {
         this._signal("input", {});
-        this.session.bgTokenizer && this.session.bgTokenizer.scheduleStart();
+        if (this.session && this.session.bgTokenizer)
+            this.session.bgTokenizer.scheduleStart();
     }.bind(this));
     
     this.on("change", function(_, _self) {
@@ -183,7 +183,6 @@ var Editor = function(renderer, session) {
         if (this.curOp) {
             var command = this.curOp.command;
             if (command && command.scrollIntoView) {
-                this.$blockScrolling--;
                 switch (command.scrollIntoView) {
                     case "center":
                         this.renderer.scrollCursorIntoView(null, 0.5);
@@ -371,9 +370,7 @@ var Editor = function(renderer, session) {
     
             this.onChangeMode();
     
-            this.$blockScrolling += 1;
             this.onCursorChange();
-            this.$blockScrolling -= 1;
     
             this.onScrollTopChange();
             this.onScrollLeftChange();
@@ -384,6 +381,9 @@ var Editor = function(renderer, session) {
             this.onChangeAnnotation();
             this.session.getUseWrapMode() && this.renderer.adjustWrapLimit();
             this.renderer.updateFull();
+        } else {
+            this.selection = null;
+            this.renderer.setSession(session);
         }
 
         this._signal("changeSession", {
@@ -525,25 +525,23 @@ var Editor = function(renderer, session) {
         this.$highlightPending = true;
         setTimeout(function() {
             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) {
-                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)
-                self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket", "text");
+                session.$bracketHighlight = session.addMarker(range, "ace_bracket", "text");
         }, 50);
     };
 
     // todo: move to mode.getMatching
     this.$highlightTags = function() {
-        var session = this.session;
+        if (this.$highlightTagPending)
-
-        if (this.$highlightTagPending) {
             return;
-        }
 
         // perform highlight async to not block the browser during navigation
         var self = this;
@@ -551,6 +549,9 @@ var Editor = function(renderer, session) {
         setTimeout(function() {
             self.$highlightTagPending = false;
             
+            var session = self.session;
+            if (!session || !session.bgTokenizer) return;
+            
             var pos = self.getCursorPosition();
             var iterator = new TokenIterator(self.session, pos.row, pos.column);
             var token = iterator.getCurrentToken();
@@ -572,28 +573,28 @@ var Editor = function(renderer, session) {
                     token = iterator.stepForward();
                     
                     if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) {
-                        if (prevToken.value==='<'){
+                        if (prevToken.value === '<'){
                             depth++;
-                        } else if (prevToken.value==='</'){
+                        } else if (prevToken.value === '</'){
                             depth--;
                         }
                     }
                     
-                } while (token && depth>=0);
+                } while (token && depth >= 0);
-            }else{
+            } else {
                 //find opening tag
                 do {
                     token = prevToken;
                     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++;
-                        } else if( prevToken.value==='</') {
+                        } else if (prevToken.value === '</') {
                             depth--;
                         }
                     }
-                } while (prevToken && depth<=0);
+                } while (prevToken && depth <= 0);
                 
                 //select tag again
                 iterator.stepForward();
@@ -732,10 +733,6 @@ var Editor = function(renderer, session) {
     this.onCursorChange = function() {
         this.$cursorChange();
 
-        if (!this.$blockScrolling) {
-            this.renderer.scrollCursorIntoView();
-        }
-
         this.$highlightBrackets();
         this.$highlightTags();
         this.$updateHighlightActiveLine();
@@ -921,9 +918,28 @@ var Editor = function(renderer, session) {
         // todo this should change when paste becomes a command
         if (this.$readOnly)
             return;
+
         var e = {text: text};
         this._signal("paste", e);
-        this.insert(e.text, true);
+        text = e.text;
+        if (!this.inMultiSelectMode || this.inVirtualSelectionMode) {
+            this.insert(text);
+        } else {
+            var lines = text.split(/\r\n|\r|\n/);
+            var ranges = this.selection.rangeList.ranges;
+    
+            if (lines.length > ranges.length || lines.length < 2 || !lines[1])
+                return this.commands.exec("insertstring", this, text);
+    
+            for (var i = ranges.length; i--;) {
+                var range = ranges[i];
+                if (!range.isEmpty())
+                    this.session.remove(range);
+    
+                this.session.insert(range.start, lines[i]);
+            }
+        }
+        this.renderer.scrollCursorIntoView();
     };
 
 
@@ -1831,7 +1847,6 @@ var Editor = function(renderer, session) {
         var config = this.renderer.layerConfig;
         var rows = dir * Math.floor(config.height / config.lineHeight);
 
-        this.$blockScrolling++;
         if (select === true) {
             this.selection.$moveSelection(function(){
                 this.moveCursorBy(rows, 0);
@@ -1840,7 +1855,6 @@ var Editor = function(renderer, session) {
             this.selection.moveCursorBy(rows, 0);
             this.selection.clearSelection();
         }
-        this.$blockScrolling--;
 
         var scrollTop = renderer.scrollTop;
 
@@ -1965,9 +1979,7 @@ var Editor = function(renderer, session) {
      * @related Selection.selectAll
      **/
     this.selectAll = function() {
-        this.$blockScrolling += 1;
         this.selection.selectAll();
-        this.$blockScrolling -= 1;
     };
 
     /**
@@ -2005,17 +2017,13 @@ var Editor = function(renderer, session) {
      * 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 iterator = new TokenIterator(this.session, cursor.row, cursor.column);
         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
         var matchType;
@@ -2034,12 +2042,12 @@ var Editor = function(renderer, session) {
         
         do {
             if (token.value.match(/[{}()\[\]]/g)) {
-                for (; i<token.value.length && !found; i++) {
+                for (; i < token.value.length && !found; i++) {
                     if (!brackets[token.value[i]]) {
                         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])) {
                         depth[bracketType] = 0;
@@ -2056,21 +2064,23 @@ var Editor = function(renderer, session) {
                         case '}':
                             depth[bracketType]--;
 
-                            if (depth[bracketType]===-1) {
+                            if (depth[bracketType] === -1) {
                                 matchType = 'bracket';
                                 found = true;
                             }
                         break;
                     }
                 }
-            } else if (token && token.type.indexOf('tag-name') !== -1) {
+            }
+            else if (token && token.type.indexOf('tag-name') !== -1) {
                 if (isNaN(depth[token.value])) {
                     depth[token.value] = 0;
                 }
                 
                 if (prevToken.value === '<') {
                     depth[token.value]++;
-                } else if (prevToken.value === '</') {
+                }
+                else if (prevToken.value === '</') {
                     depth[token.value]--;
                 }
                 
@@ -2088,37 +2098,35 @@ var Editor = function(renderer, session) {
         } while (token && !found);
 
         //no match found
-        if (!matchType) {
+        if (!matchType)
             return;
-        }
 
-        var range;
+        var range, pos;
-        if (matchType==='bracket') {
+        if (matchType === 'bracket') {
             range = this.session.getBracketRange(cursor);
             if (!range) {
                 range = new Range(
                     iterator.getCurrentTokenRow(),
-                    iterator.getCurrentTokenColumn()+i-1,
+                    iterator.getCurrentTokenColumn() + i - 1,
                     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);
             }
-        } else if(matchType==='tag') {
+        }
+        else if (matchType === 'tag') {
             if (token && token.type.indexOf('tag-name') !== -1) 
                 var tag = token.value;
             else
                 return;
 
-            var range = new Range(
+            range = new Range(
                 iterator.getCurrentTokenRow(),
-                iterator.getCurrentTokenColumn()-2, 
+                iterator.getCurrentTokenColumn() - 2,
                 iterator.getCurrentTokenRow(),
-                iterator.getCurrentTokenColumn()-2
+                iterator.getCurrentTokenColumn() - 2
             );
 
             //find matching tag
@@ -2130,17 +2138,18 @@ var Editor = function(renderer, session) {
                     
                     if (prevToken) {
                         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 (prevToken.value === '<') {
                                 depth[tag]++;
-                            } else if ( prevToken.value === '</') {
+                            }
+                            else if (prevToken.value === '</') {
                                 depth[tag]--;
                             }
                             
-                            if (depth[tag]===0)
+                            if (depth[tag] === 0)
                                 found = true;
                         }
                     }
@@ -2149,7 +2158,7 @@ var Editor = function(renderer, session) {
 
             //we found it
             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)
                     pos = range.end;
             }
@@ -2158,10 +2167,13 @@ var Editor = function(renderer, session) {
         pos = range && range.cursor || pos;
         if (pos) {
             if (select) {
-                if (range && range.isEqual(this.getSelectionRange()))
+                if (range && expand) {
+                    this.selection.setRange(range);
+                } else if (range && range.isEqual(this.getSelectionRange())) {
                     this.clearSelection();
-                else
+                } else {
                     this.selection.selectTo(pos.row, pos.column);
+                }
             } else {
                 this.selection.moveTo(pos.row, pos.column);
             }
@@ -2179,11 +2191,9 @@ var Editor = function(renderer, session) {
         this.selection.clearSelection();
         this.session.unfold({row: lineNumber - 1, column: column || 0});
 
-        this.$blockScrolling += 1;
         // todo: find a way to automatically exit multiselect mode
         this.exitMultiSelectMode && this.exitMultiSelectMode();
         this.moveCursorTo(lineNumber - 1, column || 0);
-        this.$blockScrolling -= 1;
 
         if (!this.isRowFullyVisible(lineNumber - 1))
             this.scrollToLine(lineNumber - 1, true, animate);
@@ -2369,7 +2379,6 @@ var Editor = function(renderer, session) {
         if (!ranges.length)
             return replaced;
 
-        this.$blockScrolling += 1;
 
         var selection = this.getSelectionRange();
         this.selection.moveTo(0, 0);
@@ -2381,7 +2390,6 @@ var Editor = function(renderer, session) {
         }
 
         this.selection.setSelectionRange(selection);
-        this.$blockScrolling -= 1;
 
         return replaced;
     };
@@ -2479,10 +2487,8 @@ var Editor = function(renderer, session) {
     };
 
     this.revealRange = function(range, animate) {
-        this.$blockScrolling += 1;
         this.session.unfold(range);
         this.selection.setSelectionRange(range);
-        this.$blockScrolling -= 1;
 
         var scrollTop = this.renderer.scrollTop;
         this.renderer.scrollSelectionIntoView(range.start, range.end, 0.5);
@@ -2495,9 +2501,7 @@ var Editor = function(renderer, session) {
      * @related UndoManager.undo
      **/
     this.undo = function() {
-        this.$blockScrolling++;
         this.session.getUndoManager().undo();
-        this.$blockScrolling--;
         this.renderer.scrollCursorIntoView(null, 0.5);
     };
 
@@ -2506,9 +2510,7 @@ var Editor = function(renderer, session) {
      * @related UndoManager.redo
      **/
     this.redo = function() {
-        this.$blockScrolling++;
         this.session.getUndoManager().redo();
-        this.$blockScrolling--;
         this.renderer.scrollCursorIntoView(null, 0.5);
     };
 
@@ -2519,6 +2521,9 @@ var Editor = function(renderer, session) {
     this.destroy = function() {
         this.renderer.destroy();
         this._signal("destroy", this);
+        if (this.session) {
+            this.session.destroy();
+        }
     };
 
     /**

lib/ace/ext/static_highlight.js

@@ -98,7 +98,6 @@ var highlight = function(el, opts, callback) {
  *  and `css`.
  * @returns {object} An object containing the properties `html` and `css`.
  */
-
 highlight.render = function(input, mode, theme, lineStart, disableGutter, callback) {
     var waiting = 1;
     var modeCache = EditSession.prototype.$modes;
@@ -112,11 +111,17 @@ highlight.render = function(input, mode, theme, lineStart, disableGutter, callba
             --waiting || done();
         });
     }
-
+    // allow setting mode options e.h {path: "ace/mode/php", inline:true}
+    var modeOptions;
+    if (mode && typeof mode === "object" && !mode.getTokenizer) {
+        modeOptions = mode;
+        mode = modeOptions.path;
+    }
     if (typeof mode == "string") {
         waiting++;
         config.loadModule(['mode', mode], function(m) {
-            if (!modeCache[mode]) modeCache[mode] = new m.Mode();
+            if (!modeCache[mode] || modeOptions)
+                modeCache[mode] = new m.Mode(modeOptions);
             mode = modeCache[mode];
             --waiting || done();
         });
@@ -130,14 +135,13 @@ highlight.render = function(input, mode, theme, lineStart, disableGutter, callba
     return --waiting || done();
 };
 
-/* 
+/**
  * Transforms a given input code snippet into HTML using the given mode
  * @param {string} input Code snippet
  * @param {mode} mode Mode loaded from /ace/mode (use 'ServerSideHiglighter.getMode')
  * @param {string} r Code snippet
  * @returns {object} An object containing: html, css
  */
-
 highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) {
     lineStart = parseInt(lineStart || 1, 10);
 

lib/ace/ext/whitespace.js

@@ -76,11 +76,14 @@ exports.$detectIndentation = function(lines, fallback) {
     var first = {score: 0, length: 0};
     var spaceIndents = 0;
     for (var i = 1; i < 12; i++) {
+        var score = getScore(i);
         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
-            var score = getScore(i) / spaceIndents;
+            score /= spaceIndents;
 
         if (changes[i])
             score += changes[i] / changesTotal;

lib/ace/keyboard/textinput.js

@@ -255,7 +255,7 @@ var TextInput = function(parentNode, host) {
         } else {
             return clipboardData.getData(mime);
         }
-    }
+    };
 
     var doCopy = function(e, isCut) {
         var data = host.getCopyText();
@@ -280,11 +280,11 @@ var TextInput = function(parentNode, host) {
     
     var onCut = function(e) {
         doCopy(e, true);
-    }
+    };
     
     var onCopy = function(e) {
         doCopy(e, false);
-    }
+    };
     
     var onPaste = function(e) {
         var data = handleClipboardData(e);
@@ -335,7 +335,8 @@ var TextInput = function(parentNode, host) {
 
     // COMPOSITION
     var onCompositionStart = function(e) {
-        if (inComposition || !host.onCompositionStart) return;
+        if (inComposition || !host.onCompositionStart || host.$readOnly) 
+            return;
         // console.log("onCompositionStart", inComposition)
         inComposition = {};
         host.onCompositionStart();
@@ -351,7 +352,8 @@ var TextInput = function(parentNode, host) {
 
     var onCompositionUpdate = function() {
         // console.log("onCompositionUpdate", inComposition && JSON.stringify(text.value))
-        if (!inComposition || !host.onCompositionUpdate) return;
+        if (!inComposition || !host.onCompositionUpdate || host.$readOnly)
+            return;
         var val = text.value.replace(/\x01/g, "");
         if (inComposition.lastValue === val) return;
         
@@ -370,7 +372,7 @@ var TextInput = function(parentNode, host) {
     };
 
     var onCompositionEnd = function(e) {
-        if (!host.onCompositionEnd) return;
+        if (!host.onCompositionEnd || host.$readOnly) return;
         // console.log("onCompositionEnd", inComposition &&inComposition.lastValue)
         var c = inComposition;
         inComposition = false;
@@ -379,7 +381,7 @@ var TextInput = function(parentNode, host) {
             var str = text.value.replace(/\x01/g, "");
             // console.log(str, c.lastValue)
             if (inComposition)
-                return
+                return;
             else if (str == c.lastValue)
                 resetValue();
             else if (!c.lastValue && str) {
@@ -437,13 +439,14 @@ var TextInput = function(parentNode, host) {
         if (!tempStyle)
             tempStyle = text.style.cssText;
         text.style.cssText = (bringToFront ? "z-index:100000;" : "")
+            + "height:" + text.style.height + ";"
             + (useragent.isIE ? "opacity:0.1;" : "");
 
         var rect = host.container.getBoundingClientRect();
         var style = dom.computedStyle(host.container);
         var top = rect.top + (parseInt(style.borderTopWidth) || 0);
         var left = rect.left + (parseInt(rect.borderLeftWidth) || 0);
-        var maxTop = rect.bottom - top - text.clientHeight;
+        var maxTop = rect.bottom - top - text.clientHeight -2;
         var move = function(e) {
             text.style.left = e.clientX - left - 2 + "px";
             text.style.top = Math.min(e.clientY - top - 2, maxTop) + "px";

lib/ace/keyboard/vim/commands.js

@@ -514,6 +514,8 @@ var inputBuffer = exports.inputBuffer = {
             this.reset();
         }
         handleCursorMove(editor);
+        if (editor.curOp && editor.curOp.selectionChanged)
+            editor.renderer.scrollCursorIntoView();
     },
 
     isAccepting: function(type) {

lib/ace/keyboard/vim/maps/motions.js

@@ -426,7 +426,7 @@ module.exports = {
             var column = util.getRightNthChar(editor, cursor, param, 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") {
                 cursor.column += column + (isSel ? 1 : 0);
@@ -444,8 +444,8 @@ module.exports = {
             var cursor = editor.getCursorPosition();
             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") {
                 cursor.column -= column;
@@ -558,7 +558,7 @@ module.exports = {
                 content += "\n";
 
             if (content.length) {
-                editor.navigateLineEnd()
+                editor.navigateLineEnd();
                 editor.insert(content);
                 util.insertMode(editor);
             }
@@ -575,7 +575,7 @@ module.exports = {
             if (content.length) {
                 if(row > 0) {
                     editor.navigateUp();
-                    editor.navigateLineEnd()
+                    editor.navigateLineEnd();
                     editor.insert(content);
                 } else {
                     editor.session.insert({row: 0, column: 0}, content);

lib/ace/keyboard/vim/maps/operators.js

@@ -91,14 +91,12 @@ module.exports = {
             count = count || 1;
             switch (param) {
                 case "c":
-                    editor.$blockScrolling++;
                     editor.selection.$moveSelection(function() {
                         editor.selection.moveCursorBy(count - 1, 0);
                     });
                     var rows = editor.$getSelectedRows();
                     range = new Range(rows.first, 0, rows.last, Infinity);
                     editor.session.remove(range);
-                    editor.$blockScrolling--;
                     util.insertMode(editor);
                     break;
                 default:

lib/ace/layer/gutter.js

@@ -58,6 +58,7 @@ var Gutter = function(parentEl) {
         if (this.session)
             this.session.removeEventListener("change", this.$updateAnnotations);
         this.session = session;
+        if (session)
             session.on("change", this.$updateAnnotations);
     };
 

lib/ace/layer/text.js

@@ -95,6 +95,7 @@ var Text = function(parentEl) {
     };
     this.setSession = function(session) {
         this.session = session;
+        if (session)
             this.$computeTabString();
     };
 

lib/ace/lib/dom.js

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

lib/ace/mode/css_worker.js

@@ -40,8 +40,11 @@ var Worker = exports.Worker = function(sender) {
     Mirror.call(this, sender);
     this.setTimeout(400);
     this.ruleset = null;
-    this.setDisabledRules("ids");
+    this.setDisabledRules("ids|order-alphabetical");
-    this.setInfoRules("adjoining-classes|qualified-headings|zero-units|gradients|import|outline-none");
+    this.setInfoRules(
+      "adjoining-classes|qualified-headings|zero-units|gradients|" +
+      "import|outline-none|vendor-prefix"
+    );
 };
 
 oop.inherits(Worker, Mirror);

lib/ace/mouse/dragdrop_handler.js

@@ -197,9 +197,7 @@ function DragdropHandler(mouseHandler) {
         var vMovement = !prevCursor || cursor.row != prevCursor.row;
         var hMovement = !prevCursor || cursor.column != prevCursor.column;
         if (!cursorMovedTime || vMovement || hMovement) {
-            editor.$blockScrolling += 1;
             editor.moveCursorToPosition(cursor);
-            editor.$blockScrolling -= 1;
             cursorMovedTime = now;
             cursorPointOnCaretMoved = {x: x, y: y};
         } else {
@@ -273,9 +271,7 @@ function DragdropHandler(mouseHandler) {
         clearInterval(timerId);
         editor.session.removeMarker(dragSelectionMarker);
         dragSelectionMarker = null;
-        editor.$blockScrolling += 1;
         editor.selection.fromOrientedRange(range);
-        editor.$blockScrolling -= 1;
         if (editor.isFocused() && !isInternal)
             editor.renderer.$cursorLayer.setBlinking(!editor.getReadOnly());
         range = null;

lib/ace/mouse/multi_select_handler.js

@@ -112,7 +112,6 @@ function onMouseDown(e) {
         var oldRange = selection.rangeList.rangeAtPoint(pos);
         
         
-        editor.$blockScrolling++;
         editor.inVirtualSelectionMode = true;
         
         if (shift) {
@@ -134,7 +133,6 @@ function onMouseDown(e) {
                 }
                 selection.addRange(tmpSel);
             }
-            editor.$blockScrolling--;
             editor.inVirtualSelectionMode = false;
         });
 
@@ -181,7 +179,6 @@ function onMouseDown(e) {
             editor.removeSelectionMarkers(rectSel);
             if (!rectSel.length)
                 rectSel = [selection.toOrientedRange()];
-            editor.$blockScrolling++;
             if (initialRange) {
                 editor.removeSelectionMarker(initialRange);
                 selection.toSingleRange(initialRange);
@@ -190,7 +187,6 @@ function onMouseDown(e) {
                 selection.addRange(rectSel[i]);
             editor.inVirtualSelectionMode = false;
             editor.$mouseHandler.$clickSelection = null;
-            editor.$blockScrolling--;
         };
 
         var onSelectionInterval = blockSelect;

lib/ace/multi_select.js

@@ -557,33 +557,6 @@ var Editor = require("./editor").Editor;
         }
     };
 
-    // todo this should change when paste becomes a command
-    this.onPaste = function(text) {
-        if (this.$readOnly)
-            return;
-
-
-        var e = {text: text};
-        this._signal("paste", e);
-        text = e.text;
-        if (!this.inMultiSelectMode || this.inVirtualSelectionMode)
-            return this.insert(text);
-
-        var lines = text.split(/\r\n|\r|\n/);
-        var ranges = this.selection.rangeList.ranges;
-
-        if (lines.length > ranges.length || lines.length < 2 || !lines[1])
-            return this.commands.exec("insertstring", this, text);
-
-        for (var i = ranges.length; i--;) {
-            var range = ranges[i];
-            if (!range.isEmpty())
-                this.session.remove(range);
-
-            this.session.insert(range.start, lines[i]);
-        }
-    };
-
     /**
      * Finds and selects all the occurences of `needle`.
      * @param {String} The text to find
@@ -608,7 +581,6 @@ var Editor = require("./editor").Editor;
         if (!ranges.length)
             return 0;
 
-        this.$blockScrolling += 1;
         var selection = this.multiSelect;
 
         if (!additive)
@@ -621,8 +593,6 @@ var Editor = require("./editor").Editor;
         if (range && selection.rangeList.rangeAtPoint(range.start))
             selection.addRange(range, true);
         
-        this.$blockScrolling -= 1;
-
         return ranges.length;
     };
 
@@ -720,7 +690,7 @@ var Editor = require("./editor").Editor;
      * @param {Boolean} skip If `true`, removes the active selection range
      * @method Editor.selectMore
      **/
-    this.selectMore = function(dir, skip) {
+    this.selectMore = function(dir, skip, stopAtFirst) {
         var session = this.session;
         var sel = session.multiSelect;
 
@@ -729,18 +699,16 @@ var Editor = require("./editor").Editor;
             range = session.getWordRange(range.start.row, range.start.column);
             range.cursor = dir == -1 ? range.start : range.end;
             this.multiSelect.addRange(range);
-            // todo add option for sublime like behavior
+            if (stopAtFirst)
-            // return;
+                return;
         }
         var needle = session.getTextRange(range);
 
         var newRange = find(session, needle, dir);
         if (newRange) {
             newRange.cursor = dir == -1 ? newRange.start : newRange.end;
-            this.$blockScrolling += 1;
             this.session.unfold(newRange);
             this.multiSelect.addRange(newRange);
-            this.$blockScrolling -= 1;
             this.renderer.scrollCursorIntoView(null, 0.5);
         }
         if (skip)
@@ -890,12 +858,12 @@ function isSamePoint(p1, p2) {
 // adds multicursor support to a session
 exports.onSessionChange = function(e) {
     var session = e.session;
-    if (!session.multiSelect) {
+    if (session && !session.multiSelect) {
         session.$selectionMarkers = [];
         session.selection.$initRangeList();
         session.multiSelect = session.selection;
     }
-    this.multiSelect = session.multiSelect;
+    this.multiSelect = session && session.multiSelect;
 
     var oldSession = e.oldSession;
     if (oldSession) {
@@ -907,16 +875,16 @@ exports.onSessionChange = function(e) {
         oldSession.multiSelect.anchor.off("change",  this.$checkMultiselectChange);
     }
 
+    if (session) {
         session.multiSelect.on("addRange", this.$onAddRange);
         session.multiSelect.on("removeRange", this.$onRemoveRange);
         session.multiSelect.on("multiSelect", this.$onMultiSelect);
         session.multiSelect.on("singleSelect", this.$onSingleSelect);
         session.multiSelect.lead.on("change",  this.$checkMultiselectChange);
         session.multiSelect.anchor.on("change",  this.$checkMultiselectChange);
+    }
 
-    // this.$onSelectionChange = this.onSelectionChange.bind(this);
+    if (session && this.inMultiSelectMode != session.selection.inMultiSelectMode) {
-
-    if (this.inMultiSelectMode != session.selection.inMultiSelectMode) {
         if (session.selection.inMultiSelectMode)
             this.$onMultiSelect();
         else

lib/ace/placeholder.js

@@ -37,7 +37,6 @@ var oop = require("./lib/oop");
 /**
  * @class PlaceHolder
  *
- * 
  **/
 
 /**
@@ -48,7 +47,6 @@ var oop = require("./lib/oop");
  * - mainClass (String):
  * - othersClass (String):
  * 
- * 
  * @constructor
  **/
 
@@ -94,6 +92,10 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
         var session = this.session;
         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.markerId = session.addMarker(new Range(pos.row, pos.column, pos.row, pos.column + this.length), this.mainClass, null, false);
         this.pos.on("change", function(event) {
@@ -218,9 +220,9 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
      **/
 
     this.onCursorChange = function(event) {
-        if (this.$updating) return;
+        if (this.$updating || !this.session) return;
         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._emit("cursorEnter", event);
         } else {
@@ -245,6 +247,7 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
             this.others[i].detach();
         }
         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++) {
             undoManager.undo(true);
         }
+        if (this.selectionBefore)
+            this.session.selection.fromJSON(this.selectionBefore);
     };
 }).call(PlaceHolder.prototype);
 

lib/ace/selection.js

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

lib/ace/snippets.js

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

lib/ace/virtual_renderer.js

@@ -232,10 +232,7 @@ var VirtualRenderer = function(container, theme) {
             this.session.doc.off("changeNewLineMode", this.onChangeNewLineMode);
             
         this.session = session;
-        if (!session)
+        if (session && this.scrollMargin.top && session.getScrollTop() <= 0)
-            return;
-        
-        if (this.scrollMargin.top && session.getScrollTop() <= 0)
             session.setScrollTop(-this.scrollMargin.top);
 
         this.$cursorLayer.setSession(session);
@@ -243,6 +240,9 @@ var VirtualRenderer = function(container, theme) {
         this.$markerFront.setSession(session);
         this.$gutterLayer.setSession(session);
         this.$textLayer.setSession(session);
+        if (!session)
+            return;
+        
         this.$loop.schedule(this.CHANGE_FULL);
         this.session.$setFontMetrics(this.$fontMetrics);
         
@@ -643,18 +643,17 @@ var VirtualRenderer = function(container, theme) {
             var val = this.textarea.value.replace(/^\x01+/, "");
             w *= (this.session.$getStringScreenWidth(val)[0]+2);
             h += 2;
-            posTop -= 1;
         }
         posLeft -= this.scrollLeft;
         if (posLeft > this.$size.scrollerWidth - w)
             posLeft = this.$size.scrollerWidth - w;
 
-        posLeft -= this.scrollBar.width;
+        posLeft += this.gutterWidth;
 
         this.textarea.style.height = h + "px";
         this.textarea.style.width = w + "px";
-        this.textarea.style.right = Math.max(0, this.$size.scrollerWidth - posLeft - w) + "px";
+        this.textarea.style.left = Math.min(posLeft, this.$size.scrollerWidth - w) + "px";
-        this.textarea.style.bottom = Math.max(0, this.$size.height - posTop - h) + "px";
+        this.textarea.style.top = Math.min(posTop, this.$size.height - h) + "px";
     };
 
     /**
@@ -915,6 +914,8 @@ var VirtualRenderer = function(container, theme) {
             this.$updateCachedSize(true, this.$gutterWidth, w, desiredHeight);
             // this.$loop.changes = 0;
             this.desiredHeight = desiredHeight;
+            
+            this._signal("autosize");
         }
     };