92 changed files with 398 additions and 1524 deletions
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@ -1,16 +1,5 @@
-Version 1.2.0-pre
-
-* New Features
-  - Indented soft wrap (danyaPostfactum)
-
-* API Changes
-  - unified delta types `{start, end, action, lines}`  (Alden Daniels https://github.com/ajaxorg/ace/pull/1745)
-  - "change" event listeners on session and editor get delta objects directly
-
 2015.04.03 Version 1.1.9

-  - Small Enhancements and Bugfixes
-
 2014.11.08 Version 1.1.8

 * API Changes
--- a/demo/autoresize.html
+++ b/demo/autoresize.html
@ -7,13 +7,14 @@
  <style type="text/css" media="screen">

 	.ace_editor {
+		position: relative !important;
 		border: 1px solid lightgray;
 		margin: auto;
 		height: 200px;
 		width: 80%;
 	}
 	.scrollmargin {
-		height: 80px;
+		height: 100px;
        text-align: center;
 	}
    </style>
@ -23,8 +24,6 @@
 <div class="scrollmargin"></div>
 <pre id="editor2">minHeight = 2 lines</pre>
 <div class="scrollmargin"></div>
-<pre id="editor3" style="width: 40%;"></pre>
-<div class="scrollmargin"></div>
 <pre id="editor"></pre>

 <script src="kitchen-sink/require.js"></script>
@ -47,13 +46,6 @@ require(["ace/ace"], function(ace) {
    editor2.setOption("maxLines", 30);
    editor2.setOption("minLines", 2);

-    var editor = ace.edit("editor3");
-    editor.setOptions({
-        autoScrollEditorIntoView: true,
-        maxLines: 8
-    });
-    editor.renderer.setScrollMargin(10, 10, 10, 10);
-    
    var editor = ace.edit("editor");
    editor.setTheme("ace/theme/tomorrow");
    editor.session.setMode("ace/mode/html");
--- a/demo/kitchen-sink/dev_util.js
+++ b/demo/kitchen-sink/dev_util.js
@ -39,7 +39,7 @@ function warn() {
    s.shift(); // remove the getter
    s = s.join("\n");
    // allow easy access to ace in console, but not in ace code
-    if (!/at Object.InjectedScript.|@debugger eval|snippets:\/{3}|\(<anonymous>:\d+:\d+\)/.test(s)) {
+    if (!/at Object.InjectedScript.|@debugger eval|snippets:\/{3}/.test(s)) {
        console.error("trying to access to global variable");
    }
 }
--- a/demo/kitchen-sink/docs/sqlserver.sqlserver
+++ b/demo/kitchen-sink/docs/sqlserver.sqlserver
@ -1,9 +1,9 @@
 -- =============================================
 -- Author:		Morgan Yarbrough
 -- Create date: 4/27/2015
-- Description:	Test procedure that shows off language features.
-- 				Includes non-standard folding with region comments using either
-- 				line comments or block comments (both are demonstrated below).
+-- Description:	Test Procedure that shows off language features.
+-- 				Includes non-standard folding using region comments using either
+-- 				line comments or block comments (both are demonstrated below)
 --				This mode imitates SSMS and it designed to be used with SQL Server theme.
 -- =============================================
 CREATE PROCEDURE dbo.TestProcedure
@ -11,7 +11,7 @@ CREATE PROCEDURE dbo.TestProcedure
 --#region parameters
 	@vint INT = 1
 	,@vdate DATE = NULL
-	,@vdatetime DATETIME = DATEADD(dd, 1, GETDATE())
+	,@vdatetime DATETIME = DATEADD (dd, 1, GETDATE())
 	,@vvarchar VARCHAR(MAX) = ''
 --#endregion

@ -38,8 +38,8 @@ BEGIN
 	-- another folding demonstration
 	IF @vint = 1 
 	BEGIN
-		SET @vvarchar = 'one'
-		SET @vint = DATEDIFF(dd, @vdate, @vdatetime)
+		SET @vvarchar='one'
+		SET @vint = DATEDIFFT(dd, @vdate, @vdatetime)
 	END
 	
 	-- this mode handles strings properly
@ -47,7 +47,7 @@ BEGIN
 									FROM Orders
 									WHERE @OrderDate > GETDATE()'
 								
-	-- this mode is aware of built in stored procedures 
+	-- this mode is aware of build in stored procedures 
 	EXECUTE sp_executesql @sql
 	
 	-- demonstrating some syntax highlighting
@ -60,13 +60,4 @@ BEGIN
 	WHERE CompanyName NOT LIKE '%something'
 		OR CompanyName IS NULL
 		OR CompanyName IN ('bla', 'nothing')
-		
-	-- this mode includes snippets
-	-- place your cusor at the end of the line below and trigger auto complete (Ctrl+Space)
-	createpr
-	
-	-- SQL Server allows using keywords as object names (not recommended) as long as they are wrapped in brackets
-	DATABASE -- keyword
-	[DATABASE] -- not a keyword
-	
 END
--- a/demo/static-highlighter/server.js
+++ b/demo/static-highlighter/server.js
@ -2,13 +2,15 @@
 * Simple node.js server, which generates the synax highlighted version of itself 
 * using the Ace modes and themes on the server and serving a static web page.
 */
-
+// $'
 // include ace search path and modules
 require("amd-loader");

+// load jsdom, which is required by Ace
+require("../../lib/ace/test/mockdom");
+
 var http = require("http");
 var fs = require("fs");
-var resolve = require("path").resolve;

 // load the highlighter and the desired mode and theme
 var highlighter = require("../../lib/ace/ext/static_highlight");
@ -18,22 +20,15 @@ var theme = require("../../lib/ace/theme/twilight");
 var port = process.env.PORT || 2222;

 http.createServer(function(req, res) {
-    var url = req.url;
-    var path = /[^#?\x00]*/.exec(url)[0];
-    var root = resolve(__dirname + "/../../").replace(/\\/g, "/");
-    path = resolve(root + "/" + path).replace(/\\/g, "/");
-    if (path.indexOf(root + "/") != 0)
-        path = __filename;
    res.writeHead(200, {"Content-Type": "text/html; charset=utf-8"});
-    fs.readFile(path, "utf8", function(err, data) {
-        if (err) data = err.message;
+    fs.readFile(__dirname + "/../../build/src/ace.js", "utf8", function(err, data) {
        var highlighted = highlighter.render(data, new JavaScriptMode(), theme);
        res.end(
            '<html><body>\n' +
                '<style type="text/css" media="screen">\n' +
                    highlighted.css +
                '</style>\n' + 
-                highlighted.html +
+                highlighted.html +            
            '</body></html>'
        );
    });
--- a/experiments/debug_mem_leak.html
+++ b/experiments/debug_mem_leak.html
@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <script src="../demo/kitchen-sink/require.js"></script>
-        <script type="text/javascript">
-            require.config({
-                paths: { ace: "../lib/ace" },
-                waitSeconds: 0
-            });
-        </script>
-    </head>
-    <body>
-        <p><button onclick="toggleEditor()">Toggle editor</button></p>
-
-        <div id="container"></div>
-        <script>
-            var editor;
-            var counter = 0
-
-            function toggleEditor() {
-                if (!editor) {
-                    var root = document.createElement("div");
-                    root.style.height = "100px";
-                    root.setAttribute("id", "editor");
-                    root.textContent = "function foo(items) {\nvar x = 'All this is syntax highlighted';\nreturn x;\n}";
-
-                    document.getElementById("container").appendChild(root);
-
-                    editor = ace.edit(root);
-
-                    if (counter++ % 2)
-                        editor.setTheme("ace/theme/monokai");
-                    else
-                        editor.setTheme("ace/theme/clouds");
-
-                    editor.session.setMode("ace/mode/javascript");
-                } else {
-                    editor.destroy();
-                    var el = editor.container;
-                    el.parentNode.removeChild(el);
-
-                    editor.container = null
-                    editor.renderer = null
-
-                    editor = null;
-
-                    var root = document.getElementById("editor")
-                    if (root)
-                        root.parentNode.removeChild(root);
-                }
-            }
-            require(["ace/ace"], function(ace) {
-                window.ace = ace;
-                toggleEditor();            
-            })
-        </script>
-    </body>
-</html>
--- a/lib/ace/autocomplete.js
+++ b/lib/ace/autocomplete.js
@ -100,7 +100,7 @@ var Autocomplete = function() {
            var rect = editor.container.getBoundingClientRect();
            pos.top += rect.top - renderer.layerConfig.offset;
            pos.left += rect.left - editor.renderer.scrollLeft;
-            pos.left += renderer.gutterWidth;
+            pos.left += renderer.$gutterLayer.gutterWidth;

            this.popup.show(pos, lineHeight);
        } else if (keepPopupPosition && !prefix) {
@ -142,11 +142,10 @@ var Autocomplete = function() {
        // we have to check if activeElement is a child of popup because
        // on IE preventDefault doesn't stop scrollbar from being focussed
        var el = document.activeElement;
-        var text = this.editor.textInput.getElement();
-        var fromTooltip = e.relatedTarget && e.relatedTarget == this.tooltipNode;
-        var container = this.popup && this.popup.container;
-        if (el != text && el.parentNode != container && !fromTooltip
-            && el != this.tooltipNode && e.relatedTarget != text
+        var text = this.editor.textInput.getElement()
+        if (el != text && ( !this.popup || el.parentNode != this.popup.container )
+            && el != this.tooltipNode && e.relatedTarget != this.tooltipNode
+            && e.relatedTarget != text
        ) {
            this.detach();
        }
@ -350,7 +349,7 @@ var Autocomplete = function() {
            doc = selected;

        if (typeof doc == "string")
-            doc = {docText: doc};
+            doc = {docText: doc}
        if (!doc || !(doc.docHTML || doc.docText))
            return this.hideDocTooltip();
        this.showDocTooltip(doc);
@ -417,7 +416,7 @@ Autocomplete.startCommand = {
    bindKey: "Ctrl-Space|Ctrl-Shift-Space|Alt-Space"
 };

-var FilteredList = function(array, filterText) {
+var FilteredList = function(array, filterText, mutateData) {
    this.all = array;
    this.filtered = array;
    this.filterText = filterText || "";
--- a/lib/ace/autocomplete/popup.js
+++ b/lib/ace/autocomplete/popup.js
@ -31,6 +31,7 @@
 define(function(require, exports, module) {
 "use strict";

+var EditSession = require("../edit_session").EditSession;
 var Renderer = require("../virtual_renderer").VirtualRenderer;
 var Editor = require("../editor").Editor;
 var Range = require("../range").Range;
--- a/lib/ace/background_tokenizer.js
+++ b/lib/ace/background_tokenizer.js
@ -68,10 +68,11 @@ var BackgroundTokenizer = function(tokenizer, editor) {
        var endLine = -1;
        var doc = self.doc;

-        var startLine = currentLine;
        while (self.lines[currentLine])
            currentLine++;
-        
+
+        var startLine = currentLine;
+
        var len = doc.getLength();
        var processedLines = 0;
        self.running = false;
--- a/lib/ace/background_tokenizer_test.js
+++ b/lib/ace/background_tokenizer_test.js
@ -75,49 +75,6 @@ module.exports = {
        
        forceTokenize(doc)
        testStates(doc, ["comment_regex_allowed", "start", "no_regex"])
-    },
-    "test background tokenizer sends update event" : function() {
-        var doc = new EditSession([
-            "/*",
-            "var",
-            "juhu",
-            "*/"
-        ]);
-        doc.setMode("./mode/javascript");
-        
-        var updateEvent = null;
-        doc.bgTokenizer.on("update", function(e) {
-            updateEvent = e.data;
-        });
-        function checkEvent(first, last) {
-            assert.ok(!updateEvent, "unneccessary update event");
-            doc.bgTokenizer.running = 1;
-            doc.bgTokenizer.$worker();
-            assert.ok(updateEvent);
-            assert.equal([first, last] + "", 
-                [updateEvent.first, updateEvent.last] + "")
-            updateEvent = null;
-        }
-        
-        forceTokenize(doc);
-        var comment = "comment_regex_allowed";
-        testStates(doc, [comment, comment, comment, "start"]);
-        
-        doc.remove(new Range(0,0,0,2));
-        testStates(doc, [comment, comment, comment, "start"]);
-        
-        checkEvent(0, 3);
-        testStates(doc, ["start", "no_regex", "no_regex", "regex"]);
-        
-        // insert /* and and press down several times quickly
-        doc.insert({row:0, column:0}, "/*");
-        doc.getTokens(0);
-        doc.getTokens(1);
-        doc.getTokens(2);
-        checkEvent(0, 3);
-        
-        forceTokenize(doc);
-        testStates(doc, [comment, comment, comment, "start"]);
    }
 };

--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@ -423,12 +423,6 @@ exports.commands = [{
    exec: function() {},
    passEvent: true,
    readOnly: true
-}, {
-    name: "copy",
-    exec: function(editor) {
-        // placeholder for replay macro
-    },
-    readOnly: true
 },

 // commands disabled in readOnly mode
@ -445,12 +439,6 @@ exports.commands = [{
    },
    scrollIntoView: "cursor",
    multiSelectAction: "forEach"
-}, {
-    name: "paste",
-    exec: function(editor, args) {
-        editor.$handlePaste(args);
-    },
-    scrollIntoView: "cursor"
 }, {
    name: "removeline",
    bindKey: bindKey("Ctrl-D", "Command-D"),
--- a/lib/ace/commands/incremental_search_commands.js
+++ b/lib/ace/commands/incremental_search_commands.js
@ -69,14 +69,18 @@ exports.iSearchCommands = [{
    bindKey: {win: "Ctrl-F", mac: "Command-F"},
    exec: function(iSearch) {
        iSearch.cancelSearch(true);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "searchForward",
    bindKey: {win: "Ctrl-S|Ctrl-K", mac: "Ctrl-S|Command-G"},
    exec: function(iSearch, options) {
        options.useCurrentOrPrevSearch = true;
        iSearch.next(options);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "searchBackward",
    bindKey: {win: "Ctrl-R|Ctrl-Shift-K", mac: "Ctrl-R|Command-Shift-G"},
@ -84,30 +88,42 @@ exports.iSearchCommands = [{
        options.useCurrentOrPrevSearch = true;
        options.backwards = true;
        iSearch.next(options);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "extendSearchTerm",
    exec: function(iSearch, string) {
        iSearch.addString(string);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "extendSearchTermSpace",
    bindKey: "space",
-    exec: function(iSearch) { iSearch.addString(' '); }
+    exec: function(iSearch) { iSearch.addString(' '); },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "shrinkSearchTerm",
    bindKey: "backspace",
    exec: function(iSearch) {
        iSearch.removeChar();
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'confirmSearch',
    bindKey: 'return',
-    exec: function(iSearch) { iSearch.deactivate(); }
+    exec: function(iSearch) { iSearch.deactivate(); },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'cancelSearch',
    bindKey: 'esc|Ctrl-G',
-    exec: function(iSearch) { iSearch.deactivate(true); }
+    exec: function(iSearch) { iSearch.deactivate(true); },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'occurisearch',
    bindKey: 'Ctrl-O',
@ -115,7 +131,9 @@ exports.iSearchCommands = [{
        var options = oop.mixin({}, iSearch.$options);
        iSearch.deactivate();
        occurStartCommand.exec(iSearch.$editor, options);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "yankNextWord",
    bindKey: "Ctrl-w",
@ -124,7 +142,9 @@ exports.iSearchCommands = [{
            range = ed.selection.getRangeOfMovements(function(sel) { sel.moveCursorWordRight(); }),
            string = ed.session.getTextRange(range);
        iSearch.addString(string);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "yankNextChar",
    bindKey: "Ctrl-Alt-y",
@ -133,11 +153,15 @@ exports.iSearchCommands = [{
            range = ed.selection.getRangeOfMovements(function(sel) { sel.moveCursorRight(); }),
            string = ed.session.getTextRange(range);
        iSearch.addString(string);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'recenterTopBottom',
    bindKey: 'Ctrl-l',
-    exec: function(iSearch) { iSearch.$editor.execCommand('recenterTopBottom'); }
+    exec: function(iSearch) { iSearch.$editor.execCommand('recenterTopBottom'); },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'selectAllMatches',
    bindKey: 'Ctrl-space',
@ -149,19 +173,18 @@ exports.iSearchCommands = [{
                    return ranges.concat(ea ? ea : []); }, []) : [];
        iSearch.deactivate(false);
        ranges.forEach(ed.selection.addRange.bind(ed.selection));
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'searchAsRegExp',
    bindKey: 'Alt-r',
    exec: function(iSearch) {
        iSearch.convertNeedleToRegExp();
-    }
-}].map(function(cmd) {
-    cmd.readOnly = true;
-    cmd.isIncrementalSearchCommand = true;
-    cmd.scrollIntoView = "animate-cursor";
-    return cmd;
-});
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
+}];

 function IncrementalSearchKeyboardHandler(iSearch) {
    this.$iSearch = iSearch;
@ -169,7 +192,7 @@ function IncrementalSearchKeyboardHandler(iSearch) {

 oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);

-(function() {
+;(function() {

    this.attach = function(editor) {
        var iSearch = this.$iSearch;
@ -178,19 +201,15 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
            if (!e.command.isIncrementalSearchCommand) return undefined;
            e.stopPropagation();
            e.preventDefault();
-            var scrollTop = editor.session.getScrollTop();
-            var result = e.command.exec(iSearch, e.args || {});
-            editor.renderer.scrollCursorIntoView(null, 0.5);
-            editor.renderer.animateScrolling(scrollTop);
-            return result;
+            return e.command.exec(iSearch, e.args || {});
        });
-    };
+    }

    this.detach = function(editor) {
        if (!this.$commandExecHandler) return;
        editor.commands.removeEventListener('exec', this.$commandExecHandler);
        delete this.$commandExecHandler;
-    };
+    }

    var handleKeyboard$super = this.handleKeyboard;
    this.handleKeyboard = function(data, hashId, key, keyCode) {
@ -203,7 +222,7 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
            if (extendCmd) { return {command: extendCmd, args: key}; }
        }
        return {command: "null", passEvent: hashId == 0 || hashId == 4};
-    };
+    }

 }).call(IncrementalSearchKeyboardHandler.prototype);

--- a/lib/ace/config.js
+++ b/lib/ace/config.js
@ -39,7 +39,7 @@ var AppConfig = require("./lib/app_config").AppConfig;
 module.exports = exports = new AppConfig();

 var global = (function() {
-    return this || typeof window != "undefined" && window;
+    return this;
 })();

 var options = {
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@ -422,30 +422,3 @@
    position: absolute;
    z-index: 8;
 }
-
-/*
-styles = []
-for (var i = 1; i < 16; i++) {
-    styles.push(".ace_br" + i + "{" + (
-        ["top-left", "top-right", "bottom-right", "bottom-left"]
-    ).map(function(x, j) {
-        return i & (1<<j) ? "border-" + x + "-radius: 3px;" : "" 
-    }).filter(Boolean).join(" ") + "}")
-}
-styles.join("\n")
-*/
-.ace_br1 {border-top-left-radius    : 3px;}
-.ace_br2 {border-top-right-radius   : 3px;}
-.ace_br3 {border-top-left-radius    : 3px; border-top-right-radius:    3px;}
-.ace_br4 {border-bottom-right-radius: 3px;}
-.ace_br5 {border-top-left-radius    : 3px; border-bottom-right-radius: 3px;}
-.ace_br6 {border-top-right-radius   : 3px; border-bottom-right-radius: 3px;}
-.ace_br7 {border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px;}
-.ace_br8 {border-bottom-left-radius : 3px;}
-.ace_br9 {border-top-left-radius    : 3px; border-bottom-left-radius:  3px;}
-.ace_br10{border-top-right-radius   : 3px; border-bottom-left-radius:  3px;}
-.ace_br11{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-left-radius:  3px;}
-.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}
-.ace_br13{border-top-left-radius    : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}
-.ace_br14{border-top-right-radius   : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}
-.ace_br15{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@ -151,7 +151,7 @@ var EditSession = function(text, mode) {
    this.$foldData = [];
    this.$foldData.toString = function() {
        return this.join("\n");
-    };
+    }
    this.on("changeFold", this.onChangeFold.bind(this));
    this.$onChange = this.onChange.bind(this);

@ -678,10 +678,10 @@ var EditSession = function(text, mode) {
    };

    /**
-    * Returns an object containing all of the markers, either front or back.
+    * Returns an array containing the IDs of all the markers, either front or back.
    * @param {Boolean} inFront If `true`, indicates you only want front markers; `false` indicates only back markers
    *
-    * @returns {Object}
+    * @returns {Array}
    **/
    this.getMarkers = function(inFront) {
        return inFront ? this.$frontMarkers : this.$backMarkers;
--- a/lib/ace/edit_session/bracket_match.js
+++ b/lib/ace/edit_session/bracket_match.js
@ -117,7 +117,7 @@ function BracketMatch() {
            typeRe = new RegExp(
                "(\\.?" +
                token.type.replace(".", "\\.").replace("rparen", ".paren")
-                    .replace(/\b(?:end)\b/, "(?:start|begin|end)")
+                    .replace(/\b(?:end|start|begin)\b/, "")
                + ")+"
            );
        }
@ -174,7 +174,7 @@ function BracketMatch() {
            typeRe = new RegExp(
                "(\\.?" +
                token.type.replace(".", "\\.").replace("lparen", ".paren")
-                    .replace(/\b(?:start|begin)\b/, "(?:start|begin|end)")
+                    .replace(/\b(?:end|start|begin)\b/, "")
                + ")+"
            );
        }
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@ -162,12 +162,8 @@ var Editor = function(renderer, session) {
            var command = this.curOp.command;
            if (command.name && this.$blockScrolling > 0)
                this.$blockScrolling--;
-            var scrollIntoView = command && command.scrollIntoView;
-            if (scrollIntoView) {
-                switch (scrollIntoView) {
-                    case "center-animate":
-                        scrollIntoView = "animate";
-                        /* fall through */
+            if (command && command.scrollIntoView) {
+                switch (command.scrollIntoView) {
                    case "center":
                        this.renderer.scrollCursorIntoView(null, 0.5);
                        break;
@ -185,7 +181,7 @@ var Editor = function(renderer, session) {
                    default:
                        break;
                }
-                if (scrollIntoView == "animate")
+                if (command.scrollIntoView == "animate")
                    this.renderer.animateScrolling(this.curOp.scrollTop);
            }
            
@ -278,10 +274,6 @@ var Editor = function(renderer, session) {
    this.setSession = function(session) {
        if (this.session == session)
            return;
-        
-        // make sure operationEnd events are not emitted to wrong session
-        if (this.curOp) this.endOperation();
-        this.curOp = {};

        var oldSession = this.session;
        if (oldSession) {
@ -381,8 +373,6 @@ var Editor = function(renderer, session) {
            oldSession: oldSession
        });
        
-        this.curOp = null;
-        
        oldSession && oldSession._signal("changeEditor", {oldEditor: this});
        session && session._signal("changeEditor", {editor: this});
    };
@ -915,16 +905,14 @@ var Editor = function(renderer, session) {
     *
     *
     **/
-    this.onPaste = function(text, event) {
-        var e = {text: text, event: event};
-        this.commands.exec("paste", this, e);
-    };
-    
-    this.$handlePaste = function(e) {
-        if (typeof e == "string") 
-            e = {text: e};
+    this.onPaste = function(text) {
+        // todo this should change when paste becomes a command
+        if (this.$readOnly)
+            return;
+
+        var e = {text: text};
        this._signal("paste", e);
-        var text = e.text;
+        text = e.text;
        if (!this.inMultiSelectMode || this.inVirtualSelectionMode) {
            this.insert(text);
        } else {
@ -942,6 +930,7 @@ var Editor = function(renderer, session) {
                this.session.insert(range.start, lines[i]);
            }
        }
+        this.renderer.scrollCursorIntoView();
    };

    this.execCommand = function(command, args) {
--- a/lib/ace/ext/emmet.js
+++ b/lib/ace/ext/emmet.js
@ -393,7 +393,7 @@ exports.updateCommands = function(editor, enabled) {
 };

 exports.isSupportedMode = function(modeId) {
-    return modeId && /css|less|scss|sass|stylus|html|php|twig|ejs|handlebars/.test(modeId);
+    return modeId && /css|less|scss|sass|stylus|html|php|twig|ejs/.test(modeId);
 };

 var onChangeMode = function(e, target) {
--- a/lib/ace/ext/language_tools.js
+++ b/lib/ace/ext/language_tools.js
@ -155,6 +155,7 @@ function getCompletionPrefix(editor) {

 var doLiveAutocomplete = function(e) {
    var editor = e.editor;
+    var text = e.args || "";
    var hasCompleter = editor.completer && editor.completer.activated;

    // We don't want to autocomplete with no prefix
--- a/lib/ace/ext/modelist.js
+++ b/lib/ace/ext/modelist.js
@ -117,13 +117,12 @@ var supportedModes = {
    MUSHCode:    ["mc|mush"],
    MySQL:       ["mysql"],
    Nix:         ["nix"],
-    Nim:         ["nim"],
    ObjectiveC:  ["m|mm"],
    OCaml:       ["ml|mli"],
    Pascal:      ["pas|p"],
    Perl:        ["pl|pm"],
    pgSQL:       ["pgsql"],
-    PHP:         ["php|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp"],
+    PHP:         ["php|phtml"],
    Powershell:  ["ps1"],
    Praat:       ["praat|praatscript|psc|proc"],
    Prolog:      ["plg|prolog"],
--- a/lib/ace/ext/static_highlight.js
+++ b/lib/ace/ext/static_highlight.js
@ -37,10 +37,6 @@ var baseStyles = require("../requirejs/text!./static.css");
 var config = require("../config");
 var dom = require("../lib/dom");

-var SimpleTextLayer = function() {
-    this.config = {};
-};
-SimpleTextLayer.prototype = TextLayer.prototype;

 var highlight = function(el, opts, callback) {
    var m = el.className.match(/lang-(\w+)/);
@ -153,8 +149,12 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) {
    session.setUseWorker(false);
    session.setMode(mode);

-    var textLayer = new SimpleTextLayer();
+    var textLayer = new TextLayer(document.createElement("div"));
    textLayer.setSession(session);
+    textLayer.config = {
+        characterWidth: 10,
+        lineHeight: 20
+    };

    session.setValue(input);

--- a/lib/ace/ext/themelist.js
+++ b/lib/ace/ext/themelist.js
@ -73,7 +73,6 @@ var themeData = [
    ["Solarized Dark"       ,"solarized_dark"          ,  "dark"],
    ["Terminal"             ,"terminal"                ,  "dark"],
    ["Tomorrow Night"       ,"tomorrow_night"          ,  "dark"],
-    ["The Night After Tomorrow"       ,"the_night_after_tomorrow"          ,  "dark"],
    ["Tomorrow Night Blue"  ,"tomorrow_night_blue"     ,  "dark"],
    ["Tomorrow Night Bright","tomorrow_night_bright"   ,  "dark"],
    ["Tomorrow Night 80s"   ,"tomorrow_night_eighties" ,  "dark"],
--- a/lib/ace/incremental_search.js
+++ b/lib/ace/incremental_search.js
@ -105,7 +105,7 @@ function objectToRegExp(obj) {
        this.$mousedownHandler = ed.addEventListener('mousedown', this.onMouseDown.bind(this));
        this.selectionFix(ed);
        this.statusMessage(true);
-    };
+    }

    this.deactivate = function(reset) {
        this.cancelSearch(reset);
@ -117,7 +117,7 @@ function objectToRegExp(obj) {
        }
        ed.onPaste = this.$originalEditorOnPaste;
        this.message('');
-    };
+    }

    this.selectionFix = function(editor) {
        // Fix selection bug: When clicked inside the editor
@ -128,7 +128,7 @@ function objectToRegExp(obj) {
        if (editor.selection.isEmpty() && !editor.session.$emacsMark) {
            editor.clearSelection();
        }
-    };
+    }

    this.highlight = function(regexp) {
        var sess = this.$editor.session,
@ -136,7 +136,7 @@ function objectToRegExp(obj) {
                new SearchHighlight(null, "ace_isearch-result", "text"));
        hl.setRegexp(regexp);
        sess._emit("changeBackMarker"); // force highlight layer redraw
-    };
+    }

    this.cancelSearch = function(reset) {
        var e = this.$editor;
@ -150,7 +150,7 @@ function objectToRegExp(obj) {
        }
        this.highlight(null);
        return Range.fromPoints(this.$currentPos, this.$currentPos);
-    };
+    }

    this.highlightAndFindWithNeedle = function(moveToNext, needleUpdateFunc) {
        if (!this.$editor) return null;
@ -163,7 +163,7 @@ function objectToRegExp(obj) {
        if (options.needle.length === 0) {
            this.statusMessage(true);
            return this.cancelSearch(true);
-        }
+        };

        // try to find the next occurence and enable  highlighting marker
        options.start = this.$currentPos;
@ -176,13 +176,13 @@ function objectToRegExp(obj) {
            this.$editor.selection.setRange(Range.fromPoints(shouldSelect ? this.$startPos : found.end, found.end));
            if (moveToNext) this.$currentPos = found.end;
            // highlight after cursor move, so selection works properly
-            this.highlight(options.re);
+            this.highlight(options.re)
        }

        this.statusMessage(found);

        return found;
-    };
+    }

    this.addString = function(s) {
        return this.highlightAndFindWithNeedle(false, function(needle) {
@ -192,7 +192,7 @@ function objectToRegExp(obj) {
            reObj.expression += s;
            return objectToRegExp(reObj);
        });
-    };
+    }

    this.removeChar = function(c) {
        return this.highlightAndFindWithNeedle(false, function(needle) {
@ -202,7 +202,7 @@ function objectToRegExp(obj) {
            reObj.expression = reObj.expression.substring(0, reObj.expression.length-1);
            return objectToRegExp(reObj);
        });
-    };
+    }

    this.next = function(options) {
        // try to find the next occurence of whatever we have searched for
@ -215,29 +215,29 @@ function objectToRegExp(obj) {
            return options.useCurrentOrPrevSearch && needle.length === 0 ?
                this.$prevNeedle || '' : needle;
        });
-    };
+    }

    this.onMouseDown = function(evt) {
        // when mouse interaction happens then we quit incremental search
        this.deactivate();
        return true;
-    };
+    }

    this.onPaste = function(text) {
        this.addString(text);
-    };
+    }

    this.convertNeedleToRegExp = function() {
        return this.highlightAndFindWithNeedle(false, function(needle) {
            return isRegExp(needle) ? needle : stringToRegExp(needle, 'ig');
        });
-    };
+    }

    this.convertNeedleToString = function() {
        return this.highlightAndFindWithNeedle(false, function(needle) {
            return isRegExp(needle) ? regExpToObject(needle).expression : needle;
        });
-    };
+    }

    this.statusMessage = function(found) {
        var options = this.$options, msg = '';
@ -245,7 +245,7 @@ function objectToRegExp(obj) {
        msg += 'isearch: ' + options.needle;
        msg += found ? '' : ' (not found)';
        this.message(msg);
-    };
+    }

    this.message = function(msg) {
        if (this.$editor.showCommandLine) {
@ -254,7 +254,7 @@ function objectToRegExp(obj) {
        } else {
            console.log(msg);
        }
-    };
+    }

 }).call(IncrementalSearch.prototype);

--- a/lib/ace/keyboard/emacs.js
+++ b/lib/ace/keyboard/emacs.js
@ -428,7 +428,7 @@ exports.emacsKeys = {
    "M-;": "togglecomment",

    "C-/|C-x u|S-C--|C-z": "undo",
-    "S-C-/|S-C-x u|C--|S-C-z": "redo", // infinite undo?
+    "S-C-/|S-C-x u|C--|S-C-z": "redo", //infinite undo?
    // vertical editing
    "C-x r":  "selectRectangularRegion",
    "M-x": {command: "focusCommandLine", args: "M-x "}
@ -483,7 +483,7 @@ exports.handler.addCommands({
            // different. Deactivate the mark when setMark is run with active
            // mark
            if (transientMarkModeActive && (mark || !hasNoSelection)) {
-                if (editor.inMultiSelectMode) editor.forEachSelection({exec: editor.clearSelection.bind(editor)});
+                if (editor.inMultiSelectMode) editor.forEachSelection({exec: editor.clearSelection.bind(editor)})
                else editor.clearSelection();
                if (mark) editor.pushEmacsMark(null);
                return;
--- a/lib/ace/keyboard/hash_handler.js
+++ b/lib/ace/keyboard/hash_handler.js
@ -87,12 +87,9 @@ MultiHashHandler.prototype = HashHandler.prototype;
        }
    };

-    this.bindKey = function(key, command, position) {
-        if (typeof key == "object") {
-            if (position == undefined)
-                position = key.position;
+    this.bindKey = function(key, command, asDefault) {
+        if (typeof key == "object")
            key = key[this.platform];
-        }
        if (!key)
            return;
        if (typeof command == "function")
@ -113,15 +110,11 @@ MultiHashHandler.prototype = HashHandler.prototype;
            }
            var binding = this.parseKeys(keyPart);
            var id = KEY_MODS[binding.hashId] + binding.key;
-            this._addCommandToBinding(chain + id, command, position);
+            this._addCommandToBinding(chain + id, command, asDefault);
        }, this);
    };
    
-    function getPosition(command) {
-        return typeof command == "object" && command.bindKey
-            && command.bindKey.position || 0;
-    }
-    this._addCommandToBinding = function(keyId, command, position) {
+    this._addCommandToBinding = function(keyId, command, asDefault) {
        var ckb = this.commandKeyBinding, i;
        if (!command) {
            delete ckb[keyId];
@ -133,21 +126,11 @@ MultiHashHandler.prototype = HashHandler.prototype;
            } else if ((i = ckb[keyId].indexOf(command)) != -1) {
                ckb[keyId].splice(i, 1);
            }
-
-            if (typeof position != "number") {
-                if (position || command.isDefault)
-                    position = -100;
-                else
-                   position = getPosition(command);
-            }
-            var commands = ckb[keyId];
-            for (i = 0; i < commands.length; i++) {
-                var other = commands[i];
-                var otherPos = getPosition(other);
-                if (otherPos > position)
-                    break;
-            }
-            commands.splice(i, 0, command);
+            
+            if (asDefault || command.isDefault)
+                ckb[keyId].unshift(command);
+            else
+                ckb[keyId].push(command);
        }
    };

@ -236,18 +219,10 @@ MultiHashHandler.prototype = HashHandler.prototype;
            }
        }
        
-        if (data.$keyChain) {
-            if ((!hashId || hashId == 4) && keyString.length == 1)
-                data.$keyChain = data.$keyChain.slice(0, -key.length - 1); // wait for input
-            else if (hashId == -1 || keyCode > 0)
-                data.$keyChain = ""; // reset keyChain
-        }
+        if (data.$keyChain && keyCode > 0)
+            data.$keyChain = "";
        return {command: command};
    };
-    
-    this.getStatusText = function(editor, data) {
-        return data.$keyChain || "";
-    };

 }).call(HashHandler.prototype);

--- a/lib/ace/keyboard/textinput.js
+++ b/lib/ace/keyboard/textinput.js
@ -306,7 +306,7 @@ var TextInput = function(parentNode, host) {
        var data = handleClipboardData(e);
        if (typeof data == "string") {
            if (data)
-                host.onPaste(data, e);
+                host.onPaste(data);
            if (useragent.isIE)
                setTimeout(resetSelection);
            event.preventDefault(e);
--- a/lib/ace/keyboard/vim.js
+++ b/lib/ace/keyboard/vim.js
@ -257,7 +257,6 @@ define(function(require, exports, module) {
    }
    if (!this.ace.inVirtualSelectionMode)
      this.ace.exitMultiSelectMode();
-    this.ace.session.unfold({row: line, column: ch});
    this.ace.selection.moveTo(line, ch);
  };
  this.getCursor = function(p) {
@ -730,14 +729,10 @@ CodeMirror.defineExtension = function(name, fn) {
  CodeMirror.prototype[name] = fn;
 };
 dom.importCssString(".normal-mode .ace_cursor{\
-  border: 1px solid red;\
+  border: 0!important;\
  background-color: red;\
  opacity: 0.5;\
-}\
-.normal-mode .ace_hidden-cursors .ace_cursor{\
-  background-color: transparent;\
-}\
-.ace_dialog {\
+}.ace_dialog {\
  position: absolute;\
  left: 0; right: 0;\
  background: white;\
@ -763,6 +758,23 @@ dom.importCssString(".normal-mode .ace_cursor{\
  font-family: monospace;\
 }", "vimMode");
 (function() {
+  function dialogDiv(cm, template, bottom) {
+    var wrap = cm.ace.container;
+    var dialog;
+    dialog = wrap.appendChild(document.createElement("div"));
+    if (bottom)
+      dialog.className = "ace_dialog ace_dialog-bottom";
+    else
+      dialog.className = "ace_dialog ace_dialog-top";
+
+    if (typeof template == "string") {
+      dialog.innerHTML = template;
+    } else { // Assuming it's a detached DOM element.
+      dialog.appendChild(template);
+    }
+    return dialog;
+  }
+
  function closeNotification(cm, newVal) {
    if (cm.state.currentNotificationClose)
      cm.state.currentNotificationClose();
@ -2184,8 +2196,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
            return;
          }
          if (motionArgs.toJumplist) {
-            if (!operator)
-              cm.ace.curOp.command.scrollIntoView = "center-animate"; // ace patch
            var jumpList = vimGlobalState.jumpList;
            // if the current motion is # or *, use cachedCursor
            var cachedCursor = jumpList.cachedCursor;
@ -2872,7 +2882,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
        var markPos = mark ? mark.find() : undefined;
        markPos = markPos ? markPos : cm.getCursor();
        cm.setCursor(markPos);
-        cm.ace.curOp.command.scrollIntoView = "center-animate"; // ace patch
      },
      scroll: function(cm, actionArgs, vim) {
        if (vim.visualMode) {
@ -5923,7 +5932,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
      }, true);
    }
    return isHandled;
-  }
+  };
  exports.CodeMirror = CodeMirror;
  var getVim = Vim.maybeInitVimState_;
  exports.handler = {
@ -5937,9 +5946,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
      if (!vim.insertMode) {
        var isbackwards = !sel.cursor 
            ? session.selection.isBackwards() || session.selection.isEmpty()
-            : Range.comparePoints(sel.cursor, sel.start) <= 0;
+            : Range.comparePoints(sel.cursor, sel.start) <= 0
        if (!isbackwards && left > w)
-          left -= w;
+          left -= w
      }     
      if (!vim.insertMode && vim.status) {
        h = h / 2;
@ -6103,13 +6112,13 @@ dom.importCssString(".normal-mode .ace_cursor{\
  };
  var renderVirtualNumbers = {
    getText: function(session, row) {
-      return (Math.abs(session.selection.lead.row - row)  || (row + 1 + (row < 9? "\xb7" : "" ))) + "";
+      return (Math.abs(session.selection.lead.row - row)  || (row + 1 + (row < 9? "\xb7" : "" ))) + ""
    },
    getWidth: function(session, lastLineNumber, config) {
      return session.getLength().toString().length * config.characterWidth;
    },
    update: function(e, editor) {
-      editor.renderer.$loop.schedule(editor.renderer.CHANGE_GUTTER);
+      editor.renderer.$loop.schedule(editor.renderer.CHANGE_GUTTER)
    },
    attach: function(editor) {
      editor.renderer.$gutterLayer.$renderer = this;
@ -6154,7 +6163,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
    if (cm.ace.inVirtualSelectionMode)
      cm.ace.on("beforeEndOperation", delayedExecAceCommand);
    else
-      delayedExecAceCommand(null, cm.ace);
+      delayedExecAceCommand(null, cm.ace)
  };
  function delayedExecAceCommand(op, ace) {
    ace.off("beforeEndOperation", delayedExecAceCommand);
@ -6173,5 +6182,5 @@ dom.importCssString(".normal-mode .ace_cursor{\
  exports.handler.actions = actions;
  exports.Vim = Vim;
  
-  Vim.map("Y", "yy", "normal");
+  Vim.map("Y", "yy");
 });
--- a/lib/ace/layer/font_metrics.js
+++ b/lib/ace/layer/font_metrics.js
@ -120,9 +120,9 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) {
    this.setPolling = function(val) {
        if (val) {
            this.$pollSizeChanges();
-        } else if (this.$pollSizeChangesTimer) {
-            clearInterval(this.$pollSizeChangesTimer);
-            this.$pollSizeChangesTimer = 0;
+        } else {
+            if (this.$pollSizeChangesTimer)
+                this.$pollSizeChangesTimer;
        }
    };

--- a/lib/ace/layer/marker.js
+++ b/lib/ace/layer/marker.js
@ -90,7 +90,7 @@ var Marker = function(parentEl) {
                else
                    this.drawMultiLineMarker(html, range, marker.clazz, config);
            } else {
-                this.drawSingleLineMarker(html, range, marker.clazz + " ace_start" + " ace_br15", config);
+                this.drawSingleLineMarker(html, range, marker.clazz + " ace_start", config);
            }
        }
        this.element.innerHTML = html.join("");
@ -100,30 +100,29 @@ var Marker = function(parentEl) {
        return (row - layerConfig.firstRowScreen) * layerConfig.lineHeight;
    };

-    function getBorderClass(tl, tr, br, bl) {
-        return (tl ? 1 : 0) | (tr ? 2 : 0) | (br ? 4 : 0) | (bl ? 8 : 0);
-    }
    // Draws a marker, which spans a range of text on multiple lines 
    this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig, extraStyle) {
+        // selection start
+        var row = range.start.row;
        var session = this.session;
-        var start = range.start.row;
-        var end = range.end.row;
-        var row = start;
-        var prev = 0; 
-        var curr = 0;
-        var next = session.getScreenLastRowColumn(row);
-        var lineRange = new Range(row, range.start.column, row, curr);
-        for (; row <= end; row++) {
-            lineRange.start.row = lineRange.end.row = row;
-            lineRange.start.column = row == start ? range.start.column : session.getRowWrapIndent(row);
-            lineRange.end.column = next;
-            prev = curr;
-            curr = next;
-            next = row + 1 < end ? session.getScreenLastRowColumn(row + 1) : row == end ? 0 : range.end.column;
-            this.drawSingleLineMarker(stringBuilder, lineRange, 
-                clazz + (row == start  ? " ace_start" : "") + " ace_br"
-                    + getBorderClass(row == start || row == start + 1 && range.start.column, prev < curr, curr > next, row == end),
-                layerConfig, row == end ? 0 : 1, extraStyle);
+
+        var lineRange = new Range(
+            row, range.start.column,
+            row, session.getScreenLastRowColumn(row)
+        );
+        this.drawSingleLineMarker(stringBuilder, lineRange, clazz + " ace_start", layerConfig, 1, extraStyle);
+
+        // selection end
+        row = range.end.row;
+        lineRange = new Range(row, session.getRowWrapIndent(row), row, range.end.column);
+        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 0, extraStyle);
+
+        for (row = range.start.row + 1; row < range.end.row; row++) {
+            lineRange.start.row = row;
+            lineRange.start.column = session.getRowWrapIndent(row);
+            lineRange.end.row = row;
+            lineRange.end.column = session.getScreenLastRowColumn(row);
+            this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, extraStyle);
        }
    };

@ -137,7 +136,7 @@ var Marker = function(parentEl) {
        extraStyle = extraStyle || "";

        stringBuilder.push(
-            "<div class='", clazz, " ace_br1 ace_start' style='",
+            "<div class='", clazz, " ace_start' style='",
            "height:", height, "px;",
            "right:0;",
            "top:", top, "px;",
@ -149,7 +148,7 @@ var Marker = function(parentEl) {
        var width = range.end.column * config.characterWidth;

        stringBuilder.push(
-            "<div class='", clazz, " ace_br12' style='",
+            "<div class='", clazz, "' style='",
            "height:", height, "px;",
            "width:", width, "px;",
            "top:", top, "px;",
@ -161,11 +160,9 @@ var Marker = function(parentEl) {
        if (height <= 0)
            return;
        top = this.$getTop(range.start.row + 1, config);
-        
-        var radiusClass = (range.start.column ? 1 : 0) | (range.end.column ? 0 : 8);

        stringBuilder.push(
-            "<div class='", clazz, (radiusClass ? " ace_br" + radiusClass : ""), "' style='",
+            "<div class='", clazz, "' style='",
            "height:", height, "px;",
            "right:0;",
            "top:", top, "px;",
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@ -52,7 +52,7 @@ var Text = function(parentEl) {
    this.EOL_CHAR_LF = "\xAC";
    this.EOL_CHAR_CRLF = "\xa4";
    this.EOL_CHAR = this.EOL_CHAR_LF;
-    this.TAB_CHAR = "\u2014"; //"\u21E5";
+    this.TAB_CHAR = "\u2192"; //"\u21E5";
    this.SPACE_CHAR = "\xB7";
    this.$padding = 0;

@ -128,7 +128,8 @@ var Text = function(parentEl) {
        for (var i = 1; i < tabSize + 1; i++) {
            if (this.showInvisibles) {
                tabStr.push("<span class='ace_invisible ace_invisible_tab'>"
-                    + lang.stringRepeat(this.TAB_CHAR, i)
+                    + this.TAB_CHAR
+                    + lang.stringRepeat(" ", i - 1)
                    + "</span>");
            } else {
                tabStr.push(lang.stringRepeat(" ", i));
@ -144,7 +145,7 @@ var Text = function(parentEl) {
                spaceClass = " ace_invisible_space";
                tabClass = " ace_invisible_tab";
                var spaceContent = lang.stringRepeat(this.SPACE_CHAR, this.tabSize);
-                var tabContent = lang.stringRepeat(this.TAB_CHAR, this.tabSize);
+                var tabContent = this.TAB_CHAR + lang.stringRepeat(" ", this.tabSize - 1);
            } else{
                var spaceContent = lang.stringRepeat(" ", this.tabSize);
                var tabContent = spaceContent;
--- a/lib/ace/layer/text_test.js
+++ b/lib/ace/layer/text_test.js
@ -91,7 +91,7 @@ module.exports = {
        var EOL = "<span class='ace_invisible ace_invisible_eol'>" + textLayer.EOL_CHAR + "</span>";
        var SPACE = function(i) {return Array(i+1).join(" ")}
        var DOT = function(i) {return Array(i+1).join(textLayer.SPACE_CHAR)}
-        var TAB = function(i) {return Array(i+1).join(textLayer.TAB_CHAR)}
+        var TAB = function(i) {return textLayer.TAB_CHAR + SPACE(i-1)}
        function testRender(results) {
            for (var i = results.length; i--; ) {
                var stringBuilder = [];
--- a/lib/ace/lib/dom.js
+++ b/lib/ace/lib/dom.js
@ -91,11 +91,6 @@ exports.toggleCssClass = function(el, name) {
    return add;
 };

-if (typeof document == "undefined") {
-    exports.importCssString = function() {};
-    return;
-}
-
 /*
 * Add or remove a CSS class from the list of classes on the given node
 * depending on the value of <tt>include</tt>
@ -178,6 +173,9 @@ exports.getInnerHeight = function(element) {
 };


+if (typeof document == "undefined")
+    return;
+
 if (window.pageYOffset !== undefined) {
    exports.getPageScrollTop = function() {
        return window.pageYOffset;
--- a/lib/ace/lib/event.js
+++ b/lib/ace/lib/event.js
@ -244,7 +244,7 @@ function normalizeCommandKeys(callback, e, keyCode) {
                if (pressedKeys[keyCode] == 1)
                    ts = e.timeStamp;
            } else if (keyCode === 18 && hashId === 3 && location === 2) {
-                var dt = e.timeStamp - ts;
+                var dt = e.timestamp - ts;
                if (dt < 50)
                    pressedKeys.altGr = true;
            }
@ -326,14 +326,13 @@ exports.addCommandKeyListener = function(el, callback) {
        });

        if (!pressedKeys) {
-            resetPressedKeys();
-            addListener(window, "focus", resetPressedKeys);
+            pressedKeys = Object.create(null);
+            addListener(window, "focus", function(e) {
+                pressedKeys = Object.create(null);
+            });
        }
    }
 };
-function resetPressedKeys(e) {
-    pressedKeys = Object.create(null);
-}

 if (window.postMessage && !useragent.isOldIE) {
    var postMessageId = 1;
--- a/lib/ace/mode/_test/tokens_gherkin.json
+++ b/lib/ace/mode/_test/tokens_gherkin.json
@ -56,34 +56,34 @@
 ],[
   "start",
  ["text","      "],
-  ["comment","|"],
-  ["string"," start "],
-  ["comment","|"],
-  ["string"," eat "],
-  ["comment","|"],
-  ["string"," left "],
+  ["comment","| "],
+  ["string","start "],
+  ["comment","| "],
+  ["string","eat "],
+  ["comment","| "],
+  ["string","left "],
  ["comment","|"]
 ],[
   "start",
  ["text","      "],
-  ["comment","|"],
-  ["string","  12   "],
-  ["comment","|"],
-  ["string","  5  "],
-  ["comment","|"],
-  ["string","  7   "],
+  ["comment","| "],
+  ["string"," 12   "],
+  ["comment","| "],
+  ["string"," 5  "],
+  ["comment","| "],
+  ["string"," 7   "],
  ["comment","|"]
 ],[
   "start",
  ["text","      "],
-  ["comment","|"],
-  ["string","  20   "],
-  ["comment","|"],
-  ["string","  5  "],
-  ["comment","|"],
-  ["string","  15  "],
-  ["comment","|"],
-  ["string","    "]
+  ["comment","| "],
+  ["string"," 20   "],
+  ["comment","| "],
+  ["string"," 5  "],
+  ["comment","| "],
+  ["string"," 15  "],
+  ["comment","| "],
+  ["string","   "]
 ],[
   "start"
 ],[
--- a/lib/ace/mode/_test/tokens_rust.json
+++ b/lib/ace/mode/_test/tokens_rust.json
@ -10,9 +10,10 @@
 ],[
   "start",
  ["keyword.source.rust","fn"],
-  ["text"," "],
+  ["meta.function.source.rust"," "],
  ["entity.name.function.source.rust","main"],
-  ["text","() {"]
+  ["meta.function.source.rust","("],
+  ["text",") {"]
 ],[
   "start",
  ["text","    "],
@ -87,14 +88,10 @@
 ],[
   "start",
  ["keyword.source.rust","fn"],
-  ["text"," "],
-  ["entity.name.function.source.rust","map"],
-  ["keyword.operator","<"],
-  ["text","T"],
-  ["keyword.operator",","],
-  ["text"," U"],
-  ["keyword.operator",">"],
-  ["text","(vector: &[T]"],
+  ["meta.function.source.rust"," "],
+  ["entity.name.function.source.rust","map<T, U>"],
+  ["meta.function.source.rust","("],
+  ["text","vector: &[T]"],
  ["keyword.operator",","],
  ["text"," function: &fn(v: &T) "],
  ["keyword.operator","->"],
--- a/lib/ace/mode/behaviour/behaviour_test.js
+++ b/lib/ace/mode/behaviour/behaviour_test.js
@ -144,16 +144,6 @@ module.exports = {
        exec("selectleft", 1);
        exec("insertstring", 1, '"');
        assert.equal(editor.getValue(), '("foo")');
-        
-        editor.setValue("", 1);
-        exec("selectleft", 1);
-        exec("insertstring", 1, '"');
-        assert.equal(editor.getValue(), '""');
-        exec("insertstring", 1, '\\');
-        exec("insertstring", 1, 'n');
-        exec("insertstring", 1, '"');
-        assert.equal(editor.getValue(), '"\\n"');
-        
    },
    "test: xml": function() {
        editor = new Editor(new MockRenderer());
--- a/lib/ace/mode/behaviour/cstyle.js
+++ b/lib/ace/mode/behaviour/cstyle.js
@ -269,8 +269,8 @@ var CstyleBehaviour = function() {
                if (leftChar == "\\" && token && /escape/.test(token.type))
                    return null;
                
-                var stringBefore = token && /string|escape/.test(token.type);
-                var stringAfter = !rightToken || /string|escape/.test(rightToken.type);
+                var stringBefore = token && /string/.test(token.type);
+                var stringAfter = !rightToken || /string/.test(rightToken.type);
                
                var pair;
                if (rightChar == quote) {
--- a/lib/ace/mode/gherkin_highlight_rules.js
+++ b/lib/ace/mode/gherkin_highlight_rules.js
@ -36,18 +36,18 @@ var stringEscape =  "\\\\(x[0-9A-Fa-f]{2}|[0-7]{3}|[\\\\abfnrtv'\"]|U[0-9A-Fa-f]

 var GherkinHighlightRules = function() {

-    // need to include constant ints
+	// need to include constant ints
    this.$rules = {
-        start : [{
+    	start : [{
            token: 'constant.numeric',
            regex: "(?:(?:[1-9]\\d*)|(?:0))"
-        }, {
-            token : "comment",
-            regex : "#.*$"
-        }, {
-            token : "keyword",
-            regex : "Feature:|Background:|Scenario:|Scenario\ Outline:|Examples:|Given|When|Then|And|But|\\*",
-        }, {
+ 		}, {
+    		token : "comment",
+    		regex : "#.*$"
+    	}, {
+    		token : "keyword",
+    		regex : "Feature:|Background:|Scenario:|Scenario\ Outline:|Examples:|Given|When|Then|And|But|\\*",
+    	}, {
            token : "string",           // multi line """ string start
            regex : '"{3}',
            next : "qqstring3"
@ -56,22 +56,22 @@ var GherkinHighlightRules = function() {
            regex : '"',
            next : "qqstring"
        }, {
-            token : "comment",
-            regex : "@[A-Za-z0-9]+",
-            next : "start"
+        	token : "comment",
+        	regex : "@[A-Za-z0-9]+",
+        	next : "start"
        }, {
-            token : "comment",
-            regex : "<.+>"
+        	token : "comment",
+        	regex : "<.+>"
        }, {
-            token : "comment",
-            regex : "\\|(?=.)",
-            next : "table-item"
+        	token : "comment",
+        	regex : "\\| ",
+        	next : "table-item"
        }, {
-            token : "comment",
-            regex : "\\|$",
-            next : "start"
+        	token : "comment",
+        	regex : "\\|$",
+        	next : "start"
        }],
-        "qqstring3" : [ {
+    	"qqstring3" : [ {
            token : "constant.language.escape",
            regex : stringEscape
        }, {
@ -81,7 +81,7 @@ var GherkinHighlightRules = function() {
        }, {
            defaultToken : "string"
        }],
-        "qqstring" : [{
+    	"qqstring" : [{
            token : "constant.language.escape",
            regex : stringEscape
        }, {
@ -96,19 +96,15 @@ var GherkinHighlightRules = function() {
            defaultToken: "string"
        }],
        "table-item" : [{
-            token : "comment",
-            regex : /$/,
-            next : "start"
-        }, {
-            token : "comment",
-            regex : /\|/
-        }, {
            token : "string",
-            regex : /\\./
-        }, {
-            defaultToken : "string"
-        }]
+            regex : "[A-Za-z0-9 ]*",
+            next  : "start"
+        }],
    };
+    
+    
+    //new TextHighlightRules().getRules();
+    
 }

 oop.inherits(GherkinHighlightRules, TextHighlightRules);
--- a/lib/ace/mode/handlebars.js
+++ b/lib/ace/mode/handlebars.js
@ -13,6 +13,7 @@ var Mode = function() {
    HtmlMode.call(this);
    this.HighlightRules = HandlebarsHighlightRules;
    this.$behaviour = new HtmlBehaviour();
+
    
    this.foldingRules = new HtmlFoldMode();
 };
@ -20,7 +21,7 @@ var Mode = function() {
 oop.inherits(Mode, HtmlMode);

 (function() {
-    this.blockComment = {start: "{{!--", end: "--}}"};
+    this.blockComment = {start: "{!--", end: "--}"};
    this.$id = "ace/mode/handlebars";
 }).call(Mode.prototype);

--- a/lib/ace/mode/html_highlight_rules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@ -65,7 +65,7 @@ var HtmlHighlightRules = function() {
            include : "tag_whitespace"
        }, {
            token : "entity.other.attribute-name.xml",
-            regex : "[-_a-zA-Z0-9:.]+"
+            regex : "[-_a-zA-Z0-9:]+"
        }, {
            token : "keyword.operator.attribute-equals.xml",
            regex : "=",
@ -89,7 +89,7 @@ var HtmlHighlightRules = function() {
                return ["meta.tag.punctuation." + (start == "<" ? "" : "end-") + "tag-open.xml",
                    "meta.tag" + (group ? "." + group : "") + ".tag-name.xml"];
            },
-            regex : "(</?)([-_a-zA-Z0-9:.]+)",
+            regex : "(</?)([-_a-zA-Z0-9:]+)",
            next: "tag_stuff"
        }],
        tag_stuff: [
--- a/lib/ace/mode/less_highlight_rules.js
+++ b/lib/ace/mode/less_highlight_rules.js
@ -231,7 +231,7 @@ var LessHighlightRules = function() {
                regex: "\\.[a-z0-9-_]+"
            }, {
                token: "variable.language",
-                regex: ":[a-z_][a-z0-9-_]*"
+                regex: ":[a-z0-9-_]+"
            }, {
                token: "constant",
                regex: "[a-z0-9-_]+"
--- a/lib/ace/mode/nim.js
+++ b/lib/ace/mode/nim.js
@ -1,113 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * 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:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 ***** */
-
-define(function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var NimHighlightRules = require("./nim_highlight_rules").NimHighlightRules;
-var NimFoldMode = require("./folding/pythonic").FoldMode;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.HighlightRules = NimHighlightRules;
-    this.foldingRules = new NimFoldMode("\\:|=");
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.lineCommentStart = "#";
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[\:=]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    var outdents = {
-        "discard": 1,
-        "return": 1,
-        "raise": 1,
-        "break": 1,
-        "continue": 1
-    };
-    
-    this.checkOutdent = function(state, line, input) {
-        if (input !== "\r\n" && input !== "\r" && input !== "\n")
-            return false;
-
-        var tokens = this.getTokenizer().getLineTokens(line.trim(), state).tokens;
-        
-        if (!tokens)
-            return false;
-        
-        // ignore trailing comments
-        do {
-            var last = tokens.pop();
-        } while (last && (last.type == "comment" || (last.type == "text" && last.value.match(/^\s+$/))));
-        
-        if (!last)
-            return false;
-        
-        return (last.type == "keyword" && outdents[last.value]);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        // outdenting in python is slightly different because it always applies
-        // to the next line and only of a new line is inserted
-        
-        row += 1;
-        var indent = this.$getIndent(doc.getLine(row));
-        var tab = doc.getTabString();
-        if (indent.slice(-tab.length) == tab)
-            doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
-    };
-
-    this.$id = "ace/mode/nim";
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
--- a/lib/ace/mode/nim_highlight_rules.js
+++ b/lib/ace/mode/nim_highlight_rules.js
@ -1,238 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * 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:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 ***** */
-/*
- * TODO: nim delimiters
- */
-
-define(function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-var num_suffix = "(\'[Ff]32|\'[Ff]64|\'[IiUu]8|\'[IiUu]16|\'[IiUu]32|\'[IiUu]64)";
-
-var NimHighlightRules = function() {
-
-    var keywords = (
-        "addr|and|as|asm|atomic|bind|block|break|case|cast|const|continue|" +
-        "converter|defer|discard|distinct|div|do|elif|else|end|enum|except|" +
-        "export|finally|for|from|func|generic|if|import|in|include|interface|" +
-        "is|isnot|iterator|let|macro|method|mixin|mod|nil|not|notin|object|of|" +
-        "or|out|proc|ptr|raise|ref|return|shl|shr|static|template|try|tuple|" +
-        "type|using|var|when|while|with|without|xor|yield"
-    );
-
-    var builtinConstants = (
-        "true|false|nil|NotImplemented|Ellipsis"
-    );
-
-    var storageType = (
-        "string|seq|array|expr|stmt|typed|untyped|any|auto|bool|cdouble|cfloat|"+
-        "cchar|clongdouble|clong|clonglong|cshort|csize|cstring|cstringarray|"+
-        "culong|culonglong|cushort|guarded|natural|openarray|ordinal|pointer|"+
-        "range|set|shared|static|typedesc|varargs|void"
-    );
-
-    var builtinFunctions = (
-        "defined|declared|declaredInScope|echo|$"
-    );
-
-    //var futureReserved = "";
-    var keywordMapper = this.createKeywordMapper({
-        "invalid.deprecated": "debugger",
-        "support.function": builtinFunctions,
-        //"invalid.illegal": futureReserved,
-        "constant.language": builtinConstants,
-        "storage.type" : storageType,
-        "keyword": keywords
-    }, "identifier");
-
-    var strPre = "(?:r|R)?";
-
-    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
-    var octInteger = "(?:0[o]?[0-7]+)";
-    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
-    var binInteger = "(?:0[bB][01]+)";
-    var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
-
-    var exponent = "(?:[eE][+-]?\\d+)";
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + exponent + ")";
-    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
-
-    var stringEscape =  "\\\\(x[0-9A-Fa-f]{2}|[0-7]{3}|[\\\\abfnrtv'\"]|U[0-9A-Fa-f]{8}|u[0-9A-Fa-f]{4})";
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment",
-            regex : "#.*$"
-        }, {
-            token : "keyword",
-            regex : "(proc|method|temdplate|macro|macromethod|converter|func|iterator) ",
-            next  : "qproc_name"
-        }, {
-            token : "storage.type",
-            regex : "(c|cu|u)?int(8|16|32|64)?",
-        }, {
-            token : "storage.type",
-            regex : "(c|cu|u|cs)?char",
-        }, {
-            token : "storage.type",
-            regex : "float(32|64)?",
-        }, {
-            token : "docstring",
-            regex : "##.*$"
-        }, {
-            token : "string",           // multi line """ string start
-            regex : strPre + '"{3}',
-            next : "qqstring3"
-        }, {
-            token : "string",           // " string
-            regex : strPre + '"(?=.)',
-            next : "qqstring"
-        }, {
-            token : "string",           // multi line ''' string start
-            regex : strPre + "'{3}",
-            next : "qstring3"
-        }, {
-            token : "backtick",           // ` string
-            regex : strPre + "`(?=.)",
-            next : "qxstring"
-        }, {
-            token : "string",           // ' string
-            regex : strPre + "'(?=.)",
-            next : "qstring"
-        }, {
-            token : "constant.numeric", // imaginary
-            regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
-        }, {
-            token : "constant.numeric", // float
-            regex : floatNumber
-        }, {
-            token : "constant.numeric", // long integer
-            regex : integer + "[lL]\\b"
-        }, {
-            token : "constant.numeric", // integer
-            regex : integer + "\\b"
-        }, {
-            token : keywordMapper,
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="
-        }, {
-            token : "paren.lparen",
-            regex : "[\\[\\(\\{]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ],
-        "qqstring3" : [ {
-            token : "constant.language.escape",
-            regex : stringEscape
-        }, {
-            token : "string", // multi line """ string end
-            regex : '"{3}',
-            next : "start"
-        }, {
-            defaultToken : "string"
-        } ],
-        "qstring3" : [ {
-            token : "constant.language.escape",
-            regex : stringEscape
-        }, {
-            token : "string",  // multi line ''' string end
-            regex : "'{3}",
-            next : "start"
-        }, {
-            defaultToken : "string"
-        } ],
-        "qqstring" : [{
-            token : "constant.language.escape",
-            regex : stringEscape
-        }, {
-            token : "string",
-            regex : "\\\\$",
-            next  : "qqstring"
-        }, {
-            token : "string",
-            regex : '"|$',
-            next  : "start"
-        }, {
-            defaultToken: "string"
-        }],
-        "qstring" : [{
-            token : "constant.language.escape",
-            regex : stringEscape
-        }, {
-            token : "string",
-            regex : "\\\\$",
-            next  : "qstring"
-        }, {
-            token : "string",
-            regex : "'|$",
-            next  : "start"
-        }, {
-            defaultToken: "string"
-        }],
-        "qxstring" : [{
-            token : "constant.language.escape",
-            regex : stringEscape
-        }, {
-            token : "backtick",
-            regex : "\\\\$",
-            next  : "qxstring"
-        }, {
-            token : "backtick",
-            regex : "`|$",
-            next  : "start"
-        }, {
-            defaultToken: "backtick"
-        }],
-        "qproc_name":[{
-            token : "proc_name",
-            regex : "\\w+",
-        },{
-            token : "start_bracket",
-            regex : "(\\(|=|$)",
-            next : "start"
-        }],
-    };
-};
-
-oop.inherits(NimHighlightRules, TextHighlightRules);
-
-exports.NimHighlightRules = NimHighlightRules;
-});
--- a/lib/ace/mode/rust_highlight_rules.js
+++ b/lib/ace/mode/rust_highlight_rules.js
@ -84,8 +84,9 @@ var RustHighlightRules = function() {
              { token: 'constant.character.escape.source.rust',
                regex: stringEscape },
              { defaultToken: 'string.quoted.double.source.rust' } ] },
-         { token: [ 'keyword.source.rust', 'text', 'entity.name.function.source.rust' ],
-           regex: '\\b(fn)(\\s+)([a-zA-Z_][a-zA-Z0-9_]*)' },
+         { token: [ 'keyword.source.rust', 'meta.function.source.rust',
+              'entity.name.function.source.rust', 'meta.function.source.rust' ],
+           regex: '\\b(fn)(\\s+)([a-zA-Z_][a-zA-Z0-9_][\\w\\:,+ \\\'<>]*)(\\s*\\()' },
         { token: 'support.constant', regex: '\\b[a-zA-Z_][\\w\\d]*::' },
         { token: 'keyword.source.rust',
           regex: '\\b(?:as|assert|break|claim|const|do|drop|else|extern|fail|for|if|impl|in|let|log|loop|match|mod|module|move|mut|Owned|priv|pub|pure|ref|return|unchecked|unsafe|use|while|mod|Send|static|trait|class|struct|enum|type)\\b' },
--- a/lib/ace/mode/scheme.js
+++ b/lib/ace/mode/scheme.js
@ -39,92 +39,15 @@ define(function(require, exports, module) {
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var SchemeHighlightRules = require("./scheme_highlight_rules").SchemeHighlightRules;
-var MatchingParensOutdent = require("./matching_parens_outdent").MatchingParensOutdent;

 var Mode = function() {
    this.HighlightRules = SchemeHighlightRules;
-	this.$outdent = new MatchingParensOutdent();
 };
 oop.inherits(Mode, TextMode);

 (function() {
       
    this.lineCommentStart = ";";
-    this.minorIndentFunctions = ["define", "lambda", "define-macro", "define-syntax", "syntax-rules", "define-record-type", "define-structure"];
-
-    this.$toIndent = function(str) {
-        return str.split('').map(function(ch) {
-            if (/\s/.exec(ch)) {
-                return ch;
-            } else {
-                return ' ';
-            }
-        }).join('');
-    };
-
-    this.$calculateIndent = function(line, tab) {
-        var baseIndent = this.$getIndent(line);
-        var delta = 0;
-        var isParen, ch;
-        // Walk back from end of line, find matching braces
-        for (var i = line.length - 1; i >= 0; i--) {
-            ch = line[i];
-            if (ch === '(') {
-                delta--;
-                isParen = true;
-            } else if (ch === '(' || ch === '[' || ch === '{') {
-                delta--;
-                isParen = false;
-            } else if (ch === ')' || ch === ']' || ch === '}') {
-                delta++;
-            }
-            if (delta < 0) {
-                break;
-            }
-        }
-        if (delta < 0 && isParen) {
-            // Were more brackets opened than closed and was a ( left open?
-            i += 1;
-            var iBefore = i;
-            var fn = '';
-            while (true) {
-                ch = line[i];
-                if (ch === ' ' || ch === '\t') {
-                    if(this.minorIndentFunctions.indexOf(fn) !== -1) {
-                        return this.$toIndent(line.substring(0, iBefore - 1) + tab);
-                    } else {
-                        return this.$toIndent(line.substring(0, i + 1));
-                    }
-                } else if (ch === undefined) {
-                    return this.$toIndent(line.substring(0, iBefore - 1) + tab);
-                }
-                fn += line[i];
-                i++;
-            }
-        } else if(delta < 0 && !isParen) {
-            // Were more brackets openend than closed and was it not a (?
-            return this.$toIndent(line.substring(0, i+1));
-        } else if(delta > 0) {
-            // Mere more brackets closed than opened? Outdent.
-            baseIndent = baseIndent.substring(0, baseIndent.length - tab.length);
-            return baseIndent;
-        } else {
-            // Were they nicely matched? Just indent like line before.
-            return baseIndent;
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$calculateIndent(line, tab);
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
    
    this.$id = "ace/mode/scheme";
 }).call(Mode.prototype);
--- a/lib/ace/mode/sqlserver.js
+++ b/lib/ace/mode/sqlserver.js
@ -46,14 +46,7 @@ oop.inherits(Mode, TextMode);
 (function() {
    this.lineCommentStart = "--";
    this.blockComment = {start: "/*", end: "*/"};
-    
-    /**
-     * Override keyword completions using list created in highlight rules
-     */
-    this.getCompletions = function(state, session, pos, prefix) {
-        return session.$mode.$highlightRules.completions;
-    };
-    
+
    this.$id = "ace/mode/sql";
 }).call(Mode.prototype);

--- a/lib/ace/mode/sqlserver_highlight_rules.js
+++ b/lib/ace/mode/sqlserver_highlight_rules.js
@ -77,24 +77,22 @@ var SqlServerHighlightRules = function() {
        /* https://msdn.microsoft.com/en-us/library/ms177520.aspx */
        "@@CONNECTIONS|@@CPU_BUSY|@@IDLE|@@IO_BUSY|@@PACKET_ERRORS|@@PACK_RECEIVED|@@PACK_SENT|@@TIMETICKS|@@TOTAL_ERRORS|@@TOTAL_READ|@@TOTAL_WRITE|FN_VIRTUALFILESTATS|" +
        /* https://msdn.microsoft.com/en-us/library/ms188353.aspx */
-        "PATINDEX|TEXTPTR|TEXTVALID|" +
-        /* other */
-        "COALESCE|NULLIF"
+        "PATINDEX|TEXTPTR|TEXTVALID"
    );
    

    // https://msdn.microsoft.com/en-us/library/ms187752.aspx
    var dataTypes = ("BIGINT|BINARY|BIT|CHAR|CURSOR|DATE|DATETIME|DATETIME2|DATETIMEOFFSET|DECIMAL|FLOAT|HIERARCHYID|IMAGE|INTEGER|INT|MONEY|NCHAR|NTEXT|NUMERIC|NVARCHAR|REAL|SMALLDATETIME|SMALLINT|SMALLMONEY|SQL_VARIANT|TABLE|TEXT|TIME|TIMESTAMP|TINYINT|UNIQUEIDENTIFIER|VARBINARY|VARCHAR|XML");
    
-    
+
    //https://msdn.microsoft.com/en-us/library/ms176007.aspx (these are lower case!)
    var builtInStoredProcedures = "sp_addextendedproc|sp_addextendedproperty|sp_addmessage|sp_addtype|sp_addumpdevice|sp_add_data_file_recover_suspect_db|sp_add_log_file_recover_suspect_db|sp_altermessage|sp_attach_db|sp_attach_single_file_db|sp_autostats|sp_bindefault|sp_bindrule|sp_bindsession|sp_certify_removable|sp_clean_db_file_free_space|sp_clean_db_free_space|sp_configure|sp_control_plan_guide|sp_createstats|sp_create_plan_guide|sp_create_plan_guide_from_handle|sp_create_removable|sp_cycle_errorlog|sp_datatype_info|sp_dbcmptlevel|sp_dbmmonitoraddmonitoring|sp_dbmmonitorchangealert|sp_dbmmonitorchangemonitoring|sp_dbmmonitordropalert|sp_dbmmonitordropmonitoring|sp_dbmmonitorhelpalert|sp_dbmmonitorhelpmonitoring|sp_dbmmonitorresults|sp_db_increased_partitions|sp_delete_backuphistory|sp_depends|sp_describe_first_result_set|sp_describe_undeclared_parameters|sp_detach_db|sp_dropdevice|sp_dropextendedproc|sp_dropextendedproperty|sp_dropmessage|sp_droptype|sp_execute|sp_executesql|sp_getapplock|sp_getbindtoken|sp_help|sp_helpconstraint|sp_helpdb|sp_helpdevice|sp_helpextendedproc|sp_helpfile|sp_helpfilegroup|sp_helpindex|sp_helplanguage|sp_helpserver|sp_helpsort|sp_helpstats|sp_helptext|sp_helptrigger|sp_indexoption|sp_invalidate_textptr|sp_lock|sp_monitor|sp_prepare|sp_prepexec|sp_prepexecrpc|sp_procoption|sp_recompile|sp_refreshview|sp_releaseapplock|sp_rename|sp_renamedb|sp_resetstatus|sp_sequence_get_range|sp_serveroption|sp_setnetname|sp_settriggerorder|sp_spaceused|sp_tableoption|sp_unbindefault|sp_unbindrule|sp_unprepare|sp_updateextendedproperty|sp_updatestats|sp_validname|sp_who|sys.sp_merge_xtp_checkpoint_files|sys.sp_xtp_bind_db_resource_pool|sys.sp_xtp_checkpoint_force_garbage_collection|sys.sp_xtp_control_proc_exec_stats|sys.sp_xtp_control_query_exec_stats|sys.sp_xtp_unbind_db_resource_pool";
    
-    
+
    // https://msdn.microsoft.com/en-us/library/ms189822.aspx
    var keywords = "ABSOLUTE|ACTION|ADA|ADD|ADMIN|AFTER|AGGREGATE|ALIAS|ALL|ALLOCATE|ALTER|AND|ANY|ARE|ARRAY|AS|ASC|ASENSITIVE|ASSERTION|ASYMMETRIC|AT|ATOMIC|AUTHORIZATION|BACKUP|BEFORE|BEGIN|BETWEEN|BIT_LENGTH|BLOB|BOOLEAN|BOTH|BREADTH|BREAK|BROWSE|BULK|BY|CALL|CALLED|CARDINALITY|CASCADE|CASCADED|CASE|CATALOG|CHARACTER|CHARACTER_LENGTH|CHAR_LENGTH|CHECK|CHECKPOINT|CLASS|CLOB|CLOSE|CLUSTERED|COALESCE|COLLATE|COLLATION|COLLECT|COLUMN|COMMIT|COMPLETION|COMPUTE|CONDITION|CONNECT|CONNECTION|CONSTRAINT|CONSTRAINTS|CONSTRUCTOR|CONTAINS|CONTAINSTABLE|CONTINUE|CORR|CORRESPONDING|COVAR_POP|COVAR_SAMP|CREATE|CROSS|CUBE|CUME_DIST|CURRENT|CURRENT_CATALOG|CURRENT_DATE|CURRENT_DEFAULT_TRANSFORM_GROUP|CURRENT_PATH|CURRENT_ROLE|CURRENT_SCHEMA|CURRENT_TIME|CURRENT_TRANSFORM_GROUP_FOR_TYPE|CYCLE|DATA|DATABASE|DBCC|DEALLOCATE|DEC|DECLARE|DEFAULT|DEFERRABLE|DEFERRED|DELETE|DENY|DEPTH|DEREF|DESC|DESCRIBE|DESCRIPTOR|DESTROY|DESTRUCTOR|DETERMINISTIC|DIAGNOSTICS|DICTIONARY|DISCONNECT|DISK|DISTINCT|DISTRIBUTED|DOMAIN|DOUBLE|DROP|DUMP|DYNAMIC|EACH|ELEMENT|ELSE|END|END-EXEC|EQUALS|ERRLVL|ESCAPE|EVERY|EXCEPT|EXCEPTION|EXEC|EXECUTE|EXISTS|EXIT|EXTERNAL|EXTRACT|FETCH|FILE|FILLFACTOR|FILTER|FIRST|FOR|FOREIGN|FORTRAN|FOUND|FREE|FREETEXT|FREETEXTTABLE|FROM|FULL|FULLTEXTTABLE|FUNCTION|FUSION|GENERAL|GET|GLOBAL|GO|GOTO|GRANT|GROUP|HAVING|HOLD|HOLDLOCK|HOST|HOUR|IDENTITY|IDENTITYCOL|IDENTITY_INSERT|IF|IGNORE|IMMEDIATE|IN|INCLUDE|INDEX|INDICATOR|INITIALIZE|INITIALLY|INNER|INOUT|INPUT|INSENSITIVE|INSERT|INTEGER|INTERSECT|INTERSECTION|INTERVAL|INTO|IS|ISOLATION|ITERATE|JOIN|KEY|KILL|LANGUAGE|LARGE|LAST|LATERAL|LEADING|LESS|LEVEL|LIKE|LIKE_REGEX|LIMIT|LINENO|LN|LOAD|LOCAL|LOCALTIME|LOCALTIMESTAMP|LOCATOR|MAP|MATCH|MEMBER|MERGE|METHOD|MINUTE|MOD|MODIFIES|MODIFY|MODULE|MULTISET|NAMES|NATIONAL|NATURAL|NCLOB|NEW|NEXT|NO|NOCHECK|NONCLUSTERED|NONE|NORMALIZE|NOT|NULL|NULLIF|OBJECT|OCCURRENCES_REGEX|OCTET_LENGTH|OF|OFF|OFFSETS|OLD|ON|ONLY|OPEN|OPERATION|OPTION|OR|ORDER|ORDINALITY|OUT|OUTER|OUTPUT|OVER|OVERLAPS|OVERLAY|PAD|PARAMETER|PARAMETERS|PARTIAL|PARTITION|PASCAL|PATH|PERCENT|PERCENTILE_CONT|PERCENTILE_DISC|PERCENT_RANK|PIVOT|PLAN|POSITION|POSITION_REGEX|POSTFIX|PRECISION|PREFIX|PREORDER|PREPARE|PRESERVE|PRIMARY|PRINT|PRIOR|PRIVILEGES|PROC|PROCEDURE|PUBLIC|RAISERROR|RANGE|READ|READS|READTEXT|RECONFIGURE|RECURSIVE|REF|REFERENCES|REFERENCING|REGR_AVGX|REGR_AVGY|REGR_COUNT|REGR_INTERCEPT|REGR_R2|REGR_SLOPE|REGR_SXX|REGR_SXY|REGR_SYY|RELATIVE|RELEASE|REPLICATION|RESTORE|RESTRICT|RESULT|RETURN|RETURNS|REVERT|REVOKE|ROLE|ROLLBACK|ROLLUP|ROUTINE|ROW|ROWCOUNT|ROWGUIDCOL|ROWS|RULE|SAVE|SAVEPOINT|SCHEMA|SCOPE|SCROLL|SEARCH|SECOND|SECTION|SECURITYAUDIT|SELECT|SEMANTICKEYPHRASETABLE|SEMANTICSIMILARITYDETAILSTABLE|SEMANTICSIMILARITYTABLE|SENSITIVE|SEQUENCE|SESSION|SET|SETS|SETUSER|SHUTDOWN|SIMILAR|SIZE|SOME|SPECIFIC|SPECIFICTYPE|SQL|SQLCA|SQLCODE|SQLERROR|SQLEXCEPTION|SQLSTATE|SQLWARNING|START|STATE|STATEMENT|STATIC|STATISTICS|STDDEV_POP|STDDEV_SAMP|STRUCTURE|SUBMULTISET|SUBSTRING_REGEX|SYMMETRIC|SYSTEM|TABLESAMPLE|TEMPORARY|TERMINATE|TEXTSIZE|THAN|THEN|TIMEZONE_HOUR|TIMEZONE_MINUTE|TO|TOP|TRAILING|TRAN|TRANSACTION|TRANSLATE|TRANSLATE_REGEX|TRANSLATION|TREAT|TRIGGER|TRIM|TRUNCATE|TSEQUAL|UESCAPE|UNDER|UNION|UNIQUE|UNKNOWN|UNNEST|UNPIVOT|UPDATE|UPDATETEXT|USAGE|USE|USER|USING|VALUE|VALUES|VARIABLE|VARYING|VAR_POP|VAR_SAMP|VIEW|WAITFOR|WHEN|WHENEVER|WHERE|WHILE|WIDTH_BUCKET|WINDOW|WITH|WITHIN|WITHIN GROUP|WITHOUT|WORK|WRITE|WRITETEXT|XMLAGG|XMLATTRIBUTES|XMLBINARY|XMLCAST|XMLCOMMENT|XMLCONCAT|XMLDOCUMENT|XMLELEMENT|XMLEXISTS|XMLFOREST|XMLITERATE|XMLNAMESPACES|XMLPARSE|XMLPI|XMLQUERY|XMLSERIALIZE|XMLTABLE|XMLTEXT|XMLVALIDATE|ZONE";
    
-    
+
    // Microsoft's keyword list is missing a lot of things that are located on various other pages
    // https://msdn.microsoft.com/en-us/library/ms187373.aspx, https://msdn.microsoft.com/en-us/library/ms181714.aspx
    keywords += "|KEEPIDENTITY|KEEPDEFAULTS|IGNORE_CONSTRAINTS|IGNORE_TRIGGERS|XLOCK|FORCESCAN|FORCESEEK|HOLDLOCK|NOLOCK|NOWAIT|PAGLOCK|READCOMMITTED|READCOMMITTEDLOCK|READPAST|READUNCOMMITTED|REPEATABLEREAD|ROWLOCK|SERIALIZABLE|SNAPSHOT|SPATIAL_WINDOW_MAX_CELLS|TABLOCK|TABLOCKX|UPDLOCK|XLOCK|IGNORE_NONCLUSTERED_COLUMNSTORE_INDEX|EXPAND|VIEWS|FAST|FORCE|KEEP|KEEPFIXED|MAXDOP|MAXRECURSION|OPTIMIZE|PARAMETERIZATION|SIMPLE|FORCED|RECOMPILE|ROBUST|PLAN|SPATIAL_WINDOW_MAX_CELLS|NOEXPAND|HINT";
@ -105,15 +103,13 @@ var SqlServerHighlightRules = function() {
    // highlighted words in SSMS that I'm not even sure where they come from
    keywords += "|TYPE";
    
-    
-    //remove specific built in types from keyword list
+
+    //remove any other built in things from key word list
    keywords = keywords.split('|');
    keywords = keywords.filter(function(value, index, self) {
        return logicalOperators.split('|').indexOf(value) === -1 && builtinFunctions.split('|').indexOf(value) === -1 && dataTypes.split('|').indexOf(value) === -1;
    });
    keywords = keywords.sort().join('|');
-    
-    
    var keywordMapper = this.createKeywordMapper({
        "constant.language": logicalOperators,
        "storage.type": dataTypes,
@ -121,23 +117,37 @@ var SqlServerHighlightRules = function() {
        "support.storedprocedure": builtInStoredProcedures,
        "keyword": keywords,
    }, "identifier", true);
-    
-    
+
+
+    // createKeywordMapper ignores case which we want because SqlServer keywords are not case sensitive which causes our keywords to get changed to lowercase.
+    // However, the preferred standard for keywords is uppercase, so this transforms them back to uppercase for code completion
+    //      EXCEPTION: build in stored procedures are lower case
+    for (var i = 0; i < this.$keywordList.length; i++) {
+        var keyword = this.$keywordList[i];
+        if (builtInStoredProcedures.indexOf(keyword) !== -1) continue;
+        this.$keywordList[i] = keyword.toUpperCase();
+    }
+
+
    //https://msdn.microsoft.com/en-us/library/ms190356.aspx
    var setStatements = "SET ANSI_DEFAULTS|SET ANSI_NULLS|SET ANSI_NULL_DFLT_OFF|SET ANSI_NULL_DFLT_ON|SET ANSI_PADDING|SET ANSI_WARNINGS|SET ARITHABORT|SET ARITHIGNORE|SET CONCAT_NULL_YIELDS_NULL|SET CURSOR_CLOSE_ON_COMMIT|SET DATEFIRST|SET DATEFORMAT|SET DEADLOCK_PRIORITY|SET FIPS_FLAGGER|SET FMTONLY|SET FORCEPLAN|SET IDENTITY_INSERT|SET IMPLICIT_TRANSACTIONS|SET LANGUAGE|SET LOCK_TIMEOUT|SET NOCOUNT|SET NOEXEC|SET NUMERIC_ROUNDABORT|SET OFFSETS|SET PARSEONLY|SET QUERY_GOVERNOR_COST_LIMIT|SET QUOTED_IDENTIFIER|SET REMOTE_PROC_TRANSACTIONS|SET ROWCOUNT|SET SHOWPLAN_ALL|SET SHOWPLAN_TEXT|SET SHOWPLAN_XML|SET STATISTICS IO|SET STATISTICS PROFILE|SET STATISTICS TIME|SET STATISTICS XML|SET TEXTSIZE|SET XACT_ABORT".split('|');
    var isolationLevels = "READ UNCOMMITTED|READ COMMITTED|REPEATABLE READ|SNAPSHOP|SERIALIZABLE".split('|');
    for (var i = 0; i < isolationLevels.length; i++) {
        setStatements.push('SET TRANSACTION ISOLATION LEVEL ' + isolationLevels[i]);
    }
+    //add set statements to keywordList for completions
+    for (var i = 0; i < setStatements.length; i++) {
+        this.$keywordList.push(setStatements[i]);
+    }
    
-    
+
    this.$rules = {
        start: [{
            token: "string.start",
            regex: "'",
            next: [{
                token: "constant.language.escape",
-                regex: /''/
+                regex: /\\'/
            }, {
                token: "string.end",
                next: "start",
@ -153,12 +163,15 @@ var SqlServerHighlightRules = function() {
            token: "comment",
            start: "/\\*",
            end: "\\*/"
+        }, {
+            token: "string", // ' string
+            regex: "'.*?'"
        }, {
            token: "constant.numeric", // float
            regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
        }, {
            token: keywordMapper,
-            regex: "@{0,2}[a-zA-Z_$][a-zA-Z0-9_$]*\\b(?!])" //up to 2 @symbols for some built in functions
+            regex: "@{0,2}[a-zA-Z_$][a-zA-Z0-9_$]*\\b" //up to 2 @symbols for some build in functions
        }, {
            token: "constant.class",
            regex: "@@?[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
@ -189,41 +202,20 @@ var SqlServerHighlightRules = function() {
            caseInsensitive: true
        }],
    };
-    
+
    //add each set statment as regex at top of rules so that they are processed first because they require multiple words
-    //note: this makes the statements not match if they are not upper case.. which is not ideal but I don't know of an easy way to fix this
+    //note, this makes the statements not match if they are not upper case.. which is not ideal but I don't know of an easy way to fix this
    for (var i = 0; i < setStatements.length; i++) {
+        var statement = setStatements[i];
        this.$rules.start.unshift({
            token: "set.statement",
-            regex: setStatements[i]
+            regex: statement
        });
    }
-    
+
    this.embedRules(DocCommentHighlightRules, "doc-", [DocCommentHighlightRules.getEndRule("start")]);
+
    this.normalizeRules();
-    
-    
-    //prepare custom keyword completions used by mode to override default completor
-    //this allows for custom 'meta' and proper case of completions
-    var completions = [];
-    var addCompletions = function(arr, meta) {
-        arr.forEach(function(v) {
-            completions.push({
-                name: v,
-                value: v,
-                score: 0,
-                meta: meta,
-            });
-        });
-    };
-    addCompletions(builtInStoredProcedures.split('|'), 'procedure');
-    addCompletions(logicalOperators.split('|'), 'operator');
-    addCompletions(builtinFunctions.split('|'), 'function');
-    addCompletions(dataTypes.split('|'), 'type');
-    addCompletions(setStatements, 'statement');
-    addCompletions(keywords.split('|'), 'keyword');
-    
-    this.completions = completions;
 };

 oop.inherits(SqlServerHighlightRules, TextHighlightRules);
--- a/lib/ace/mode/toml_highlight_rules.js
+++ b/lib/ace/mode/toml_highlight_rules.js
@ -57,10 +57,6 @@ var TomlHighlightRules = function() {
            regex : '"(?=.)',
            next  : "qqstring"
        },
-        {
-            token: ["variable.keygroup.toml"],
-            regex: "(?:^\\s*)(\\[\\[([^\\]]+)\\]\\])"
-        },
        {
            token: ["variable.keygroup.toml"],
            regex: "(?:^\\s*)(\\[([^\\]]+)\\])"
@ -104,4 +100,4 @@ var TomlHighlightRules = function() {
 oop.inherits(TomlHighlightRules, TextHighlightRules);

 exports.TomlHighlightRules = TomlHighlightRules;
-});
+});
--- a/lib/ace/mode/xml.js
+++ b/lib/ace/mode/xml.js
@ -53,7 +53,7 @@ oop.inherits(Mode, TextMode);

    this.blockComment = {start: "<!--", end: "-->"};

-    this.createWorker = function(session) {
+     this.createWorker = function(session) {
        var worker = new WorkerClient(["ace"], "ace/mode/xml_worker", "Worker");
        worker.attachToDocument(session.getDocument());

--- a/lib/ace/mode/xml_highlight_rules.js
+++ b/lib/ace/mode/xml_highlight_rules.js
@ -35,10 +35,8 @@ var oop = require("../lib/oop");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;

 var XmlHighlightRules = function(normalize) {
-    // http://www.w3.org/TR/REC-xml/#NT-NameChar
-	// NameStartChar	   ::=   	":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
-	// NameChar	   ::=   	NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
-    var tagRegex = "[_:a-zA-Z\xc0-\uffff][-_:.a-zA-Z0-9\xc0-\uffff]*";
+
+    var tagRegex = "[a-zA-Z][-_a-zA-Z0-9]*";

    this.$rules = {
        start : [
--- a/lib/ace/mouse/multi_select_handler.js
+++ b/lib/ace/mouse/multi_select_handler.js
@ -83,7 +83,7 @@ function onMouseDown(e) {
    var selectionMode;
    if (editor.$mouseHandler.$enableJumpToDef) {
        if (ctrl && alt || accel && alt)
-            selectionMode = shift ? "block" : "add";
+            selectionMode = "add";
        else if (alt && editor.$blockSelectEnabled)
            selectionMode = "block";
    } else {
@ -117,7 +117,7 @@ function onMouseDown(e) {
        
        if (shift) {
            oldRange = null;
-            range = selection.ranges[0] || range;
+            range = selection.ranges[0];
            editor.removeSelectionMarker(range);
        }
        editor.once("mouseup", function() {
--- a/lib/ace/multi_select_test.js
+++ b/lib/ace/multi_select_test.js
@ -84,11 +84,11 @@ function setSelection(editor, data) {
        return isBackwards ? {
            start: end,
            end: start,
-            isBackwards: isBackwards
+            isBackwards: true
        } : {
            start: start,
            end: end,
-            isBackwards: isBackwards
+            isBackwards: true
        };
    }));
 }
@ -225,19 +225,19 @@ module.exports = {
        assert.equal(editor.getValue(),"l1\nl1\nl2\nl2\nl3\nl3\nl4\nl4");
        testSelection(editor, [[1,0],[3,0],[5,0],[7,0]]);
        
-        setSelection(editor, [[1,2],[1,1,1,0],[3,0,3,1],[5,0,5,1],[7,0,7,1]]);
+        setSelection(editor, [[1,2],[1,0,1,1],[3,0,3,1],[5,0,5,1],[7,0,7,1]]);
        exec("copylinesdown");
        exec("copylinesup");
        assert.equal(editor.getValue(),"l1\nl1\nl1\nl1\nl2\nl2\nl2\nl2\nl3\nl3\nl3\nl3\nl4\nl4\nl4\nl4");
-        testSelection(editor, [[2,2],[2,1,2,0],[6,0,6,1],[10,0,10,1],[14,0,14,1]]);
+        testSelection(editor, [[2,2],[2,0,2,1],[6,0,6,1],[10,0,10,1],[14,0,14,1]]);
        
        exec("movelinesdown", 12);
        assert.equal(editor.getValue(),"l1\nl1\nl1\nl2\nl2\nl2\nl3\nl3\nl3\nl4\nl4\nl4\nl1\nl2\nl3\nl4");
-        testSelection(editor, [[12,2],[12,1,12,0],[13,0,13,1],[14,0,14,1],[15,0,15,1]]);
+        testSelection(editor, [[12,2],[12,0,12,1],[13,0,13,1],[14,0,14,1],[15,0,15,1]]);
        
        exec("movelinesup", 12);
        assert.equal(editor.getValue(),"l1\nl2\nl3\nl4\nl1\nl1\nl1\nl2\nl2\nl2\nl3\nl3\nl3\nl4\nl4\nl4");
-        testSelection(editor, [[0,2],[0,1,0,0],[1,0,1,1],[2,0,2,1],[3,0,3,1]]);
+        testSelection(editor, [[0,2],[0,0,0,1],[1,0,1,1],[2,0,2,1],[3,0,3,1]]);
    },

    "test multiselect fromJSON/toJSON": function() {
--- a/lib/ace/selection.js
+++ b/lib/ace/selection.js
@ -923,7 +923,7 @@ var Selection = function(session) {
                this.toSingleRange(data[0]);
                for (var i = data.length; i--; ) {
                    var r = Range.fromPoints(data[i].start, data[i].end);
-                    if (data[i].isBackwards)
+                    if (data.isBackwards)
                        r.cursor = r.start;
                    this.addRange(r, true);
                }
--- a/lib/ace/snippets/mask.js
+++ b/lib/ace/snippets/mask.js
@ -1,7 +0,0 @@
-define(function(require, exports, module) {
-"use strict";
-
-exports.snippetText = require("../requirejs/text!./mask.snippets");
-exports.scope = "mask";
-
-});
--- a/lib/ace/snippets/mask.snippets
+++ b/lib/ace/snippets/mask.snippets
--- a/lib/ace/snippets/nim.js
+++ b/lib/ace/snippets/nim.js
@ -1,7 +0,0 @@
-define(function(require, exports, module) {
-"use strict";
-
-exports.snippetText = require("../requirejs/text!./nim.snippets");
-exports.scope = "nim";
-
-});
--- a/lib/ace/snippets/nim.snippets
+++ b/lib/ace/snippets/nim.snippets
@ -1,130 +0,0 @@
-snippet #!
-	#!/usr/bin/env nim
-snippet imp
-	import ${1:module}
-snippet from
-	from ${1:package} import ${2:module}
-# Module Docstring
-snippet docs
-	## File: ${1:FILENAME:file_name}
-	## Author: ${2:author}
-	## Description: ${3}
-snippet wh
-	while ${1:condition}:
-		${2:# TODO: write code...}
-# dowh - does the same as do...while in other languages
-snippet dowh
-	while true:
-		${1:# TODO: write code...}
-		if ${2:condition}:
-			break
-snippet with
-	with ${1:expr} as ${2:var}:
-		${3:# TODO: write code...}
-# New Function
-snippet proc
-	proc ${1:fname}(${2:`indent('.') ? 'self' : ''`}): ${3: return type} =
-		##${4:docstring for $1}
-		${5:# TODO: write code...}
-snippet deff
-	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
-		${3:# TODO: write code...}
-# New Method
-snippet defs
-	def ${1:mname}(self, ${2:arg}):
-		${3:# TODO: write code...}
-# New Property
-snippet property
-	def ${1:foo}():
-		doc = "${2:The $1 property.}"
-		def fget(self):
-			${3:return self._$1}
-		def fset(self, value):
-			${4:self._$1 = value}
-# Ifs
-snippet if
-	if ${1:condition}:
-		${2:# TODO: write code...}
-snippet el
-	else:
-		${1:# TODO: write code...}
-snippet ei
-	elif ${1:condition}:
-		${2:# TODO: write code...}
-# For
-snippet for
-	for ${1:item} in ${2:items}:
-		${3:# TODO: write code...}
-# Encodes
-snippet cutf8
-	# -*- coding: utf-8 -*-
-snippet clatin1
-	# -*- coding: latin-1 -*-
-snippet cascii
-	# -*- coding: ascii -*-
-# Lambda
-snippet ld
-	${1:var} = lambda ${2:vars} : ${3:action}
-snippet .
-	self.
-snippet try Try/Except
-	try:
-		${1:# TODO: write code...}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-snippet try Try/Except/Else
-	try:
-		${1:# TODO: write code...}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-	else:
-		${5:# TODO: write code...}
-snippet try Try/Except/Finally
-	try:
-		${1:# TODO: write code...}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-	finally:
-		${5:# TODO: write code...}
-snippet try Try/Except/Else/Finally
-	try:
-		${1:# TODO: write code...}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-	else:
-		${5:# TODO: write code...}
-	finally:
-		${6:# TODO: write code...}
-# if __name__ == '__main__':
-snippet ifmain
-	if isMainModule:
-		${1:main()}
-snippet "
-	## ${1:doc}
-# test function/method
-snippet test
-	def test_${1:description}(${2:self}):
-		${3:# TODO: write code...}
-# test case
-snippet testcase
-	class ${1:ExampleCase}(unittest.TestCase):
-		
-		def test_${2:description}(self):
-			${3:# TODO: write code...}
-#getopt
-snippet getopt
-	try:
-		# Short option syntax: "hv:"
-		# Long option syntax: "help" or "verbose="
-		opts, args = getopt.getopt(sys.argv[1:], "${1:short_options}", [${2:long_options}])
-	
-	except getopt.GetoptError, err:
-		# Print debug info
-		print str(err)
-		${3:error_action}
-
-	for option, argument in opts:
-		if option in ("-h", "--help"):
-			${4}
-		elif option in ("-v", "--verbose"):
-			verbose = argument
--- a/lib/ace/snippets/sqlserver.snippets
+++ b/lib/ace/snippets/sqlserver.snippets
@ -22,16 +22,6 @@ snippet dateadd
 # DATEFROMPARTS 
 snippet datefromparts
 	DATEFROMPARTS(${1:year}, ${2:month}, ${3:day})
-# OBJECT_DEFINITION
-snippet objectdef
-	SELECT OBJECT_DEFINITION(OBJECT_ID('${1:sys.server_permissions /*object name*/}'))
-# STUFF XML
-snippet stuffxml
-	STUFF((SELECT ', ' + ${1:ColumnName}
-		FROM ${2:TableName}
-		WHERE ${3:WhereClause}
-		FOR XML PATH('')), 1, 1, '') AS ${4:Alias}
-	${5:/*https://msdn.microsoft.com/en-us/library/ms188043.aspx*/}
 # Create Procedure
 snippet createproc
 	-- =============================================
@ -40,14 +30,12 @@ snippet createproc
 	-- Description:	${3:Description}
 	-- =============================================
 	CREATE PROCEDURE ${4:Procedure_Name}
-		${5:/*Add the parameters for the stored procedure here*/}
+		-- Add the parameters for the stored procedure here
 	AS
 	BEGIN
 		-- SET NOCOUNT ON added to prevent extra result sets from interfering with SELECT statements.
 		SET NOCOUNT ON;
 		
-		${6:/*Add the T-SQL statements to compute the return value here*/}
-		
 	END
 	GO
 # Create Scalar Function
@ -64,7 +52,5 @@ snippet createfn
 	BEGIN
 		DECLARE @Result ${5:Function_Data_Type}
 		
-		${6:/*Add the T-SQL statements to compute the return value here*/}
-		
 	END
 	GO
--- a/lib/ace/theme/clouds.css
+++ b/lib/ace/theme/clouds.css
@ -23,6 +23,7 @@

 .ace-clouds.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #FFFFFF;
+  border-radius: 2px
 }

 .ace-clouds .ace_marker-layer .ace_step {
--- a/lib/ace/theme/clouds_midnight.css
+++ b/lib/ace/theme/clouds_midnight.css
@ -23,6 +23,7 @@

 .ace-clouds-midnight.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #191919;
+  border-radius: 2px
 }

 .ace-clouds-midnight .ace_marker-layer .ace_step {
--- a/lib/ace/theme/cobalt.css
+++ b/lib/ace/theme/cobalt.css
@ -23,6 +23,7 @@

 .ace-cobalt.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #002240;
+  border-radius: 2px
 }

 .ace-cobalt .ace_marker-layer .ace_step {
--- a/lib/ace/theme/dawn.css
+++ b/lib/ace/theme/dawn.css
@ -23,6 +23,7 @@

 .ace-dawn.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #F9F9F9;
+  border-radius: 2px
 }

 .ace-dawn .ace_marker-layer .ace_step {
--- a/lib/ace/theme/idle_fingers.css
+++ b/lib/ace/theme/idle_fingers.css
@ -23,6 +23,7 @@

 .ace-idle-fingers.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #323232;
+  border-radius: 2px
 }

 .ace-idle-fingers .ace_marker-layer .ace_step {
--- a/lib/ace/theme/katzenmilch.css
+++ b/lib/ace/theme/katzenmilch.css
@ -31,6 +31,7 @@

 .ace-katzenmilch.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #f3f2f3;
+  border-radius: 2px
 }

 .ace-katzenmilch .ace_marker-layer .ace_step {
--- a/lib/ace/theme/kr_theme.css
+++ b/lib/ace/theme/kr_theme.css
@ -23,6 +23,7 @@

 .ace-kr-theme.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #0B0A09;
+  border-radius: 2px
 }

 .ace-kr-theme .ace_marker-layer .ace_step {
--- a/lib/ace/theme/merbivore.css
+++ b/lib/ace/theme/merbivore.css
@ -23,6 +23,7 @@

 .ace-merbivore.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #161616;
+  border-radius: 2px
 }

 .ace-merbivore .ace_marker-layer .ace_step {
--- a/lib/ace/theme/merbivore_soft.css
+++ b/lib/ace/theme/merbivore_soft.css
@ -23,6 +23,7 @@

 .ace-merbivore-soft.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #1C1C1C;
+  border-radius: 2px
 }

 .ace-merbivore-soft .ace_marker-layer .ace_step {
--- a/lib/ace/theme/mono_industrial.css
+++ b/lib/ace/theme/mono_industrial.css
@ -23,6 +23,7 @@

 .ace-mono-industrial.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #222C28;
+  border-radius: 2px
 }

 .ace-mono-industrial .ace_marker-layer .ace_step {
--- a/lib/ace/theme/monokai.css
+++ b/lib/ace/theme/monokai.css
@ -23,6 +23,7 @@

 .ace-monokai.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #272822;
+  border-radius: 2px
 }

 .ace-monokai .ace_marker-layer .ace_step {
--- a/lib/ace/theme/pastel_on_dark.css
+++ b/lib/ace/theme/pastel_on_dark.css
@ -23,6 +23,7 @@

 .ace-pastel-on-dark.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #2C2828;
+  border-radius: 2px
 }

 .ace-pastel-on-dark .ace_marker-layer .ace_step {
--- a/lib/ace/theme/solarized_dark.css
+++ b/lib/ace/theme/solarized_dark.css
@ -30,6 +30,7 @@

 .ace-solarized-dark.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #002B36;
+  border-radius: 2px
 }

 .ace-solarized-dark .ace_marker-layer .ace_step {
--- a/lib/ace/theme/solarized_light.css
+++ b/lib/ace/theme/solarized_light.css
@ -23,6 +23,7 @@

 .ace-solarized-light.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #FDF6E3;
+  border-radius: 2px
 }

 .ace-solarized-light .ace_marker-layer .ace_step {
--- a/lib/ace/theme/terminal.css
+++ b/lib/ace/theme/terminal.css
@ -23,6 +23,7 @@

 .ace-terminal-theme.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px black;
+  border-radius: 2px
 }

 .ace-terminal-theme .ace_marker-layer .ace_step {
--- a/lib/ace/theme/textmate.css
+++ b/lib/ace/theme/textmate.css
@ -122,6 +122,7 @@
 }
 .ace-tm.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px white;
+  border-radius: 2px;
 }
 .ace-tm .ace_marker-layer .ace_step {
  background: rgb(252, 255, 0);
--- a/lib/ace/theme/the_night_after_tomorrow.css
+++ b/lib/ace/theme/the_night_after_tomorrow.css
@ -1,139 +0,0 @@
-.ace-tomorrow-night .ace_gutter {
-  background: #25282c;
-  color: #C5C8C6
-}
-
-.ace-tomorrow-night .ace_print-margin {
-  width: 1px;
-  background: #25282c
-}
-
-.ace-tomorrow-night {
-  background-color: #1D1F21;
-  color: #C5C8C6
-}
-
-.ace-tomorrow-night .ace_cursor {
-  color: #FFFFFF
-}
-
-.ace-tomorrow-night .ace_marker-layer .ace_selection {
-  background: #373B41
-}
-
-.ace-tomorrow-night.ace_multiselect .ace_selection.ace_start {
-  box-shadow: 0 0 3px 0px #1D1F21;
-  border-radius: 2px
-}
-
-.ace-tomorrow-night .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0)
-}
-
-.ace-tomorrow-night .ace_marker-layer .ace_bracket {
-  margin: -1px 0 0 -1px;
-  border: 1px solid #4B4E55
-}
-
-.ace-tomorrow-night .ace_marker-layer .ace_active-line {
-  background: #282A2E
-}
-
-.ace-tomorrow-night .ace_gutter-active-line {
-  background-color: #282A2E
-}
-
-.ace-tomorrow-night .ace_marker-layer .ace_selected-word {
-  border: 1px solid #373B41
-}
-
-.ace-tomorrow-night .ace_invisible {
-  color: #4B4E55
-}
-
-.ace-tomorrow-night .ace_keyword,
-.ace-tomorrow-night .ace_meta,
-.ace-tomorrow-night .ace_support.ace_type {
-  color: #C4A400
-}
-
-.ace-tomorrow-night .ace_storage,
-.ace-tomorrow-night .ace_storage.ace_type {
-    color: #327FD7
-}
-
-.ace-tomorrow-night .ace_keyword.ace_operator {
-  color: #8ABEB7
-}
-
-.ace-tomorrow-night .ace_constant.ace_language{
-    color: #934B9F
-}
-
-.ace-tomorrow-night .ace_constant.ace_character,
-.ace-tomorrow-night .ace_constant.ace_numeric,
-.ace-tomorrow-night .ace_keyword.ace_other.ace_unit,
-.ace-tomorrow-night .ace_support.ace_constant,
-.ace-tomorrow-night .ace_variable.ace_parameter {
-  color: #37BC9B
-}
-
-.ace-tomorrow-night .ace_constant.ace_other {
-  color: #CED1CF
-}
-
-.ace-tomorrow-night .ace_invalid {
-  color: #CED2CF;
-  background-color: #DF5F5F
-}
-
-.ace-tomorrow-night .ace_invalid.ace_deprecated {
-  color: #CED2CF;
-  background-color: #B798BF
-}
-
-.ace-tomorrow-night .ace_fold {
-  background-color: #62A5D6;
-  border-color: #C5C8C6
-}
-
-.ace-tomorrow-night .ace_entity.ace_name.ace_function,
-.ace-tomorrow-night .ace_support.ace_function,
-.ace-tomorrow-night .ace_variable {
-  color: #62A5D6
-}
-
-.ace-tomorrow-night .ace_support.ace_class,
-.ace-tomorrow-night .ace_support.ace_type {
-  color: #F0C674
-}
-
-.ace-tomorrow-night .ace_heading,
-.ace-tomorrow-night .ace_markup.ace_heading,
-.ace-tomorrow-night .ace_string {
-  color: #CD0000
-}
-
-.ace-tomorrow-night .ace_proc_name {
-  color: #04939A
-}
-
-.ace-tomorrow-night .ace_backtick {
-  color: #1DAA49
-}
-
-.ace-tomorrow-night .ace_entity.ace_name.ace_tag,
-.ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name,
-.ace-tomorrow-night .ace_meta.ace_tag,
-.ace-tomorrow-night .ace_string.ace_regexp,
-.ace-tomorrow-night .ace_variable {
-  color: #FFFFFF
-}
-
-.ace-tomorrow-night .ace_comment {
-  color: #3465A4
-}
-
-.ace-tomorrow-night .ace_indent-guide {
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y
-}
--- a/lib/ace/theme/the_night_after_tomorrow.js
+++ b/lib/ace/theme/the_night_after_tomorrow.js
@ -1,39 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * 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:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 ***** */
-
-define(function(require, exports, module) {
-
-exports.isDark = true;
-exports.cssClass = "ace-tomorrow-night";
-exports.cssText = require("../requirejs/text!./the_night_after_tomorrow.css");
-
-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/lib/ace/theme/tomorrow.css
+++ b/lib/ace/theme/tomorrow.css
@ -23,6 +23,7 @@

 .ace-tomorrow.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #FFFFFF;
+  border-radius: 2px
 }

 .ace-tomorrow .ace_marker-layer .ace_step {
--- a/lib/ace/theme/tomorrow_night.css
+++ b/lib/ace/theme/tomorrow_night.css
@ -23,6 +23,7 @@

 .ace-tomorrow-night.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #1D1F21;
+  border-radius: 2px
 }

 .ace-tomorrow-night .ace_marker-layer .ace_step {
--- a/lib/ace/theme/tomorrow_night_blue.css
+++ b/lib/ace/theme/tomorrow_night_blue.css
@ -24,6 +24,7 @@

 .ace-tomorrow-night-blue.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #002451;
+  border-radius: 2px
 }

 .ace-tomorrow-night-blue .ace_marker-layer .ace_step {
--- a/lib/ace/theme/tomorrow_night_bright.css
+++ b/lib/ace/theme/tomorrow_night_bright.css
@ -23,6 +23,7 @@

 .ace-tomorrow-night-bright.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #000000;
+  border-radius: 2px
 }

 .ace-tomorrow-night-bright .ace_marker-layer .ace_step {
--- a/lib/ace/theme/tomorrow_night_eighties.css
+++ b/lib/ace/theme/tomorrow_night_eighties.css
@ -24,6 +24,7 @@

 .ace-tomorrow-night-eighties.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #2D2D2D;
+  border-radius: 2px
 }

 .ace-tomorrow-night-eighties .ace_marker-layer .ace_step {
--- a/lib/ace/theme/twilight.css
+++ b/lib/ace/theme/twilight.css
@ -23,6 +23,7 @@

 .ace-twilight.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #141414;
+  border-radius: 2px
 }

 .ace-twilight .ace_marker-layer .ace_step {
--- a/lib/ace/theme/vibrant_ink.css
+++ b/lib/ace/theme/vibrant_ink.css
@ -23,6 +23,7 @@

 .ace-vibrant-ink.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #0F0F0F;
+  border-radius: 2px
 }

 .ace-vibrant-ink .ace_marker-layer .ace_step {
--- a/lib/ace/theme/xcode.css
+++ b/lib/ace/theme/xcode.css
@ -25,6 +25,7 @@

 .ace-xcode.ace_multiselect .ace_selection.ace_start {
  box-shadow: 0 0 3px 0px #FFFFFF;
+  border-radius: 2px
 }

 .ace-xcode .ace_marker-layer .ace_step {
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@ -615,7 +615,7 @@ var VirtualRenderer = function(container, theme) {
    * @returns {DOMElement}
    **/
    this.getMouseEventTarget = function() {
-        return this.scroller;
+        return this.content;
    };

    /**
@ -919,8 +919,6 @@ var VirtualRenderer = function(container, theme) {
            (this.$minLines||1) * this.lineHeight,
            Math.min(maxHeight, height)
        ) + this.scrollMargin.v + (this.$extraHeight || 0);
-        if (this.$horizScroll)
-            desiredHeight += this.scrollBarH.getHeight();
        var vScroll = height > maxHeight;
        
        if (desiredHeight != this.desiredHeight ||
@ -941,6 +939,9 @@ var VirtualRenderer = function(container, theme) {
    };
    
    this.$computeLayerConfig = function() {
+        if (this.$maxLines && this.lineHeight > 1)
+            this.$autosize();
+
        var session = this.session;
        var size = this.$size;
        
@ -948,6 +949,9 @@ var VirtualRenderer = function(container, theme) {
        var screenLines = this.session.getScreenLength();
        var maxHeight = screenLines * this.lineHeight;

+        var offset = this.scrollTop % this.lineHeight;
+        var minHeight = size.scrollerHeight + this.lineHeight;
+
        var longestLine = this.$getLongestLine();
        
        var horizScroll = !hideScrollbars && (this.$hScrollBarAlwaysVisible ||
@ -958,27 +962,20 @@ var VirtualRenderer = function(container, theme) {
            this.$horizScroll = horizScroll;
            this.scrollBarH.setVisible(horizScroll);
        }
-        // autoresize only after updating hscroll to include scrollbar height in desired height
-        if (this.$maxLines && this.lineHeight > 1)
-            this.$autosize();
-
-        var offset = this.scrollTop % this.lineHeight;
-        var minHeight = size.scrollerHeight + this.lineHeight;
        
        var scrollPastEnd = !this.$maxLines && this.$scrollPastEnd
            ? (size.scrollerHeight - this.lineHeight) * this.$scrollPastEnd
            : 0;
        maxHeight += scrollPastEnd;
        
-        var sm = this.scrollMargin;
-        this.session.setScrollTop(Math.max(-sm.top,
-            Math.min(this.scrollTop, maxHeight - size.scrollerHeight + sm.bottom)));
+        this.session.setScrollTop(Math.max(-this.scrollMargin.top,
+            Math.min(this.scrollTop, maxHeight - size.scrollerHeight + this.scrollMargin.bottom)));

-        this.session.setScrollLeft(Math.max(-sm.left, Math.min(this.scrollLeft, 
-            longestLine + 2 * this.$padding - size.scrollerWidth + sm.right)));
+        this.session.setScrollLeft(Math.max(-this.scrollMargin.left, Math.min(this.scrollLeft, 
+            longestLine + 2 * this.$padding - size.scrollerWidth + this.scrollMargin.right)));
        
        var vScroll = !hideScrollbars && (this.$vScrollBarAlwaysVisible ||
-            size.scrollerHeight - maxHeight + scrollPastEnd < 0 || this.scrollTop > sm.top);
+            size.scrollerHeight - maxHeight + scrollPastEnd < 0 || this.scrollTop);
        var vScrollChanged = this.$vScroll !== vScroll;
        if (vScrollChanged) {
            this.$vScroll = vScroll;
--- a/lib/ace/virtual_renderer_test.js
+++ b/lib/ace/virtual_renderer_test.js
@ -36,40 +36,26 @@ if (typeof process !== "undefined") {
 define(function(require, exports, module) {
 "use strict";

-var Editor = require("./edit_session").Editor;
 var EditSession = require("./edit_session").EditSession;
 var VirtualRenderer = require("./virtual_renderer").VirtualRenderer;
 var assert = require("./test/assertions");

-var editor = null;
 module.exports = {
-    setUp: function() {
-        if (editor)
-            editor.destroy()
+    "test: screen2text the column should be rounded to the next character edge" : function() {
        var el = document.createElement("div");
+
        if (!el.getBoundingClientRect) {
            console.log("Skipping test: This test only runs in the browser");
            return;
        }
+
        el.style.left = "20px";
        el.style.top = "30px";
        el.style.width = "300px";
        el.style.height = "100px";
        document.body.appendChild(el);
-        var renderer = new VirtualRenderer(el);
-        var editor = new Editor(renderer);
-        editor.on("destroy", function() {
-            document.body.removeChild(el);
-        });
-    },
-    tearDown: function() {
-        editor && editor.destroy();
-        editor = null;
-    },
-    "test: screen2text the column should be rounded to the next character edge" : function(done) {
-        if (!editor) return done();
-        var renderer = editor.renderer;

+        var renderer = new VirtualRenderer(el);
        renderer.setPadding(0);
        renderer.setSession(new EditSession("1234"));

@ -87,23 +73,7 @@ module.exports = {
        testPixelToText(10, 0, 0, 1);
        testPixelToText(14, 0, 0, 1);
        testPixelToText(15, 0, 0, 2);
-        done();
-    },
-    
-    "test scrollmargin + autosize": function(done) {
-        if (!editor) return done();
-        editor.setOptions({
-            maxLines: 100,
-            useWrapMode: true
-        });        
-        editor.renderer.setScrollMargin(10, 10);
-        editor.setValue("\n\n");
-        editor.setValue("\n\n\n\n");
-        editor.renderer.once("afterRender", function() {
-            setTimeout(function() {
-                done();
-            }, 0);
-        });
+        document.body.removeChild(el);
    }

    // change tab size after setDocument (for text layer)
--- a/lib/ace/worker/worker.js
+++ b/lib/ace/worker/worker.js
@ -1,9 +1,8 @@
 "no use strict";
 ;(function(window) {
-if (typeof window.window != "undefined" && window.document)
-    return;
-if (window.require && window.define)
+if (typeof window.window != "undefined" && window.document) {
    return;
+}

 window.console = function() {
    var msgs = Array.prototype.slice.call(arguments, 0);
@ -20,7 +19,6 @@ window.ace = window;
 window.onerror = function(message, file, line, col, err) {
    postMessage({type: "error", data: {
        message: message,
-        data: err.data,
        file: file,
        line: line, 
        col: col,
@ -39,7 +37,7 @@ window.normalizeModule = function(parentId, moduleName) {
        var base = parentId.split("/").slice(0, -1).join("/");
        moduleName = (base ? base + "/" : "") + moduleName;
        
-        while (moduleName.indexOf(".") !== -1 && previous != moduleName) {
+        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
            var previous = moduleName;
            moduleName = moduleName.replace(/^\.\//, "").replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
        }
@ -48,7 +46,7 @@ window.normalizeModule = function(parentId, moduleName) {
    return moduleName;
 };

-window.require = function require(parentId, id) {
+window.require = function(parentId, id) {
    if (!id) {
        id = parentId;
        parentId = null;
@ -66,36 +64,17 @@ window.require = function require(parentId, id) {
        }
        return module.exports;
    }
-   
+    
+    var chunks = id.split("/");
    if (!window.require.tlns)
        return console.log("unable to load " + id);
-    
-    var path = resolveModuleId(id, window.require.tlns);
-    if (path.slice(-3) != ".js") path += ".js";
+    chunks[0] = window.require.tlns[chunks[0]] || chunks[0];
+    var path = chunks.join("/") + ".js";
    
    window.require.id = id;
-    window.require.modules[id] = {}; // prevent infinite loop on broken modules
    importScripts(path);
    return window.require(parentId, id);
 };
-function resolveModuleId(id, paths) {
-    var testPath = id, tail = "";
-    while (testPath) {
-        var alias = paths[testPath];
-        if (typeof alias == "string") {
-            return alias + tail;
-        } else if (alias) {
-            return  alias.location.replace(/\/*$/, "/") + (tail || alias.main || alias.name);
-        } else if (alias === false) {
-            return "";
-        }
-        var i = testPath.lastIndexOf("/");
-        if (i === -1) break;
-        tail = testPath.substr(i) + tail;
-        testPath = testPath.slice(0, i);
-    }
-    return id;
-}
 window.require.modules = {};
 window.require.tlns = {};

@ -121,9 +100,9 @@ window.define = function(id, deps, factory) {
    }

    if (!deps.length)
-        // If there is no dependencies, we inject "require", "exports" and
-        // "module" as dependencies, to provide CommonJS compatibility.
-        deps = ["require", "exports", "module"];
+        // If there is no dependencies, we inject 'require', 'exports' and
+        // 'module' as dependencies, to provide CommonJS compatibility.
+        deps = ['require', 'exports', 'module'];

    var req = function(childId) {
        return window.require(id, childId);
@ -134,16 +113,16 @@ window.define = function(id, deps, factory) {
        factory: function() {
            var module = this;
            var returnExports = factory.apply(this, deps.map(function(dep) {
-                switch (dep) {
-                    // Because "require", "exports" and "module" aren't actual
-                    // dependencies, we must handle them seperately.
-                    case "require": return req;
-                    case "exports": return module.exports;
-                    case "module":  return module;
-                    // But for all other dependencies, we can just go ahead and
-                    // require them.
-                    default:        return req(dep);
-                }
+              switch(dep) {
+                  // Because 'require', 'exports' and 'module' aren't actual
+                  // dependencies, we must handle them seperately.
+                  case 'require': return req;
+                  case 'exports': return module.exports;
+                  case 'module':  return module;
+                  // But for all other dependencies, we can just go ahead and
+                  // require them.
+                  default:        return req(dep);
+              }
            }));
            if (returnExports)
                module.exports = returnExports;
@ -152,10 +131,9 @@ window.define = function(id, deps, factory) {
    };
 };
 window.define.amd = {};
-require.tlns = {};
+
 window.initBaseUrls  = function initBaseUrls(topLevelNamespaces) {
-    for (var i in topLevelNamespaces)
-        require.tlns[i] = topLevelNamespaces[i];
+    require.tlns = topLevelNamespaces;
 };

 window.initSender = function initSender() {
@ -195,23 +173,21 @@ var sender = window.sender = null;

 window.onmessage = function(e) {
    var msg = e.data;
-    if (msg.event && sender) {
-        sender._signal(msg.event, msg.data);
-    }
-    else if (msg.command) {
+    if (msg.command) {
        if (main[msg.command])
            main[msg.command].apply(main, msg.args);
-        else if (window[msg.command])
-            window[msg.command].apply(window, msg.args);
        else
            throw new Error("Unknown command:" + msg.command);
    }
-    else if (msg.init) {
-        window.initBaseUrls(msg.tlns);
+    else if (msg.init) {        
+        initBaseUrls(msg.tlns);
        require("ace/lib/es5-shim");
-        sender = window.sender = window.initSender();
+        sender = window.sender = initSender();
        var clazz = require(msg.module)[msg.classname];
        main = window.main = new clazz(sender);
+    } 
+    else if (msg.event && sender) {
+        sender._signal(msg.event, msg.data);
    }
 };
 })(this);
--- a/static.js
+++ b/static.js
@ -21,7 +21,7 @@ http.createServer(function(req, res) {
    if (req.method == "PUT") {
        if (!allowSave)
            return error(res, 404, "Saving not allowed pass --allow-save to enable");
-        return save(req, res, filename);
+        save(req, res, filename);
    }

    fs.exists(filename, function(exists) {
@ -86,7 +86,6 @@ function save(req, res, filePath) {
        }
        res.statusCode = 200;
        res.end("OK");
-        console.log("saved ", filePath);
    });
 }

--- a/tool/lib.js
+++ b/tool/lib.js
@ -1,7 +1,6 @@
 var plist = require("plist");
 var util = require("util");
 var url = require("url");
-var cson = require("cson");

 var https = require("https");
 var http = require("http");
@ -13,120 +12,17 @@ exports.parsePlist = function(xmlOrJSON, callback) {
            json = result[0];
        });
    } else {
-        try {
-            xmlOrJSON = xmlOrJSON.replace(
-                /("(?:\\.|[^"])*")|(?:,\s*)+([\]\}])|(\w+)\s*:|([\]\}]\s*[\[\{])|(\/\/.*|\/\*(?:[^\*]|\*(?=[^\/]))*?\*\/)/g,
-                function(_, str, extraComma, noQuote, missingComma, comment) {
-                    if (comment)
-                        return "";
-                    if (missingComma)
-                        return missingComma[0] + "," + missingComma.slice(1);
-                    return str || extraComma || '"' + noQuote + '":';
-            });
-            json = JSON.parse(xmlOrJSON);
-        } catch(e) {
-            json = cson.parse(xmlOrJSON);
-        }
+        xmlOrJSON = xmlOrJSON.replace(/^\s*\/\/.*/gm, "");
+        json = JSON.parse(xmlOrJSON)
    }
    callback && callback(json);
    return json;
 };

-
 exports.formatJSON = function(object, initialIndent) {
-    return JSON.stringify(object, null, 4).replace(/^/gm, initialIndent||"");
+    return util.inspect(object, false, 40).replace(/^/gm, initialIndent||"");
 };

-exports.formatJS = function(object, initialIndent) {
-    return formatJS(object, 4, initialIndent);
-};
-
-function formatJS(object, indent, initialIndent) {
-    if (typeof  indent == "number")
-        indent = Array(indent + 1).join(" ");
-    
-    function $format(buffer, totalIndent, state, o) {
-        if (typeof o != "object" || !o) {
-            if (typeof o == "string")
-                buffer.push(JSON.stringify(o));
-            else
-                buffer.push("" + o);
-        }
-        else if (Array.isArray(o)) {
-            buffer.push("[")
-            
-            var len = totalIndent.length
-            var oneLine = true;
-            for (var i = 0; i < o.length; i++) {
-                if (typeof o[i] == "string") {
-                    len += o[i].length + 2
-                } else if (!o[i]) {
-                    len += (o[i] + "").length
-                } else {
-                    oneLine = false;
-                    break;
-                }
-                len += 2;
-                if (len > 60) {
-                    oneLine = false;
-                    break;
-                }
-            }
-            
-            for (var i = 0; i < o.length; i++) {
-                if (o[i] && typeof o[i] == "object") {
-                    $format(buffer, totalIndent, state, o[i]);
-                    if (i < o.length - 1)
-                        buffer.push(", ");
-                } else {
-                    if (oneLine)
-                        i && buffer.push(" ");
-                    else
-                        buffer.push("\n", totalIndent + indent)
-                    $format(buffer, totalIndent + indent, state, o[i]);
-                    if (i < o.length - 1)
-                        buffer.push(",");
-                }
-                
-            }
-            if (!oneLine && buffer[buffer.length - 1] != "}")
-                buffer.push("\n" + totalIndent)
-            buffer.push("]")
-        }
-        else {
-            var keys = Object.keys(o);
-            buffer.push("{", "\n");
-            for (var i = 0; i < keys.length; i++) {
-                buffer.push(totalIndent + indent);
-                if (/^\w+$/.test(keys[i]))
-                    buffer.push(keys[i]);
-                else
-                    buffer.push(JSON.stringify(keys[i]));
-                buffer.push(": ")
-
-                if (keys[i] == "regex" && typeof o[keys[i]] == "string") {
-                    try {
-                        var re = new RegExp(o[keys[i]]);
-                        buffer.push("/" + re.source.replace(/\\.|\//g, function(f) {
-                            return f.length == 1 ? "\\" + f : f;
-                        }) + "/");
-                    } catch(e) {
-                        $format(buffer, totalIndent + indent, state, o[keys[i]]);
-                    }
-                } else {
-                    $format(buffer, totalIndent + indent, state, o[keys[i]]);
-                }
-                
-                if (i < keys.length - 1)
-                    buffer.push(",", "\n");
-            }
-            buffer.push("\n", totalIndent, "}");
-        }
-    }
-    var buffer = [];
-    $format(buffer, initialIndent || "", {}, object);
-    return buffer.join("");
-}

 exports.fillTemplate = function(template, replacements) {
    return template.replace(/%(.+?)%/g, function(str, m) {
--- a/tool/mode_creator.js
+++ b/tool/mode_creator.js
@ -126,8 +126,8 @@ function handleSaveResult(err, editor) {
        return log(
            "Write access to this file is disabled.\n"+
            "To enable saving your changes to disk, clone the Ace repository\n"+
-            "and run the included web server with the --allow-save option\n"+
-            "`node static.js --allow-save` or `static.py --puttable=*`"
+            "and run the included web server with the --allow-write option\n"+
+            "`node static.js --allow-write` or `static.py --puttable=*`"
        );
    }
    editor.session.getUndoManager().markClean();
--- a/tool/package.json
+++ b/tool/package.json
@ -1,10 +1,9 @@
 {
-  "name": "ace-tools",
-  "version": "0.1.0",
-  "dependencies": {
-    "cson": "^3.0.1",
-    "css-parse": "1.0.3",
-    "css-stringify": "1.0.3",
-    "plist": ""
-  }
+    "name": "ace-tools",
+    "version": "0.1.0",
+    "dependencies": {
+        "plist": "",
+        "css-parse": "1.0.3",
+        "css-stringify": "1.0.3"
+    }
 }
--- a/tool/tmlanguage.js
+++ b/tool/tmlanguage.js
@ -662,10 +662,10 @@ function convertTmLanguage(name, langStr) {

        var languageHighlightRules = lib.fillTemplate(modeHighlightTemplate, {
            language: languageNameSanitized,
-            languageTokens: lib.formatJS(patterns, "    ").trim(),
+            languageTokens: lib.formatJSON(patterns, "    ").trim(),
            uuid: language.uuid,
            name: name,
-            metaData: lib.formatJS(language, "").trim()
+            metaData: lib.formatJSON(language, "    ").trim()
        });

        if (devMode) {