blazer 2.6.5 → 3.0.0

data/app/assets/javascripts/blazer/ace/ext-language_tools.js

@@ -1,170 +1,247 @@
-define("ace/snippets",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/anchor","ace/keyboard/hash_handler","ace/tokenizer","ace/lib/dom","ace/editor"], function(require, exports, module) {
-"use strict";
+define("ace/snippets",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/range_list","ace/keyboard/hash_handler","ace/tokenizer","ace/clipboard","ace/editor"], function(require, exports, module){"use strict";
+var dom = require("./lib/dom");
 var oop = require("./lib/oop");
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var lang = require("./lib/lang");
 var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
+var RangeList = require("./range_list").RangeList;
 var HashHandler = require("./keyboard/hash_handler").HashHandler;
 var Tokenizer = require("./tokenizer").Tokenizer;
-var comparePoints = Range.comparePoints;
-
-var SnippetManager = function() {
+var clipboard = require("./clipboard");
+var VARIABLES = {
+    CURRENT_WORD: function (editor) {
+        return editor.session.getTextRange(editor.session.getWordRange());
+    },
+    SELECTION: function (editor, name, indentation) {
+        var text = editor.session.getTextRange();
+        if (indentation)
+            return text.replace(/\n\r?([ \t]*\S)/g, "\n" + indentation + "$1");
+        return text;
+    },
+    CURRENT_LINE: function (editor) {
+        return editor.session.getLine(editor.getCursorPosition().row);
+    },
+    PREV_LINE: function (editor) {
+        return editor.session.getLine(editor.getCursorPosition().row - 1);
+    },
+    LINE_INDEX: function (editor) {
+        return editor.getCursorPosition().row;
+    },
+    LINE_NUMBER: function (editor) {
+        return editor.getCursorPosition().row + 1;
+    },
+    SOFT_TABS: function (editor) {
+        return editor.session.getUseSoftTabs() ? "YES" : "NO";
+    },
+    TAB_SIZE: function (editor) {
+        return editor.session.getTabSize();
+    },
+    CLIPBOARD: function (editor) {
+        return clipboard.getText && clipboard.getText();
+    },
+    FILENAME: function (editor) {
+        return /[^/\\]*$/.exec(this.FILEPATH(editor))[0];
+    },
+    FILENAME_BASE: function (editor) {
+        return /[^/\\]*$/.exec(this.FILEPATH(editor))[0].replace(/\.[^.]*$/, "");
+    },
+    DIRECTORY: function (editor) {
+        return this.FILEPATH(editor).replace(/[^/\\]*$/, "");
+    },
+    FILEPATH: function (editor) { return "/not implemented.txt"; },
+    WORKSPACE_NAME: function () { return "Unknown"; },
+    FULLNAME: function () { return "Unknown"; },
+    BLOCK_COMMENT_START: function (editor) {
+        var mode = editor.session.$mode || {};
+        return mode.blockComment && mode.blockComment.start || "";
+    },
+    BLOCK_COMMENT_END: function (editor) {
+        var mode = editor.session.$mode || {};
+        return mode.blockComment && mode.blockComment.end || "";
+    },
+    LINE_COMMENT: function (editor) {
+        var mode = editor.session.$mode || {};
+        return mode.lineCommentStart || "";
+    },
+    CURRENT_YEAR: date.bind(null, { year: "numeric" }),
+    CURRENT_YEAR_SHORT: date.bind(null, { year: "2-digit" }),
+    CURRENT_MONTH: date.bind(null, { month: "numeric" }),
+    CURRENT_MONTH_NAME: date.bind(null, { month: "long" }),
+    CURRENT_MONTH_NAME_SHORT: date.bind(null, { month: "short" }),
+    CURRENT_DATE: date.bind(null, { day: "2-digit" }),
+    CURRENT_DAY_NAME: date.bind(null, { weekday: "long" }),
+    CURRENT_DAY_NAME_SHORT: date.bind(null, { weekday: "short" }),
+    CURRENT_HOUR: date.bind(null, { hour: "2-digit", hour12: false }),
+    CURRENT_MINUTE: date.bind(null, { minute: "2-digit" }),
+    CURRENT_SECOND: date.bind(null, { second: "2-digit" })
+};
+VARIABLES.SELECTED_TEXT = VARIABLES.SELECTION;
+function date(dateFormat) {
+    var str = new Date().toLocaleString("en-us", dateFormat);
+    return str.length == 1 ? "0" + str : str;
+}
+var SnippetManager = function () {
     this.snippetMap = {};
     this.snippetNameMap = {};
 };
-
-(function() {
+(function () {
     oop.implement(this, EventEmitter);
-    
-    this.getTokenizer = function() {
-        function TabstopToken(str, _, stack) {
+    this.getTokenizer = function () {
+        return SnippetManager.$tokenizer || this.createTokenizer();
+    };
+    this.createTokenizer = function () {
+        function TabstopToken(str) {
             str = str.substr(1);
-            if (/^\d+$/.test(str) && !stack.inFormatString)
-                return [{tabstopId: parseInt(str, 10)}];
-            return [{text: str}];
+            if (/^\d+$/.test(str))
+                return [{ tabstopId: parseInt(str, 10) }];
+            return [{ text: str }];
         }
         function escape(ch) {
             return "(?:[^\\\\" + ch + "]|\\\\.)";
         }
+        var formatMatcher = {
+            regex: "/(" + escape("/") + "+)/",
+            onMatch: function (val, state, stack) {
+                var ts = stack[0];
+                ts.fmtString = true;
+                ts.guard = val.slice(1, -1);
+                ts.flag = "";
+                return "";
+            },
+            next: "formatString"
+        };
         SnippetManager.$tokenizer = new Tokenizer({
             start: [
-                {regex: /:/, onMatch: function(val, state, stack) {
-                    if (stack.length && stack[0].expectIf) {
-                        stack[0].expectIf = false;
-                        stack[0].elseBranch = stack[0];
-                        return [stack[0]];
-                    }
-                    return ":";
-                }},
-                {regex: /\\./, onMatch: function(val, state, stack) {
-                    var ch = val[1];
-                    if (ch == "}" && stack.length) {
-                        val = ch;
-                    }else if ("`$\\".indexOf(ch) != -1) {
-                        val = ch;
-                    } else if (stack.inFormatString) {
-                        if (ch == "n")
-                            val = "\n";
-                        else if (ch == "t")
-                            val = "\n";
-                        else if ("ulULE".indexOf(ch) != -1) {
-                            val = {changeCase: ch, local: ch > "a"};
+                { regex: /\\./, onMatch: function (val, state, stack) {
+                        var ch = val[1];
+                        if (ch == "}" && stack.length) {
+                            val = ch;
                         }
-                    }
-
-                    return [val];
-                }},
-                {regex: /}/, onMatch: function(val, state, stack) {
-                    return [stack.length ? stack.shift() : val];
-                }},
-                {regex: /\$(?:\d+|\w+)/, onMatch: TabstopToken},
-                {regex: /\$\{[\dA-Z_a-z]+/, onMatch: function(str, state, stack) {
-                    var t = TabstopToken(str.substr(1), state, stack);
-                    stack.unshift(t[0]);
-                    return t;
-                }, next: "snippetVar"},
-                {regex: /\n/, token: "newline", merge: false}
+                        else if ("`$\\".indexOf(ch) != -1) {
+                            val = ch;
+                        }
+                        return [val];
+                    } },
+                { regex: /}/, onMatch: function (val, state, stack) {
+                        return [stack.length ? stack.shift() : val];
+                    } },
+                { regex: /\$(?:\d+|\w+)/, onMatch: TabstopToken },
+                { regex: /\$\{[\dA-Z_a-z]+/, onMatch: function (str, state, stack) {
+                        var t = TabstopToken(str.substr(1));
+                        stack.unshift(t[0]);
+                        return t;
+                    }, next: "snippetVar" },
+                { regex: /\n/, token: "newline", merge: false }
             ],
             snippetVar: [
-                {regex: "\\|" + escape("\\|") + "*\\|", onMatch: function(val, state, stack) {
-                    stack[0].choices = val.slice(1, -1).split(",");
-                }, next: "start"},
-                {regex: "/(" + escape("/") + "+)/(?:(" + escape("/") + "*)/)(\\w*):?",
-                 onMatch: function(val, state, stack) {
-                    var ts = stack[0];
-                    ts.fmtString = val;
-
-                    val = this.splitRegex.exec(val);
-                    ts.guard = val[1];
-                    ts.fmt = val[2];
-                    ts.flag = val[3];
-                    return "";
-                }, next: "start"},
-                {regex: "`" + escape("`") + "*`", onMatch: function(val, state, stack) {
-                    stack[0].code = val.splice(1, -1);
-                    return "";
-                }, next: "start"},
-                {regex: "\\?", onMatch: function(val, state, stack) {
-                    if (stack[0])
-                        stack[0].expectIf = true;
-                }, next: "start"},
-                {regex: "([^:}\\\\]|\\\\.)*:?", token: "", next: "start"}
+                { regex: "\\|" + escape("\\|") + "*\\|", onMatch: function (val, state, stack) {
+                        var choices = val.slice(1, -1).replace(/\\[,|\\]|,/g, function (operator) {
+                            return operator.length == 2 ? operator[1] : "\x00";
+                        }).split("\x00").map(function (value) {
+                            return { value: value };
+                        });
+                        stack[0].choices = choices;
+                        return [choices[0]];
+                    }, next: "start" },
+                formatMatcher,
+                { regex: "([^:}\\\\]|\\\\.)*:?", token: "", next: "start" }
             ],
             formatString: [
-                {regex: "/(" + escape("/") + "+)/", token: "regex"},
-                {regex: "", onMatch: function(val, state, stack) {
-                    stack.inFormatString = true;
-                }, next: "start"}
+                { regex: /:/, onMatch: function (val, state, stack) {
+                        if (stack.length && stack[0].expectElse) {
+                            stack[0].expectElse = false;
+                            stack[0].ifEnd = { elseEnd: stack[0] };
+                            return [stack[0].ifEnd];
+                        }
+                        return ":";
+                    } },
+                { regex: /\\./, onMatch: function (val, state, stack) {
+                        var ch = val[1];
+                        if (ch == "}" && stack.length)
+                            val = ch;
+                        else if ("`$\\".indexOf(ch) != -1)
+                            val = ch;
+                        else if (ch == "n")
+                            val = "\n";
+                        else if (ch == "t")
+                            val = "\t";
+                        else if ("ulULE".indexOf(ch) != -1)
+                            val = { changeCase: ch, local: ch > "a" };
+                        return [val];
+                    } },
+                { regex: "/\\w*}", onMatch: function (val, state, stack) {
+                        var next = stack.shift();
+                        if (next)
+                            next.flag = val.slice(1, -1);
+                        this.next = next && next.tabstopId ? "start" : "";
+                        return [next || val];
+                    }, next: "start" },
+                { regex: /\$(?:\d+|\w+)/, onMatch: function (val, state, stack) {
+                        return [{ text: val.slice(1) }];
+                    } },
+                { regex: /\${\w+/, onMatch: function (val, state, stack) {
+                        var token = { text: val.slice(2) };
+                        stack.unshift(token);
+                        return [token];
+                    }, next: "formatStringVar" },
+                { regex: /\n/, token: "newline", merge: false },
+                { regex: /}/, onMatch: function (val, state, stack) {
+                        var next = stack.shift();
+                        this.next = next && next.tabstopId ? "start" : "";
+                        return [next || val];
+                    }, next: "start" }
+            ],
+            formatStringVar: [
+                { regex: /:\/\w+}/, onMatch: function (val, state, stack) {
+                        var ts = stack[0];
+                        ts.formatFunction = val.slice(2, -1);
+                        return [stack.shift()];
+                    }, next: "formatString" },
+                formatMatcher,
+                { regex: /:[\?\-+]?/, onMatch: function (val, state, stack) {
+                        if (val[1] == "+")
+                            stack[0].ifEnd = stack[0];
+                        if (val[1] == "?")
+                            stack[0].expectElse = true;
+                    }, next: "formatString" },
+                { regex: "([^:}\\\\]|\\\\.)*:?", token: "", next: "formatString" }
             ]
         });
-        SnippetManager.prototype.getTokenizer = function() {
-            return SnippetManager.$tokenizer;
-        };
         return SnippetManager.$tokenizer;
     };
-
-    this.tokenizeTmSnippet = function(str, startState) {
-        return this.getTokenizer().getLineTokens(str, startState).tokens.map(function(x) {
+    this.tokenizeTmSnippet = function (str, startState) {
+        return this.getTokenizer().getLineTokens(str, startState).tokens.map(function (x) {
             return x.value || x;
         });
     };
-
-    this.$getDefaultValue = function(editor, name) {
-        if (/^[A-Z]\d+$/.test(name)) {
-            var i = name.substr(1);
-            return (this.variables[name[0] + "__"] || {})[i];
-        }
-        if (/^\d+$/.test(name)) {
-            return (this.variables.__ || {})[name];
-        }
+    this.getVariableValue = function (editor, name, indentation) {
+        if (/^\d+$/.test(name))
+            return (this.variables.__ || {})[name] || "";
+        if (/^[A-Z]\d+$/.test(name))
+            return (this.variables[name[0] + "__"] || {})[name.substr(1)] || "";
         name = name.replace(/^TM_/, "");
-
-        if (!editor)
-            return;
-        var s = editor.session;
-        switch(name) {
-            case "CURRENT_WORD":
-                var r = s.getWordRange();
-            case "SELECTION":
-            case "SELECTED_TEXT":
-                return s.getTextRange(r);
-            case "CURRENT_LINE":
-                return s.getLine(editor.getCursorPosition().row);
-            case "PREV_LINE": // not possible in textmate
-                return s.getLine(editor.getCursorPosition().row - 1);
-            case "LINE_INDEX":
-                return editor.getCursorPosition().column;
-            case "LINE_NUMBER":
-                return editor.getCursorPosition().row + 1;
-            case "SOFT_TABS":
-                return s.getUseSoftTabs() ? "YES" : "NO";
-            case "TAB_SIZE":
-                return s.getTabSize();
-            case "FILENAME":
-            case "FILEPATH":
-                return "";
-            case "FULLNAME":
-                return "Ace";
-        }
-    };
-    this.variables = {};
-    this.getVariableValue = function(editor, varName) {
-        if (this.variables.hasOwnProperty(varName))
-            return this.variables[varName](editor, varName) || "";
-        return this.$getDefaultValue(editor, varName) || "";
-    };
-    this.tmStrFormat = function(str, ch, editor) {
+        if (!this.variables.hasOwnProperty(name))
+            return "";
+        var value = this.variables[name];
+        if (typeof value == "function")
+            value = this.variables[name](editor, name, indentation);
+        return value == null ? "" : value;
+    };
+    this.variables = VARIABLES;
+    this.tmStrFormat = function (str, ch, editor) {
+        if (!ch.fmt)
+            return str;
         var flag = ch.flag || "";
         var re = ch.guard;
-        re = new RegExp(re, flag.replace(/[^gi]/, ""));
-        var fmtTokens = this.tokenizeTmSnippet(ch.fmt, "formatString");
+        re = new RegExp(re, flag.replace(/[^gim]/g, ""));
+        var fmtTokens = typeof ch.fmt == "string" ? this.tokenizeTmSnippet(ch.fmt, "formatString") : ch.fmt;
         var _self = this;
-        var formatted = str.replace(re, function() {
-            _self.variables.__ = arguments;
+        var formatted = str.replace(re, function () {
+            var oldArgs = _self.variables.__;
+            _self.variables.__ = [].slice.call(arguments);
             var fmtParts = _self.resolveVariables(fmtTokens, editor);
             var gChangeCase = "E";
-            for (var i  = 0; i < fmtParts.length; i++) {
+            for (var i = 0; i < fmtParts.length; i++) {
                 var ch = fmtParts[i];
                 if (typeof ch == "object") {
                     fmtParts[i] = "";
@@ -177,52 +254,79 @@ var SnippetManager = function() {
                                 fmtParts[i] = next[0].toLowerCase();
                             fmtParts[i + 1] = next.substr(1);
                         }
-                    } else if (ch.changeCase) {
+                    }
+                    else if (ch.changeCase) {
                         gChangeCase = ch.changeCase;
                     }
-                } else if (gChangeCase == "U") {
+                }
+                else if (gChangeCase == "U") {
                     fmtParts[i] = ch.toUpperCase();
-                } else if (gChangeCase == "L") {
+                }
+                else if (gChangeCase == "L") {
                     fmtParts[i] = ch.toLowerCase();
                 }
             }
+            _self.variables.__ = oldArgs;
             return fmtParts.join("");
         });
-        this.variables.__ = null;
         return formatted;
     };
-
-    this.resolveVariables = function(snippet, editor) {
+    this.tmFormatFunction = function (str, ch, editor) {
+        if (ch.formatFunction == "upcase")
+            return str.toUpperCase();
+        if (ch.formatFunction == "downcase")
+            return str.toLowerCase();
+        return str;
+    };
+    this.resolveVariables = function (snippet, editor) {
         var result = [];
+        var indentation = "";
+        var afterNewLine = true;
         for (var i = 0; i < snippet.length; i++) {
             var ch = snippet[i];
             if (typeof ch == "string") {
                 result.push(ch);
-            } else if (typeof ch != "object") {
+                if (ch == "\n") {
+                    afterNewLine = true;
+                    indentation = "";
+                }
+                else if (afterNewLine) {
+                    indentation = /^\t*/.exec(ch)[0];
+                    afterNewLine = /\S/.test(ch);
+                }
                 continue;
-            } else if (ch.skip) {
-                gotoNext(ch);
-            } else if (ch.processed < i) {
+            }
+            if (!ch)
                 continue;
-            } else if (ch.text) {
-                var value = this.getVariableValue(editor, ch.text);
-                if (value && ch.fmtString)
-                    value = this.tmStrFormat(value, ch);
-                ch.processed = i;
-                if (ch.expectIf == null) {
-                    if (value) {
-                        result.push(value);
-                        gotoNext(ch);
-                    }
-                } else {
-                    if (value) {
-                        ch.skip = ch.elseBranch;
-                    } else
-                        gotoNext(ch);
+            afterNewLine = false;
+            if (ch.fmtString) {
+                var j = snippet.indexOf(ch, i + 1);
+                if (j == -1)
+                    j = snippet.length;
+                ch.fmt = snippet.slice(i + 1, j);
+                i = j;
+            }
+            if (ch.text) {
+                var value = this.getVariableValue(editor, ch.text, indentation) + "";
+                if (ch.fmtString)
+                    value = this.tmStrFormat(value, ch, editor);
+                if (ch.formatFunction)
+                    value = this.tmFormatFunction(value, ch, editor);
+                if (value && !ch.ifEnd) {
+                    result.push(value);
+                    gotoNext(ch);
                 }
-            } else if (ch.tabstopId != null) {
+                else if (!value && ch.ifEnd) {
+                    gotoNext(ch.ifEnd);
+                }
+            }
+            else if (ch.elseEnd) {
+                gotoNext(ch.elseEnd);
+            }
+            else if (ch.tabstopId != null) {
                 result.push(ch);
-            } else if (ch.changeCase != null) {
+            }
+            else if (ch.changeCase != null) {
                 result.push(ch);
             }
         }
@@ -233,20 +337,17 @@ var SnippetManager = function() {
         }
         return result;
     };
-
-    this.insertSnippetForSelection = function(editor, snippetText) {
+    this.insertSnippetForSelection = function (editor, snippetText) {
         var cursor = editor.getCursorPosition();
         var line = editor.session.getLine(cursor.row);
         var tabString = editor.session.getTabString();
         var indentString = line.match(/^\s*/)[0];
-        
         if (cursor.column < indentString.length)
             indentString = indentString.slice(0, cursor.column);
-
         snippetText = snippetText.replace(/\r/g, "");
         var tokens = this.tokenizeTmSnippet(snippetText);
         tokens = this.resolveVariables(tokens, editor);
-        tokens = tokens.map(function(x) {
+        tokens = tokens.map(function (x) {
             if (x == "\n")
                 return x + indentString;
             if (typeof x == "string")
@@ -254,7 +355,7 @@ var SnippetManager = function() {
             return x;
         });
         var tabstops = [];
-        tokens.forEach(function(p, i) {
+        tokens.forEach(function (p, i) {
             if (typeof p != "object")
                 return;
             var id = p.tabstopId;
@@ -263,23 +364,26 @@ var SnippetManager = function() {
                 ts = tabstops[id] = [];
                 ts.index = id;
                 ts.value = "";
+                ts.parents = {};
             }
             if (ts.indexOf(p) !== -1)
                 return;
+            if (p.choices && !ts.choices)
+                ts.choices = p.choices;
             ts.push(p);
             var i1 = tokens.indexOf(p, i + 1);
             if (i1 === -1)
                 return;
-
             var value = tokens.slice(i + 1, i1);
-            var isNested = value.some(function(t) {return typeof t === "object";});
+            var isNested = value.some(function (t) { return typeof t === "object"; });
             if (isNested && !ts.value) {
                 ts.value = value;
-            } else if (value.length && (!ts.value || typeof ts.value !== "string")) {
+            }
+            else if (value.length && (!ts.value || typeof ts.value !== "string")) {
                 ts.value = value.join("");
             }
         });
-        tabstops.forEach(function(ts) {ts.length = 0;});
+        tabstops.forEach(function (ts) { ts.length = 0; });
         var expanding = {};
         function copyValue(val) {
             var copy = [];
@@ -289,7 +393,7 @@ var SnippetManager = function() {
                     if (expanding[p.tabstopId])
                         continue;
                     var j = val.lastIndexOf(p, i - 1);
-                    p = copy[j] || {tabstopId: p.tabstopId};
+                    p = copy[j] || { tabstopId: p.tabstopId };
                 }
                 copy[i] = p;
             }
@@ -300,67 +404,68 @@ var SnippetManager = function() {
             if (typeof p != "object")
                 continue;
             var id = p.tabstopId;
+            var ts = tabstops[id];
             var i1 = tokens.indexOf(p, i + 1);
             if (expanding[id]) {
-                if (expanding[id] === p)
-                    expanding[id] = null;
+                if (expanding[id] === p) {
+                    delete expanding[id];
+                    Object.keys(expanding).forEach(function (parentId) {
+                        ts.parents[parentId] = true;
+                    });
+                }
                 continue;
             }
-            
-            var ts = tabstops[id];
-            var arg = typeof ts.value == "string" ? [ts.value] : copyValue(ts.value);
-            arg.unshift(i + 1, Math.max(0, i1 - i));
-            arg.push(p);
             expanding[id] = p;
-            tokens.splice.apply(tokens, arg);
-
+            var value = ts.value;
+            if (typeof value !== "string")
+                value = copyValue(value);
+            else if (p.fmt)
+                value = this.tmStrFormat(value, p, editor);
+            tokens.splice.apply(tokens, [i + 1, Math.max(0, i1 - i)].concat(value, p));
             if (ts.indexOf(p) === -1)
                 ts.push(p);
         }
         var row = 0, column = 0;
         var text = "";
-        tokens.forEach(function(t) {
+        tokens.forEach(function (t) {
             if (typeof t === "string") {
                 var lines = t.split("\n");
-                if (lines.length > 1){
+                if (lines.length > 1) {
                     column = lines[lines.length - 1].length;
                     row += lines.length - 1;
-                } else
+                }
+                else
                     column += t.length;
                 text += t;
-            } else {
+            }
+            else if (t) {
                 if (!t.start)
-                    t.start = {row: row, column: column};
+                    t.start = { row: row, column: column };
                 else
-                    t.end = {row: row, column: column};
+                    t.end = { row: row, column: column };
             }
         });
         var range = editor.getSelectionRange();
         var end = editor.session.replace(range, text);
-
         var tabstopManager = new TabstopManager(editor);
         var selectionId = editor.inVirtualSelectionMode && editor.selection.index;
         tabstopManager.addTabstops(tabstops, range.start, end, selectionId);
     };
-    
-    this.insertSnippet = function(editor, snippetText) {
+    this.insertSnippet = function (editor, snippetText) {
         var self = this;
         if (editor.inVirtualSelectionMode)
             return self.insertSnippetForSelection(editor, snippetText);
-        
-        editor.forEachSelection(function() {
+        editor.forEachSelection(function () {
             self.insertSnippetForSelection(editor, snippetText);
-        }, null, {keepOrder: true});
-        
+        }, null, { keepOrder: true });
         if (editor.tabstopManager)
             editor.tabstopManager.tabNext();
     };
-
-    this.$getScope = function(editor) {
+    this.$getScope = function (editor) {
         var scope = editor.session.$mode.$id || "";
         scope = scope.split("/").pop();
         if (scope === "html" || scope === "php") {
-            if (scope === "php" && !editor.session.$mode.inlinePhp) 
+            if (scope === "php" && !editor.session.$mode.inlinePhp)
                 scope = "html";
             var c = editor.getCursorPosition();
             var state = editor.session.getState(c.row);
@@ -376,11 +481,9 @@ var SnippetManager = function() {
                     scope = "php";
             }
         }
-        
         return scope;
     };
-
-    this.getActiveScopes = function(editor) {
+    this.getActiveScopes = function (editor) {
         var scope = this.$getScope(editor);
         var scopes = [scope];
         var snippetMap = this.snippetMap;
@@ -390,26 +493,23 @@ var SnippetManager = function() {
         scopes.push("_");
         return scopes;
     };
-
-    this.expandWithTab = function(editor, options) {
+    this.expandWithTab = function (editor, options) {
         var self = this;
-        var result = editor.forEachSelection(function() {
+        var result = editor.forEachSelection(function () {
             return self.expandSnippetForSelection(editor, options);
-        }, null, {keepOrder: true});
+        }, null, { keepOrder: true });
         if (result && editor.tabstopManager)
             editor.tabstopManager.tabNext();
         return result;
     };
-    
-    this.expandSnippetForSelection = function(editor, options) {
+    this.expandSnippetForSelection = function (editor, options) {
         var cursor = editor.getCursorPosition();
         var line = editor.session.getLine(cursor.row);
         var before = line.substring(0, cursor.column);
         var after = line.substr(cursor.column);
-
         var snippetMap = this.snippetMap;
         var snippet;
-        this.getActiveScopes(editor).some(function(scope) {
+        this.getActiveScopes(editor).some(function (scope) {
             var snippets = snippetMap[scope];
             if (snippets)
                 snippet = this.findMatchingSnippet(snippets, before, after);
@@ -419,20 +519,14 @@ var SnippetManager = function() {
             return false;
         if (options && options.dryRun)
             return true;
-        editor.session.doc.removeInLine(cursor.row,
-            cursor.column - snippet.replaceBefore.length,
-            cursor.column + snippet.replaceAfter.length
-        );
-
+        editor.session.doc.removeInLine(cursor.row, cursor.column - snippet.replaceBefore.length, cursor.column + snippet.replaceAfter.length);
         this.variables.M__ = snippet.matchBefore;
         this.variables.T__ = snippet.matchAfter;
         this.insertSnippetForSelection(editor, snippet.content);
-
         this.variables.M__ = this.variables.T__ = null;
         return true;
     };
-
-    this.findMatchingSnippet = function(snippetList, before, after) {
+    this.findMatchingSnippet = function (snippetList, before, after) {
         for (var i = snippetList.length; i--;) {
             var s = snippetList[i];
             if (s.startRe && !s.startRe.test(before))
@@ -441,7 +535,6 @@ var SnippetManager = function() {
                 continue;
             if (!s.startRe && !s.endRe)
                 continue;
-
             s.matchBefore = s.startRe ? s.startRe.exec(before) : [""];
             s.matchAfter = s.endRe ? s.endRe.exec(after) : [""];
             s.replaceBefore = s.triggerRe ? s.triggerRe.exec(before)[0] : "";
@@ -449,21 +542,17 @@ var SnippetManager = function() {
             return s;
         }
     };
-
     this.snippetMap = {};
     this.snippetNameMap = {};
-    this.register = function(snippets, scope) {
+    this.register = function (snippets, scope) {
         var snippetMap = this.snippetMap;
         var snippetNameMap = this.snippetNameMap;
         var self = this;
-        
-        if (!snippets) 
+        if (!snippets)
             snippets = [];
-        
         function wrapRegexp(src) {
             if (src && !/^\^?\(.*\)\$?$|^\\b$/.test(src))
                 src = "(?:" + src + ")";
-
             return src || "";
         }
         function guardedRegexp(re, guard, opening) {
@@ -473,14 +562,14 @@ var SnippetManager = function() {
                 re = guard + re;
                 if (re && re[re.length - 1] != "$")
                     re = re + "$";
-            } else {
+            }
+            else {
                 re = re + guard;
                 if (re && re[0] != "^")
                     re = "^" + re;
             }
             return new RegExp(re);
         }
-
         function addSnippet(s) {
             if (!s.scope)
                 s.scope = scope || "_";
@@ -489,7 +578,6 @@ var SnippetManager = function() {
                 snippetMap[scope] = [];
                 snippetNameMap[scope] = {};
             }
-
             var map = snippetNameMap[scope];
             if (s.name) {
                 var old = map[s.name];
@@ -498,39 +586,40 @@ var SnippetManager = function() {
                 map[s.name] = s;
             }
             snippetMap[scope].push(s);
-
+            if (s.prefix)
+                s.tabTrigger = s.prefix;
+            if (!s.content && s.body)
+                s.content = Array.isArray(s.body) ? s.body.join("\n") : s.body;
             if (s.tabTrigger && !s.trigger) {
                 if (!s.guard && /^\w/.test(s.tabTrigger))
                     s.guard = "\\b";
                 s.trigger = lang.escapeRegExp(s.tabTrigger);
             }
-            
             if (!s.trigger && !s.guard && !s.endTrigger && !s.endGuard)
                 return;
-            
             s.startRe = guardedRegexp(s.trigger, s.guard, true);
             s.triggerRe = new RegExp(s.trigger);
-
             s.endRe = guardedRegexp(s.endTrigger, s.endGuard, true);
             s.endTriggerRe = new RegExp(s.endTrigger);
         }
-
-        if (snippets && snippets.content)
-            addSnippet(snippets);
-        else if (Array.isArray(snippets))
+        if (Array.isArray(snippets)) {
             snippets.forEach(addSnippet);
-        
-        this._signal("registerSnippets", {scope: scope});
+        }
+        else {
+            Object.keys(snippets).forEach(function (key) {
+                addSnippet(snippets[key]);
+            });
+        }
+        this._signal("registerSnippets", { scope: scope });
     };
-    this.unregister = function(snippets, scope) {
+    this.unregister = function (snippets, scope) {
         var snippetMap = this.snippetMap;
         var snippetNameMap = this.snippetNameMap;
-
         function removeSnippet(s) {
-            var nameMap = snippetNameMap[s.scope||scope];
+            var nameMap = snippetNameMap[s.scope || scope];
             if (nameMap && nameMap[s.name]) {
                 delete nameMap[s.name];
-                var map = snippetMap[s.scope||scope];
+                var map = snippetMap[s.scope || scope];
                 var i = map && map.indexOf(s);
                 if (i >= 0)
                     map.splice(i, 1);
@@ -541,7 +630,7 @@ var SnippetManager = function() {
         else if (Array.isArray(snippets))
             snippets.forEach(removeSnippet);
     };
-    this.parseSnippetFile = function(str) {
+    this.parseSnippetFile = function (str) {
         str = str.replace(/\r/g, "");
         var list = [], snippet = {};
         var re = /^#.*|^({[\s\S]*})\s*$|^(\S+) (.*)$|^((?:\n*\t.*)+)/gm;
@@ -551,12 +640,15 @@ var SnippetManager = function() {
                 try {
                     snippet = JSON.parse(m[1]);
                     list.push(snippet);
-                } catch (e) {}
-            } if (m[4]) {
+                }
+                catch (e) { }
+            }
+            if (m[4]) {
                 snippet.content = m[4].replace(/^\t/gm, "");
                 list.push(snippet);
                 snippet = {};
-            } else {
+            }
+            else {
                 var key = m[2], val = m[3];
                 if (key == "regex") {
                     var guardRe = /\/((?:[^\/\\]|\\.)*)|$/g;
@@ -564,21 +656,23 @@ var SnippetManager = function() {
                     snippet.trigger = guardRe.exec(val)[1];
                     snippet.endTrigger = guardRe.exec(val)[1];
                     snippet.endGuard = guardRe.exec(val)[1];
-                } else if (key == "snippet") {
+                }
+                else if (key == "snippet") {
                     snippet.tabTrigger = val.match(/^\S*/)[0];
                     if (!snippet.name)
                         snippet.name = val;
-                } else {
+                }
+                else if (key) {
                     snippet[key] = val;
                 }
             }
         }
         return list;
     };
-    this.getSnippetByName = function(name, editor) {
+    this.getSnippetByName = function (name, editor) {
         var snippetMap = this.snippetNameMap;
         var snippet;
-        this.getActiveScopes(editor).some(function(scope) {
+        this.getActiveScopes(editor).some(function (scope) {
             var snippets = snippetMap[scope];
             if (snippets)
                 snippet = snippets[name];
@@ -586,11 +680,8 @@ var SnippetManager = function() {
         }, this);
         return snippet;
     };
-
 }).call(SnippetManager.prototype);
-
-
-var TabstopManager = function(editor) {
+var TabstopManager = function (editor) {
     if (editor.tabstopManager)
         return editor.tabstopManager;
     editor.tabstopManager = this;
@@ -600,14 +691,13 @@ var TabstopManager = function(editor) {
     this.$onAfterExec = this.onAfterExec.bind(this);
     this.attach(editor);
 };
-(function() {
-    this.attach = function(editor) {
+(function () {
+    this.attach = function (editor) {
         this.index = 0;
         this.ranges = [];
         this.tabstops = [];
         this.$openTabstops = null;
         this.selectedTabstop = null;
-
         this.editor = editor;
         this.editor.on("change", this.$onChange);
         this.editor.on("changeSelection", this.$onChangeSelection);
@@ -615,7 +705,7 @@ var TabstopManager = function(editor) {
         this.editor.commands.on("afterExec", this.$onAfterExec);
         this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
     };
-    this.detach = function() {
+    this.detach = function () {
         this.tabstops.forEach(this.removeTabstopMarkers, this);
         this.ranges = null;
         this.tabstops = null;
@@ -628,83 +718,59 @@ var TabstopManager = function(editor) {
         this.editor.tabstopManager = null;
         this.editor = null;
     };
-
-    this.onChange = function(delta) {
-        var changeRange = delta;
+    this.onChange = function (delta) {
         var isRemove = delta.action[0] == "r";
-        var start = delta.start;
-        var end = delta.end;
-        var startRow = start.row;
-        var endRow = end.row;
-        var lineDif = endRow - startRow;
-        var colDiff = end.column - start.column;
-
-        if (isRemove) {
-            lineDif = -lineDif;
-            colDiff = -colDiff;
-        }
-        if (!this.$inChange && isRemove) {
-            var ts = this.selectedTabstop;
-            var changedOutside = ts && !ts.some(function(r) {
-                return comparePoints(r.start, start) <= 0 && comparePoints(r.end, end) >= 0;
-            });
-            if (changedOutside)
-                return this.detach();
-        }
-        var ranges = this.ranges;
-        for (var i = 0; i < ranges.length; i++) {
-            var r = ranges[i];
-            if (r.end.row < start.row)
-                continue;
-
-            if (isRemove && comparePoints(start, r.start) < 0 && comparePoints(end, r.end) > 0) {
-                this.removeRange(r);
-                i--;
-                continue;
+        var selectedTabstop = this.selectedTabstop || {};
+        var parents = selectedTabstop.parents || {};
+        var tabstops = (this.tabstops || []).slice();
+        for (var i = 0; i < tabstops.length; i++) {
+            var ts = tabstops[i];
+            var active = ts == selectedTabstop || parents[ts.index];
+            ts.rangeList.$bias = active ? 0 : 1;
+            if (delta.action == "remove" && ts !== selectedTabstop) {
+                var parentActive = ts.parents && ts.parents[selectedTabstop.index];
+                var startIndex = ts.rangeList.pointIndex(delta.start, parentActive);
+                startIndex = startIndex < 0 ? -startIndex - 1 : startIndex + 1;
+                var endIndex = ts.rangeList.pointIndex(delta.end, parentActive);
+                endIndex = endIndex < 0 ? -endIndex - 1 : endIndex - 1;
+                var toRemove = ts.rangeList.ranges.slice(startIndex, endIndex);
+                for (var j = 0; j < toRemove.length; j++)
+                    this.removeRange(toRemove[j]);
             }
-
-            if (r.start.row == startRow && r.start.column > start.column)
-                r.start.column += colDiff;
-            if (r.end.row == startRow && r.end.column >= start.column)
-                r.end.column += colDiff;
-            if (r.start.row >= startRow)
-                r.start.row += lineDif;
-            if (r.end.row >= startRow)
-                r.end.row += lineDif;
-
-            if (comparePoints(r.start, r.end) > 0)
-                this.removeRange(r);
+            ts.rangeList.$onChange(delta);
         }
-        if (!ranges.length)
+        var session = this.editor.session;
+        if (!this.$inChange && isRemove && session.getLength() == 1 && !session.getValue())
             this.detach();
     };
-    this.updateLinkedFields = function() {
+    this.updateLinkedFields = function () {
         var ts = this.selectedTabstop;
-        if (!ts || !ts.hasLinkedRanges)
+        if (!ts || !ts.hasLinkedRanges || !ts.firstNonLinked)
             return;
         this.$inChange = true;
         var session = this.editor.session;
         var text = session.getTextRange(ts.firstNonLinked);
-        for (var i = ts.length; i--;) {
+        for (var i = 0; i < ts.length; i++) {
             var range = ts[i];
             if (!range.linked)
                 continue;
-            var fmt = exports.snippetManager.tmStrFormat(text, range.original);
+            var original = range.original;
+            var fmt = exports.snippetManager.tmStrFormat(text, original, this.editor);
             session.replace(range, fmt);
         }
         this.$inChange = false;
     };
-    this.onAfterExec = function(e) {
+    this.onAfterExec = function (e) {
         if (e.command && !e.command.readOnly)
             this.updateLinkedFields();
     };
-    this.onChangeSelection = function() {
+    this.onChangeSelection = function () {
         if (!this.editor)
             return;
         var lead = this.editor.selection.lead;
         var anchor = this.editor.selection.anchor;
         var isEmpty = this.editor.selection.isEmpty();
-        for (var i = this.ranges.length; i--;) {
+        for (var i = 0; i < this.ranges.length; i++) {
             if (this.ranges[i].linked)
                 continue;
             var containsLead = this.ranges[i].contains(lead.row, lead.column);
@@ -714,10 +780,10 @@ var TabstopManager = function(editor) {
         }
         this.detach();
     };
-    this.onChangeSession = function() {
+    this.onChangeSession = function () {
         this.detach();
     };
-    this.tabNext = function(dir) {
+    this.tabNext = function (dir) {
         var max = this.tabstops.length;
         var index = this.index + (dir || 1);
         index = Math.min(Math.max(index, 1), max);
@@ -727,7 +793,7 @@ var TabstopManager = function(editor) {
         if (index === 0)
             this.detach();
     };
-    this.selectTabstop = function(index) {
+    this.selectTabstop = function (index) {
         this.$openTabstops = null;
         var ts = this.tabstops[this.index];
         if (ts)
@@ -736,25 +802,28 @@ var TabstopManager = function(editor) {
         ts = this.tabstops[this.index];
         if (!ts || !ts.length)
             return;
-        
         this.selectedTabstop = ts;
-        if (!this.editor.inVirtualSelectionMode) {        
+        var range = ts.firstNonLinked || ts;
+        if (ts.choices)
+            range.cursor = range.start;
+        if (!this.editor.inVirtualSelectionMode) {
             var sel = this.editor.multiSelect;
-            sel.toSingleRange(ts.firstNonLinked.clone());
-            for (var i = ts.length; i--;) {
+            sel.toSingleRange(range);
+            for (var i = 0; i < ts.length; i++) {
                 if (ts.hasLinkedRanges && ts[i].linked)
                     continue;
                 sel.addRange(ts[i].clone(), true);
             }
-            if (sel.ranges[0])
-                sel.addRange(sel.ranges[0].clone());
-        } else {
-            this.editor.selection.setRange(ts.firstNonLinked);
         }
-        
+        else {
+            this.editor.selection.fromOrientedRange(range);
+        }
         this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
+        if (this.selectedTabstop && this.selectedTabstop.choices)
+            this.editor.execCommand("startAutocomplete", { matches: this.selectedTabstop.choices });
     };
-    this.addTabstops = function(tabstops, start, end) {
+    this.addTabstops = function (tabstops, start, end) {
+        var useLink = this.useLink || !this.editor.getOption("enableMultiselect");
         if (!this.$openTabstops)
             this.$openTabstops = [];
         if (!tabstops[0]) {
@@ -764,14 +833,12 @@ var TabstopManager = function(editor) {
             tabstops[0] = [p];
             tabstops[0].index = 0;
         }
-
         var i = this.index;
         var arg = [i + 1, 0];
         var ranges = this.ranges;
-        tabstops.forEach(function(ts, index) {
+        tabstops.forEach(function (ts, index) {
             var dest = this.$openTabstops[index] || ts;
-                
-            for (var i = ts.length; i--;) {
+            for (var i = 0; i < ts.length; i++) {
                 var p = ts[i];
                 var range = Range.fromPoints(p.start, p.end || p.start);
                 movePoint(range.start, start);
@@ -783,10 +850,11 @@ var TabstopManager = function(editor) {
                     dest.unshift(range);
                 else
                     dest[i] = range;
-                if (p.fmtString) {
+                if (p.fmtString || (dest.firstNonLinked && useLink)) {
                     range.linked = true;
                     dest.hasLinkedRanges = true;
-                } else if (!dest.firstNonLinked)
+                }
+                else if (!dest.firstNonLinked)
                     dest.firstNonLinked = range;
             }
             if (!dest.firstNonLinked)
@@ -796,34 +864,40 @@ var TabstopManager = function(editor) {
                 this.$openTabstops[index] = dest;
             }
             this.addTabstopMarkers(dest);
+            dest.rangeList = dest.rangeList || new RangeList();
+            dest.rangeList.$bias = 0;
+            dest.rangeList.addList(dest);
         }, this);
-        
         if (arg.length > 2) {
             if (this.tabstops.length)
                 arg.push(arg.splice(2, 1)[0]);
             this.tabstops.splice.apply(this.tabstops, arg);
         }
     };
-
-    this.addTabstopMarkers = function(ts) {
+    this.addTabstopMarkers = function (ts) {
         var session = this.editor.session;
-        ts.forEach(function(range) {
-            if  (!range.markerId)
+        ts.forEach(function (range) {
+            if (!range.markerId)
                 range.markerId = session.addMarker(range, "ace_snippet-marker", "text");
         });
     };
-    this.removeTabstopMarkers = function(ts) {
+    this.removeTabstopMarkers = function (ts) {
         var session = this.editor.session;
-        ts.forEach(function(range) {
+        ts.forEach(function (range) {
             session.removeMarker(range.markerId);
             range.markerId = null;
         });
     };
-    this.removeRange = function(range) {
+    this.removeRange = function (range) {
         var i = range.tabstop.indexOf(range);
-        range.tabstop.splice(i, 1);
+        if (i != -1)
+            range.tabstop.splice(i, 1);
         i = this.ranges.indexOf(range);
-        this.ranges.splice(i, 1);
+        if (i != -1)
+            this.ranges.splice(i, 1);
+        i = range.tabstop.rangeList.ranges.indexOf(range);
+        if (i != -1)
+            range.tabstop.splice(i, 1);
         this.editor.session.removeMarker(range.markerId);
         if (!range.tabstop.length) {
             i = this.tabstops.indexOf(range.tabstop);
@@ -833,156 +907,112 @@ var TabstopManager = function(editor) {
                 this.detach();
         }
     };
-
     this.keyboardHandler = new HashHandler();
     this.keyboardHandler.bindKeys({
-        "Tab": function(ed) {
-            if (exports.snippetManager && exports.snippetManager.expandWithTab(ed)) {
+        "Tab": function (editor) {
+            if (exports.snippetManager && exports.snippetManager.expandWithTab(editor))
                 return;
-            }
-
-            ed.tabstopManager.tabNext(1);
+            editor.tabstopManager.tabNext(1);
+            editor.renderer.scrollCursorIntoView();
         },
-        "Shift-Tab": function(ed) {
-            ed.tabstopManager.tabNext(-1);
+        "Shift-Tab": function (editor) {
+            editor.tabstopManager.tabNext(-1);
+            editor.renderer.scrollCursorIntoView();
         },
-        "Esc": function(ed) {
-            ed.tabstopManager.detach();
-        },
-        "Return": function(ed) {
-            return false;
+        "Esc": function (editor) {
+            editor.tabstopManager.detach();
         }
     });
 }).call(TabstopManager.prototype);
-
-
-
-var changeTracker = {};
-changeTracker.onChange = Anchor.prototype.onChange;
-changeTracker.setPosition = function(row, column) {
-    this.pos.row = row;
-    this.pos.column = column;
-};
-changeTracker.update = function(pos, delta, $insertRight) {
-    this.$insertRight = $insertRight;
-    this.pos = pos; 
-    this.onChange(delta);
-};
-
-var movePoint = function(point, diff) {
+var movePoint = function (point, diff) {
     if (point.row == 0)
         point.column += diff.column;
     point.row += diff.row;
 };
-
-var moveRelative = function(point, start) {
+var moveRelative = function (point, start) {
     if (point.row == start.row)
         point.column -= start.column;
     point.row -= start.row;
 };
-
-
-require("./lib/dom").importCssString("\
-.ace_snippet-marker {\
-    -moz-box-sizing: border-box;\
-    box-sizing: border-box;\
-    background: rgba(194, 193, 208, 0.09);\
-    border: 1px dotted rgba(211, 208, 235, 0.62);\
-    position: absolute;\
-}");
-
+dom.importCssString("\n.ace_snippet-marker {\n    -moz-box-sizing: border-box;\n    box-sizing: border-box;\n    background: rgba(194, 193, 208, 0.09);\n    border: 1px dotted rgba(211, 208, 235, 0.62);\n    position: absolute;\n}", "snippets.css", false);
 exports.snippetManager = new SnippetManager();
-
-
 var Editor = require("./editor").Editor;
-(function() {
-    this.insertSnippet = function(content, options) {
+(function () {
+    this.insertSnippet = function (content, options) {
         return exports.snippetManager.insertSnippet(this, content, options);
     };
-    this.expandSnippet = function(options) {
+    this.expandSnippet = function (options) {
         return exports.snippetManager.expandWithTab(this, options);
     };
 }).call(Editor.prototype);
 
 });
 
-define("ace/autocomplete/popup",["require","exports","module","ace/virtual_renderer","ace/editor","ace/range","ace/lib/event","ace/lib/lang","ace/lib/dom"], function(require, exports, module) {
-"use strict";
-
+define("ace/autocomplete/popup",["require","exports","module","ace/virtual_renderer","ace/editor","ace/range","ace/lib/event","ace/lib/lang","ace/lib/dom"], function(require, exports, module){"use strict";
 var Renderer = require("../virtual_renderer").VirtualRenderer;
 var Editor = require("../editor").Editor;
 var Range = require("../range").Range;
 var event = require("../lib/event");
 var lang = require("../lib/lang");
 var dom = require("../lib/dom");
-
-var $singleLineEditor = function(el) {
+var getAriaId = function (index) {
+    return "suggest-aria-id:".concat(index);
+};
+var $singleLineEditor = function (el) {
     var renderer = new Renderer(el);
-
     renderer.$maxLines = 4;
-
     var editor = new Editor(renderer);
-
     editor.setHighlightActiveLine(false);
     editor.setShowPrintMargin(false);
     editor.renderer.setShowGutter(false);
     editor.renderer.setHighlightGutterLine(false);
-
     editor.$mouseHandler.$focusTimeout = 0;
     editor.$highlightTagPending = true;
-
     return editor;
 };
-
-var AcePopup = function(parentNode) {
+var AcePopup = function (parentNode) {
     var el = dom.createElement("div");
     var popup = new $singleLineEditor(el);
-
     if (parentNode)
         parentNode.appendChild(el);
     el.style.display = "none";
     popup.renderer.content.style.cursor = "default";
     popup.renderer.setStyle("ace_autocomplete");
-
+    popup.renderer.container.setAttribute("role", "listbox");
+    popup.renderer.container.setAttribute("aria-label", "Autocomplete suggestions");
     popup.setOption("displayIndentGuides", false);
     popup.setOption("dragDelay", 150);
-
-    var noop = function(){};
-
+    var noop = function () { };
     popup.focus = noop;
     popup.$isFocused = true;
-
     popup.renderer.$cursorLayer.restartTimer = noop;
     popup.renderer.$cursorLayer.element.style.opacity = 0;
-
     popup.renderer.$maxLines = 8;
     popup.renderer.$keepTextAreaAtCursor = false;
-
     popup.setHighlightActiveLine(false);
     popup.session.highlight("");
     popup.session.$searchHighlight.clazz = "ace_highlight-marker";
-
-    popup.on("mousedown", function(e) {
+    popup.on("mousedown", function (e) {
         var pos = e.getDocumentPosition();
         popup.selection.moveToPosition(pos);
         selectionMarker.start.row = selectionMarker.end.row = pos.row;
         e.stop();
     });
-
     var lastMouseEvent;
-    var hoverMarker = new Range(-1,0,-1,Infinity);
-    var selectionMarker = new Range(-1,0,-1,Infinity);
+    var hoverMarker = new Range(-1, 0, -1, Infinity);
+    var selectionMarker = new Range(-1, 0, -1, Infinity);
     selectionMarker.id = popup.session.addMarker(selectionMarker, "ace_active-line", "fullLine");
-    popup.setSelectOnHover = function(val) {
+    popup.setSelectOnHover = function (val) {
         if (!val) {
             hoverMarker.id = popup.session.addMarker(hoverMarker, "ace_line-hover", "fullLine");
-        } else if (hoverMarker.id) {
+        }
+        else if (hoverMarker.id) {
             popup.session.removeMarker(hoverMarker.id);
             hoverMarker.id = null;
         }
     };
     popup.setSelectOnHover(false);
-    popup.on("mousemove", function(e) {
+    popup.on("mousemove", function (e) {
         if (!lastMouseEvent) {
             lastMouseEvent = e;
             return;
@@ -999,7 +1029,7 @@ var AcePopup = function(parentNode) {
             setHoverMarker(row);
         }
     });
-    popup.renderer.on("beforeRender", function() {
+    popup.renderer.on("beforeRender", function () {
         if (lastMouseEvent && hoverMarker.start.row != -1) {
             lastMouseEvent.$pos = null;
             var row = lastMouseEvent.getDocumentPosition().row;
@@ -1008,18 +1038,28 @@ var AcePopup = function(parentNode) {
             setHoverMarker(row, true);
         }
     });
-    popup.renderer.on("afterRender", function() {
+    popup.renderer.on("afterRender", function () {
         var row = popup.getRow();
         var t = popup.renderer.$textLayer;
         var selected = t.element.childNodes[row - t.config.firstRow];
-        if (selected !== t.selectedNode && t.selectedNode)
+        var el = document.activeElement; // Active element is textarea of main editor
+        if (selected !== t.selectedNode && t.selectedNode) {
             dom.removeCssClass(t.selectedNode, "ace_selected");
+            el.removeAttribute("aria-activedescendant");
+            t.selectedNode.removeAttribute("id");
+        }
         t.selectedNode = selected;
-        if (selected)
+        if (selected) {
             dom.addCssClass(selected, "ace_selected");
+            var ariaId = getAriaId(row);
+            selected.id = ariaId;
+            popup.renderer.container.setAttribute("aria-activedescendant", ariaId);
+            el.setAttribute("aria-activedescendant", ariaId);
+            selected.setAttribute("aria-label", popup.getData(row).value);
+        }
     });
-    var hideHoverMarker = function() { setHoverMarker(-1); };
-    var setHoverMarker = function(row, suppressRedraw) {
+    var hideHoverMarker = function () { setHoverMarker(-1); };
+    var setHoverMarker = function (row, suppressRedraw) {
         if (row !== hoverMarker.start.row) {
             hoverMarker.start.row = hoverMarker.end.row = row;
             if (!suppressRedraw)
@@ -1027,41 +1067,36 @@ var AcePopup = function(parentNode) {
             popup._emit("changeHoverMarker");
         }
     };
-    popup.getHoveredRow = function() {
+    popup.getHoveredRow = function () {
         return hoverMarker.start.row;
     };
-
     event.addListener(popup.container, "mouseout", hideHoverMarker);
     popup.on("hide", hideHoverMarker);
     popup.on("changeSelection", hideHoverMarker);
-
-    popup.session.doc.getLength = function() {
+    popup.session.doc.getLength = function () {
         return popup.data.length;
     };
-    popup.session.doc.getLine = function(i) {
+    popup.session.doc.getLine = function (i) {
         var data = popup.data[i];
         if (typeof data == "string")
             return data;
         return (data && data.value) || "";
     };
-
     var bgTokenizer = popup.session.bgTokenizer;
-    bgTokenizer.$tokenizeRow = function(row) {
+    bgTokenizer.$tokenizeRow = function (row) {
         var data = popup.data[row];
         var tokens = [];
         if (!data)
             return tokens;
         if (typeof data == "string")
-            data = {value: data};
+            data = { value: data };
         var caption = data.caption || data.value || data.name;
-
         function addToken(value, className) {
             value && tokens.push({
-                type: (data.className || "") + (className || ""), 
+                type: (data.className || "") + (className || ""),
                 value: value
             });
         }
-        
         var lower = caption.toLowerCase();
         var filterText = (popup.filterText || "").toLowerCase();
         var lastIndex = 0;
@@ -1071,45 +1106,43 @@ var AcePopup = function(parentNode) {
                 var sub = filterText.slice(lastI, i);
                 lastI = i;
                 var index = lower.indexOf(sub, lastIndex);
-                if (index == -1) continue;
+                if (index == -1)
+                    continue;
                 addToken(caption.slice(lastIndex, index), "");
                 lastIndex = index + sub.length;
                 addToken(caption.slice(index, lastIndex), "completion-highlight");
             }
         }
         addToken(caption.slice(lastIndex, caption.length), "");
-        
         if (data.meta)
-            tokens.push({type: "completion-meta", value: data.meta});
-
+            tokens.push({ type: "completion-meta", value: data.meta });
+        if (data.message)
+            tokens.push({ type: "completion-message", value: data.message });
         return tokens;
     };
     bgTokenizer.$updateOnChange = noop;
     bgTokenizer.start = noop;
-
-    popup.session.$computeWidth = function() {
+    popup.session.$computeWidth = function () {
         return this.screenWidth = 0;
     };
     popup.isOpen = false;
     popup.isTopdown = false;
     popup.autoSelect = true;
     popup.filterText = "";
-
     popup.data = [];
-    popup.setData = function(list, filterText) {
+    popup.setData = function (list, filterText) {
         popup.filterText = filterText || "";
         popup.setValue(lang.stringRepeat("\n", list.length), -1);
         popup.data = list || [];
         popup.setRow(0);
     };
-    popup.getData = function(row) {
+    popup.getData = function (row) {
         return popup.data[row];
     };
-
-    popup.getRow = function() {
+    popup.getRow = function () {
         return selectionMarker.start.row;
     };
-    popup.setRow = function(line) {
+    popup.setRow = function (line) {
         line = Math.max(this.autoSelect ? 0 : -1, Math.min(this.data.length, line));
         if (selectionMarker.start.row != line) {
             popup.selection.clearSelection();
@@ -1120,19 +1153,17 @@ var AcePopup = function(parentNode) {
                 popup._signal("select");
         }
     };
-
-    popup.on("changeSelection", function() {
+    popup.on("changeSelection", function () {
         if (popup.isOpen)
             popup.setRow(popup.selection.lead.row);
         popup.renderer.scrollCursorIntoView();
     });
-
-    popup.hide = function() {
+    popup.hide = function () {
         this.container.style.display = "none";
         this._signal("hide");
         popup.isOpen = false;
     };
-    popup.show = function(pos, lineHeight, topdownOnly) {
+    popup.show = function (pos, lineHeight, topdownOnly) {
         var el = this.container;
         var screenHeight = window.innerHeight;
         var screenWidth = window.innerWidth;
@@ -1145,111 +1176,75 @@ var AcePopup = function(parentNode) {
             el.style.top = "";
             el.style.bottom = screenHeight - top + "px";
             popup.isTopdown = false;
-        } else {
+        }
+        else {
             top += lineHeight;
             renderer.$maxPixelHeight = screenHeight - top - 0.2 * lineHeight;
             el.style.top = top + "px";
             el.style.bottom = "";
             popup.isTopdown = true;
         }
-
         el.style.display = "";
-
         var left = pos.left;
         if (left + el.offsetWidth > screenWidth)
             left = screenWidth - el.offsetWidth;
-
         el.style.left = left + "px";
-
         this._signal("show");
         lastMouseEvent = null;
         popup.isOpen = true;
     };
-
-    popup.getTextLeftOffset = function() {
+    popup.goTo = function (where) {
+        var row = this.getRow();
+        var max = this.session.getLength() - 1;
+        switch (where) {
+            case "up":
+                row = row <= 0 ? max : row - 1;
+                break;
+            case "down":
+                row = row >= max ? -1 : row + 1;
+                break;
+            case "start":
+                row = 0;
+                break;
+            case "end":
+                row = max;
+                break;
+        }
+        this.setRow(row);
+    };
+    popup.getTextLeftOffset = function () {
         return this.$borderSize + this.renderer.$padding + this.$imageSize;
     };
-
     popup.$imageSize = 0;
     popup.$borderSize = 1;
-
     return popup;
 };
-
-dom.importCssString("\
-.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {\
-    background-color: #CAD6FA;\
-    z-index: 1;\
-}\
-.ace_dark.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {\
-    background-color: #3a674e;\
-}\
-.ace_editor.ace_autocomplete .ace_line-hover {\
-    border: 1px solid #abbffe;\
-    margin-top: -1px;\
-    background: rgba(233,233,253,0.4);\
-    position: absolute;\
-    z-index: 2;\
-}\
-.ace_dark.ace_editor.ace_autocomplete .ace_line-hover {\
-    border: 1px solid rgba(109, 150, 13, 0.8);\
-    background: rgba(58, 103, 78, 0.62);\
-}\
-.ace_completion-meta {\
-    opacity: 0.5;\
-    margin: 0.9em;\
-}\
-.ace_editor.ace_autocomplete .ace_completion-highlight{\
-    color: #2d69c7;\
-}\
-.ace_dark.ace_editor.ace_autocomplete .ace_completion-highlight{\
-    color: #93ca12;\
-}\
-.ace_editor.ace_autocomplete {\
-    width: 300px;\
-    z-index: 200000;\
-    border: 1px lightgray solid;\
-    position: fixed;\
-    box-shadow: 2px 3px 5px rgba(0,0,0,.2);\
-    line-height: 1.4;\
-    background: #fefefe;\
-    color: #111;\
-}\
-.ace_dark.ace_editor.ace_autocomplete {\
-    border: 1px #484747 solid;\
-    box-shadow: 2px 3px 5px rgba(0, 0, 0, 0.51);\
-    line-height: 1.4;\
-    background: #25282c;\
-    color: #c1c1c1;\
-}", "autocompletion.css");
-
+dom.importCssString("\n.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {\n    background-color: #CAD6FA;\n    z-index: 1;\n}\n.ace_dark.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {\n    background-color: #3a674e;\n}\n.ace_editor.ace_autocomplete .ace_line-hover {\n    border: 1px solid #abbffe;\n    margin-top: -1px;\n    background: rgba(233,233,253,0.4);\n    position: absolute;\n    z-index: 2;\n}\n.ace_dark.ace_editor.ace_autocomplete .ace_line-hover {\n    border: 1px solid rgba(109, 150, 13, 0.8);\n    background: rgba(58, 103, 78, 0.62);\n}\n.ace_completion-meta {\n    opacity: 0.5;\n    margin: 0.9em;\n}\n.ace_completion-message {\n    color: blue;\n}\n.ace_editor.ace_autocomplete .ace_completion-highlight{\n    color: #2d69c7;\n}\n.ace_dark.ace_editor.ace_autocomplete .ace_completion-highlight{\n    color: #93ca12;\n}\n.ace_editor.ace_autocomplete {\n    width: 300px;\n    z-index: 200000;\n    border: 1px lightgray solid;\n    position: fixed;\n    box-shadow: 2px 3px 5px rgba(0,0,0,.2);\n    line-height: 1.4;\n    background: #fefefe;\n    color: #111;\n}\n.ace_dark.ace_editor.ace_autocomplete {\n    border: 1px #484747 solid;\n    box-shadow: 2px 3px 5px rgba(0, 0, 0, 0.51);\n    line-height: 1.4;\n    background: #25282c;\n    color: #c1c1c1;\n}", "autocompletion.css", false);
 exports.AcePopup = AcePopup;
+exports.$singleLineEditor = $singleLineEditor;
+exports.getAriaId = getAriaId;
 
 });
 
-define("ace/autocomplete/util",["require","exports","module"], function(require, exports, module) {
-"use strict";
-
-exports.parForEach = function(array, fn, callback) {
+define("ace/autocomplete/util",["require","exports","module"], function(require, exports, module){"use strict";
+exports.parForEach = function (array, fn, callback) {
     var completed = 0;
     var arLength = array.length;
     if (arLength === 0)
         callback();
     for (var i = 0; i < arLength; i++) {
-        fn(array[i], function(result, err) {
+        fn(array[i], function (result, err) {
             completed++;
             if (completed === arLength)
                 callback(result, err);
         });
     }
 };
-
-var ID_REGEX = /[a-zA-Z_0-9\$\-\u00A2-\uFFFF]/;
-
-exports.retrievePrecedingIdentifier = function(text, pos, regex) {
+var ID_REGEX = /[a-zA-Z_0-9\$\-\u00A2-\u2000\u2070-\uFFFF]/;
+exports.retrievePrecedingIdentifier = function (text, pos, regex) {
     regex = regex || ID_REGEX;
     var buf = [];
-    for (var i = pos-1; i >= 0; i--) {
+    for (var i = pos - 1; i >= 0; i--) {
         if (regex.test(text[i]))
             buf.push(text[i]);
         else
@@ -1257,8 +1252,7 @@ exports.retrievePrecedingIdentifier = function(text, pos, regex) {
     }
     return buf.reverse().join("");
 };
-
-exports.retrieveFollowingIdentifier = function(text, pos, regex) {
+exports.retrieveFollowingIdentifier = function (text, pos, regex) {
     regex = regex || ID_REGEX;
     var buf = [];
     for (var i = pos; i < text.length; i++) {
@@ -1269,14 +1263,13 @@ exports.retrieveFollowingIdentifier = function(text, pos, regex) {
     }
     return buf;
 };
-
 exports.getCompletionPrefix = function (editor) {
     var pos = editor.getCursorPosition();
     var line = editor.session.getLine(pos.row);
     var prefix;
-    editor.completers.forEach(function(completer) {
+    editor.completers.forEach(function (completer) {
         if (completer.identifierRegexps) {
-            completer.identifierRegexps.forEach(function(identifierRegex) {
+            completer.identifierRegexps.forEach(function (identifierRegex) {
                 if (!prefix && identifierRegex)
                     prefix = this.retrievePrecedingIdentifier(line, pos.column, identifierRegex);
             }.bind(this));
@@ -1287,42 +1280,35 @@ exports.getCompletionPrefix = function (editor) {
 
 });
 
-define("ace/autocomplete",["require","exports","module","ace/keyboard/hash_handler","ace/autocomplete/popup","ace/autocomplete/util","ace/lib/event","ace/lib/lang","ace/lib/dom","ace/snippets"], function(require, exports, module) {
-"use strict";
-
+define("ace/autocomplete",["require","exports","module","ace/keyboard/hash_handler","ace/autocomplete/popup","ace/autocomplete/popup","ace/autocomplete/util","ace/lib/lang","ace/lib/dom","ace/snippets","ace/config"], function(require, exports, module){"use strict";
 var HashHandler = require("./keyboard/hash_handler").HashHandler;
 var AcePopup = require("./autocomplete/popup").AcePopup;
+var getAriaId = require("./autocomplete/popup").getAriaId;
 var util = require("./autocomplete/util");
-var event = require("./lib/event");
 var lang = require("./lib/lang");
 var dom = require("./lib/dom");
 var snippetManager = require("./snippets").snippetManager;
-
-var Autocomplete = function() {
+var config = require("./config");
+var Autocomplete = function () {
     this.autoInsert = false;
     this.autoSelect = true;
     this.exactMatch = false;
     this.gatherCompletionsId = 0;
     this.keyboardHandler = new HashHandler();
     this.keyboardHandler.bindKeys(this.commands);
-
     this.blurListener = this.blurListener.bind(this);
     this.changeListener = this.changeListener.bind(this);
     this.mousedownListener = this.mousedownListener.bind(this);
     this.mousewheelListener = this.mousewheelListener.bind(this);
-
-    this.changeTimer = lang.delayedCall(function() {
+    this.changeTimer = lang.delayedCall(function () {
         this.updateCompletions(true);
     }.bind(this));
-
     this.tooltipTimer = lang.delayedCall(this.updateDocTooltip.bind(this), 50);
 };
-
-(function() {
-
-    this.$init = function() {
+(function () {
+    this.$init = function () {
         this.popup = new AcePopup(document.body || document.documentElement);
-        this.popup.on("click", function(e) {
+        this.popup.on("click", function (e) {
             this.insertMatch();
             e.stop();
         }.bind(this));
@@ -1332,44 +1318,36 @@ var Autocomplete = function() {
         this.popup.on("changeHoverMarker", this.tooltipTimer.bind(null, null));
         return this.popup;
     };
-
-    this.getPopup = function() {
+    this.getPopup = function () {
         return this.popup || this.$init();
     };
-
-    this.openPopup = function(editor, prefix, keepPopupPosition) {
+    this.openPopup = function (editor, prefix, keepPopupPosition) {
         if (!this.popup)
             this.$init();
-
         this.popup.autoSelect = this.autoSelect;
-
         this.popup.setData(this.completions.filtered, this.completions.filterText);
-
+        this.editor.textInput.setAriaOptions({ activeDescendant: getAriaId(this.popup.getRow()) });
         editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
-        
         var renderer = editor.renderer;
         this.popup.setRow(this.autoSelect ? 0 : -1);
         if (!keepPopupPosition) {
             this.popup.setTheme(editor.getTheme());
             this.popup.setFontSize(editor.getFontSize());
-
             var lineHeight = renderer.layerConfig.lineHeight;
-
             var pos = renderer.$cursorLayer.getPixelPosition(this.base, true);
             pos.left -= this.popup.getTextLeftOffset();
-
             var rect = editor.container.getBoundingClientRect();
             pos.top += rect.top - renderer.layerConfig.offset;
             pos.left += rect.left - editor.renderer.scrollLeft;
             pos.left += renderer.gutterWidth;
-
             this.popup.show(pos, lineHeight);
-        } else if (keepPopupPosition && !prefix) {
+        }
+        else if (keepPopupPosition && !prefix) {
             this.detach();
         }
+        this.changeTimer.cancel();
     };
-
-    this.detach = function() {
+    this.detach = function () {
         this.editor.keyBinding.removeKeyboardHandler(this.keyboardHandler);
         this.editor.off("changeSelection", this.changeListener);
         this.editor.off("blur", this.blurListener);
@@ -1377,18 +1355,15 @@ var Autocomplete = function() {
         this.editor.off("mousewheel", this.mousewheelListener);
         this.changeTimer.cancel();
         this.hideDocTooltip();
-
         this.gatherCompletionsId += 1;
         if (this.popup && this.popup.isOpen)
             this.popup.hide();
-
         if (this.base)
             this.base.detach();
         this.activated = false;
         this.completions = this.base = null;
     };
-
-    this.changeListener = function(e) {
+    this.changeListener = function (e) {
         var cursor = this.editor.selection.lead;
         if (cursor.row != this.base.row || cursor.column < this.base.column) {
             this.detach();
@@ -1398,54 +1373,42 @@ var Autocomplete = function() {
         else
             this.detach();
     };
-
-    this.blurListener = function(e) {
+    this.blurListener = function (e) {
         var el = document.activeElement;
         var text = this.editor.textInput.getElement();
         var fromTooltip = e.relatedTarget && this.tooltipNode && this.tooltipNode.contains(e.relatedTarget);
         var container = this.popup && this.popup.container;
         if (el != text && el.parentNode != container && !fromTooltip
-            && el != this.tooltipNode && e.relatedTarget != text
-        ) {
+            && el != this.tooltipNode && e.relatedTarget != text) {
             this.detach();
         }
     };
-
-    this.mousedownListener = function(e) {
+    this.mousedownListener = function (e) {
         this.detach();
     };
-
-    this.mousewheelListener = function(e) {
+    this.mousewheelListener = function (e) {
         this.detach();
     };
-
-    this.goTo = function(where) {
-        var row = this.popup.getRow();
-        var max = this.popup.session.getLength() - 1;
-
-        switch(where) {
-            case "up": row = row <= 0 ? max : row - 1; break;
-            case "down": row = row >= max ? -1 : row + 1; break;
-            case "start": row = 0; break;
-            case "end": row = max; break;
-        }
-
-        this.popup.setRow(row);
+    this.goTo = function (where) {
+        this.popup.goTo(where);
     };
-
-    this.insertMatch = function(data, options) {
+    this.insertMatch = function (data, options) {
         if (!data)
             data = this.popup.getData(this.popup.getRow());
         if (!data)
             return false;
-
+        var completions = this.completions;
+        this.editor.startOperation({ command: { name: "insertMatch" } });
         if (data.completer && data.completer.insertMatch) {
             data.completer.insertMatch(this.editor, data);
-        } else {
-            if (this.completions.filterText) {
+        }
+        else {
+            if (!completions)
+                return false;
+            if (completions.filterText) {
                 var ranges = this.editor.selection.getAllRanges();
                 for (var i = 0, range; range = ranges[i]; i++) {
-                    range.start.column -= this.completions.filterText.length;
+                    range.start.column -= completions.filterText.length;
                     this.editor.session.remove(range);
                 }
             }
@@ -1454,44 +1417,38 @@ var Autocomplete = function() {
             else
                 this.editor.execCommand("insertstring", data.value || data);
         }
-        this.detach();
+        if (this.completions == completions)
+            this.detach();
+        this.editor.endOperation();
     };
-
-
     this.commands = {
-        "Up": function(editor) { editor.completer.goTo("up"); },
-        "Down": function(editor) { editor.completer.goTo("down"); },
-        "Ctrl-Up|Ctrl-Home": function(editor) { editor.completer.goTo("start"); },
-        "Ctrl-Down|Ctrl-End": function(editor) { editor.completer.goTo("end"); },
-
-        "Esc": function(editor) { editor.completer.detach(); },
-        "Return": function(editor) { return editor.completer.insertMatch(); },
-        "Shift-Return": function(editor) { editor.completer.insertMatch(null, {deleteSuffix: true}); },
-        "Tab": function(editor) {
+        "Up": function (editor) { editor.completer.goTo("up"); },
+        "Down": function (editor) { editor.completer.goTo("down"); },
+        "Ctrl-Up|Ctrl-Home": function (editor) { editor.completer.goTo("start"); },
+        "Ctrl-Down|Ctrl-End": function (editor) { editor.completer.goTo("end"); },
+        "Esc": function (editor) { editor.completer.detach(); },
+        "Return": function (editor) { return editor.completer.insertMatch(); },
+        "Shift-Return": function (editor) { editor.completer.insertMatch(null, { deleteSuffix: true }); },
+        "Tab": function (editor) {
             var result = editor.completer.insertMatch();
             if (!result && !editor.tabstopManager)
                 editor.completer.goTo("down");
             else
                 return result;
         },
-
-        "PageUp": function(editor) { editor.completer.popup.gotoPageUp(); },
-        "PageDown": function(editor) { editor.completer.popup.gotoPageDown(); }
+        "PageUp": function (editor) { editor.completer.popup.gotoPageUp(); },
+        "PageDown": function (editor) { editor.completer.popup.gotoPageDown(); }
     };
-
-    this.gatherCompletions = function(editor, callback) {
+    this.gatherCompletions = function (editor, callback) {
         var session = editor.getSession();
         var pos = editor.getCursorPosition();
-
         var prefix = util.getCompletionPrefix(editor);
-
         this.base = session.doc.createAnchor(pos.row, pos.column - prefix.length);
         this.base.$insertRight = true;
-
         var matches = [];
         var total = editor.completers.length;
-        editor.completers.forEach(function(completer, i) {
-            completer.getCompletions(editor, session, pos, prefix, function(err, results) {
+        editor.completers.forEach(function (completer, i) {
+            completer.getCompletions(editor, session, pos, prefix, function (err, results) {
                 if (!err && results)
                     matches = matches.concat(results);
                 callback(null, {
@@ -1503,104 +1460,113 @@ var Autocomplete = function() {
         });
         return true;
     };
-
-    this.showPopup = function(editor) {
+    this.showPopup = function (editor, options) {
         if (this.editor)
             this.detach();
-
         this.activated = true;
-
         this.editor = editor;
         if (editor.completer != this) {
             if (editor.completer)
                 editor.completer.detach();
             editor.completer = this;
         }
-
         editor.on("changeSelection", this.changeListener);
         editor.on("blur", this.blurListener);
         editor.on("mousedown", this.mousedownListener);
         editor.on("mousewheel", this.mousewheelListener);
-
-        this.updateCompletions();
+        this.updateCompletions(false, options);
     };
-
-    this.updateCompletions = function(keepPopupPosition) {
+    this.updateCompletions = function (keepPopupPosition, options) {
         if (keepPopupPosition && this.base && this.completions) {
             var pos = this.editor.getCursorPosition();
-            var prefix = this.editor.session.getTextRange({start: this.base, end: pos});
+            var prefix = this.editor.session.getTextRange({ start: this.base, end: pos });
             if (prefix == this.completions.filterText)
                 return;
             this.completions.setFilter(prefix);
             if (!this.completions.filtered.length)
                 return this.detach();
             if (this.completions.filtered.length == 1
-            && this.completions.filtered[0].value == prefix
-            && !this.completions.filtered[0].snippet)
+                && this.completions.filtered[0].value == prefix
+                && !this.completions.filtered[0].snippet)
                 return this.detach();
             this.openPopup(this.editor, prefix, keepPopupPosition);
             return;
         }
+        if (options && options.matches) {
+            var pos = this.editor.getSelectionRange().start;
+            this.base = this.editor.session.doc.createAnchor(pos.row, pos.column);
+            this.base.$insertRight = true;
+            this.completions = new FilteredList(options.matches);
+            return this.openPopup(this.editor, "", keepPopupPosition);
+        }
         var _id = this.gatherCompletionsId;
-        this.gatherCompletions(this.editor, function(err, results) {
-            var detachIfFinished = function() {
-                if (!results.finished) return;
-                return this.detach();
-            }.bind(this);
-
-            var prefix = results.prefix;
-            var matches = results && results.matches;
-
-            if (!matches || !matches.length)
-                return detachIfFinished();
-            if (prefix.indexOf(results.prefix) !== 0 || _id != this.gatherCompletionsId)
+        var detachIfFinished = function (results) {
+            if (!results.finished)
                 return;
-
+            return this.detach();
+        }.bind(this);
+        var processResults = function (results) {
+            var prefix = results.prefix;
+            var matches = results.matches;
             this.completions = new FilteredList(matches);
-
             if (this.exactMatch)
                 this.completions.exactMatch = true;
-
             this.completions.setFilter(prefix);
             var filtered = this.completions.filtered;
             if (!filtered.length)
-                return detachIfFinished();
+                return detachIfFinished(results);
             if (filtered.length == 1 && filtered[0].value == prefix && !filtered[0].snippet)
-                return detachIfFinished();
+                return detachIfFinished(results);
             if (this.autoInsert && filtered.length == 1 && results.finished)
                 return this.insertMatch(filtered[0]);
-
             this.openPopup(this.editor, prefix, keepPopupPosition);
+        }.bind(this);
+        var isImmediate = true;
+        var immediateResults = null;
+        this.gatherCompletions(this.editor, function (err, results) {
+            var prefix = results.prefix;
+            var matches = results && results.matches;
+            if (!matches || !matches.length)
+                return detachIfFinished(results);
+            if (prefix.indexOf(results.prefix) !== 0 || _id != this.gatherCompletionsId)
+                return;
+            if (isImmediate) {
+                immediateResults = results;
+                return;
+            }
+            processResults(results);
         }.bind(this));
+        isImmediate = false;
+        if (immediateResults) {
+            var results = immediateResults;
+            immediateResults = null;
+            processResults(results);
+        }
     };
-
-    this.cancelContextMenu = function() {
+    this.cancelContextMenu = function () {
         this.editor.$mouseHandler.cancelContextMenu();
     };
-
-    this.updateDocTooltip = function() {
+    this.updateDocTooltip = function () {
         var popup = this.popup;
         var all = popup.data;
         var selected = all && (all[popup.getHoveredRow()] || all[popup.getRow()]);
         var doc = null;
         if (!selected || !this.editor || !this.popup.isOpen)
             return this.hideDocTooltip();
-        this.editor.completers.some(function(completer) {
+        this.editor.completers.some(function (completer) {
             if (completer.getDocTooltip)
                 doc = completer.getDocTooltip(selected);
             return doc;
         });
-        if (!doc)
+        if (!doc && typeof selected != "string")
             doc = selected;
-
         if (typeof doc == "string")
-            doc = {docText: doc};
+            doc = { docText: doc };
         if (!doc || !(doc.docHTML || doc.docText))
             return this.hideDocTooltip();
         this.showDocTooltip(doc);
     };
-
-    this.showDocTooltip = function(item) {
+    this.showDocTooltip = function (item) {
         if (!this.tooltipNode) {
             this.tooltipNode = dom.createElement("div");
             this.tooltipNode.className = "ace_tooltip ace_doc-tooltip";
@@ -1610,48 +1576,49 @@ var Autocomplete = function() {
             this.tooltipNode.onblur = this.blurListener.bind(this);
             this.tooltipNode.onclick = this.onTooltipClick.bind(this);
         }
-
         var tooltipNode = this.tooltipNode;
         if (item.docHTML) {
             tooltipNode.innerHTML = item.docHTML;
-        } else if (item.docText) {
+        }
+        else if (item.docText) {
             tooltipNode.textContent = item.docText;
         }
-
         if (!tooltipNode.parentNode)
             document.body.appendChild(tooltipNode);
         var popup = this.popup;
         var rect = popup.container.getBoundingClientRect();
         tooltipNode.style.top = popup.container.style.top;
         tooltipNode.style.bottom = popup.container.style.bottom;
-
         tooltipNode.style.display = "block";
         if (window.innerWidth - rect.right < 320) {
             if (rect.left < 320) {
-                if(popup.isTopdown) {
+                if (popup.isTopdown) {
                     tooltipNode.style.top = rect.bottom + "px";
                     tooltipNode.style.left = rect.left + "px";
                     tooltipNode.style.right = "";
                     tooltipNode.style.bottom = "";
-                } else {
+                }
+                else {
                     tooltipNode.style.top = popup.container.offsetTop - tooltipNode.offsetHeight + "px";
                     tooltipNode.style.left = rect.left + "px";
                     tooltipNode.style.right = "";
                     tooltipNode.style.bottom = "";
                 }
-            } else {
+            }
+            else {
                 tooltipNode.style.right = window.innerWidth - rect.left + "px";
                 tooltipNode.style.left = "";
             }
-        } else {
+        }
+        else {
             tooltipNode.style.left = (rect.right + 1) + "px";
             tooltipNode.style.right = "";
         }
     };
-
-    this.hideDocTooltip = function() {
+    this.hideDocTooltip = function () {
         this.tooltipTimer.cancel();
-        if (!this.tooltipNode) return;
+        if (!this.tooltipNode)
+            return;
         var el = this.tooltipNode;
         if (!this.editor.isFocused() && document.activeElement == el)
             this.editor.focus();
@@ -1659,8 +1626,7 @@ var Autocomplete = function() {
         if (el.parentNode)
             el.parentNode.removeChild(el);
     };
-    
-    this.onTooltipClick = function(e) {
+    this.onTooltipClick = function (e) {
         var a = e.target;
         while (a && a != this.tooltipNode) {
             if (a.nodeName == "A" && a.href) {
@@ -1671,71 +1637,97 @@ var Autocomplete = function() {
             a = a.parentNode;
         }
     };
-
+    this.destroy = function () {
+        this.detach();
+        if (this.popup) {
+            this.popup.destroy();
+            var el = this.popup.container;
+            if (el && el.parentNode)
+                el.parentNode.removeChild(el);
+        }
+        if (this.editor && this.editor.completer == this)
+            this.editor.completer == null;
+        this.popup = null;
+    };
 }).call(Autocomplete.prototype);
-
+Autocomplete.for = function (editor) {
+    if (editor.completer) {
+        return editor.completer;
+    }
+    if (config.get("sharedPopups")) {
+        if (!Autocomplete.$shared)
+            Autocomplete.$sharedInstance = new Autocomplete();
+        editor.completer = Autocomplete.$sharedInstance;
+    }
+    else {
+        editor.completer = new Autocomplete();
+        editor.once("destroy", function (e, editor) {
+            editor.completer.destroy();
+        });
+    }
+    return editor.completer;
+};
 Autocomplete.startCommand = {
     name: "startAutocomplete",
-    exec: function(editor) {
-        if (!editor.completer)
-            editor.completer = new Autocomplete();
-        editor.completer.autoInsert = false;
-        editor.completer.autoSelect = true;
-        editor.completer.showPopup(editor);
-        editor.completer.cancelContextMenu();
+    exec: function (editor, options) {
+        var completer = Autocomplete.for(editor);
+        completer.autoInsert = false;
+        completer.autoSelect = true;
+        completer.showPopup(editor, options);
+        completer.cancelContextMenu();
     },
     bindKey: "Ctrl-Space|Ctrl-Shift-Space|Alt-Space"
 };
-
-var FilteredList = function(array, filterText) {
+var FilteredList = function (array, filterText) {
     this.all = array;
     this.filtered = array;
     this.filterText = filterText || "";
     this.exactMatch = false;
 };
-(function(){
-    this.setFilter = function(str) {
+(function () {
+    this.setFilter = function (str) {
         if (str.length > this.filterText && str.lastIndexOf(this.filterText, 0) === 0)
             var matches = this.filtered;
         else
             var matches = this.all;
-
         this.filterText = str;
         matches = this.filterCompletions(matches, this.filterText);
-        matches = matches.sort(function(a, b) {
-            return b.exactMatch - a.exactMatch || b.$score - a.$score 
-                || (a.caption || a.value) < (b.caption || b.value);
+        matches = matches.sort(function (a, b) {
+            return b.exactMatch - a.exactMatch || b.$score - a.$score
+                || (a.caption || a.value).localeCompare(b.caption || b.value);
         });
         var prev = null;
-        matches = matches.filter(function(item){
+        matches = matches.filter(function (item) {
             var caption = item.snippet || item.caption || item.value;
-            if (caption === prev) return false;
+            if (caption === prev)
+                return false;
             prev = caption;
             return true;
         });
-
         this.filtered = matches;
     };
-    this.filterCompletions = function(items, needle) {
+    this.filterCompletions = function (items, needle) {
         var results = [];
         var upper = needle.toUpperCase();
         var lower = needle.toLowerCase();
         loop: for (var i = 0, item; item = items[i]; i++) {
             var caption = item.caption || item.value || item.snippet;
-            if (!caption) continue;
+            if (!caption)
+                continue;
             var lastIndex = -1;
             var matchMask = 0;
             var penalty = 0;
             var index, distance;
-
             if (this.exactMatch) {
                 if (needle !== caption.substr(0, needle.length))
                     continue loop;
-            } else {
+            }
+            else {
                 var fullMatchIndex = caption.toLowerCase().indexOf(lower);
                 if (fullMatchIndex > -1) {
                     penalty = fullMatchIndex;
-                } else {
+                }
+                else {
                     for (var j = 0; j < needle.length; j++) {
                         var i1 = caption.indexOf(lower[j], lastIndex + 1);
                         var i2 = caption.indexOf(upper[j], lastIndex + 1);
@@ -1761,68 +1753,60 @@ var FilteredList = function(array, filterText) {
         return results;
     };
 }).call(FilteredList.prototype);
-
 exports.Autocomplete = Autocomplete;
 exports.FilteredList = FilteredList;
 
 });
 
-define("ace/autocomplete/text_completer",["require","exports","module","ace/range"], function(require, exports, module) {
-    var Range = require("../range").Range;
-    
-    var splitRegex = /[^a-zA-Z_0-9\$\-\u00C0-\u1FFF\u2C00-\uD7FF\w]+/;
-
-    function getWordIndex(doc, pos) {
-        var textBefore = doc.getTextRange(Range.fromPoints({row: 0, column:0}, pos));
-        return textBefore.split(splitRegex).length - 1;
-    }
-    function wordDistance(doc, pos) {
-        var prefixPos = getWordIndex(doc, pos);
-        var words = doc.getValue().split(splitRegex);
-        var wordScores = Object.create(null);
-        
-        var currentWord = words[prefixPos];
-
-        words.forEach(function(word, idx) {
-            if (!word || word === currentWord) return;
-
-            var distance = Math.abs(prefixPos - idx);
-            var score = words.length - distance;
-            if (wordScores[word]) {
-                wordScores[word] = Math.max(score, wordScores[word]);
-            } else {
-                wordScores[word] = score;
-            }
-        });
-        return wordScores;
-    }
+define("ace/autocomplete/text_completer",["require","exports","module","ace/range"], function(require, exports, module){var Range = require("../range").Range;
+var splitRegex = /[^a-zA-Z_0-9\$\-\u00C0-\u1FFF\u2C00-\uD7FF\w]+/;
+function getWordIndex(doc, pos) {
+    var textBefore = doc.getTextRange(Range.fromPoints({ row: 0, column: 0 }, pos));
+    return textBefore.split(splitRegex).length - 1;
+}
+function wordDistance(doc, pos) {
+    var prefixPos = getWordIndex(doc, pos);
+    var words = doc.getValue().split(splitRegex);
+    var wordScores = Object.create(null);
+    var currentWord = words[prefixPos];
+    words.forEach(function (word, idx) {
+        if (!word || word === currentWord)
+            return;
+        var distance = Math.abs(prefixPos - idx);
+        var score = words.length - distance;
+        if (wordScores[word]) {
+            wordScores[word] = Math.max(score, wordScores[word]);
+        }
+        else {
+            wordScores[word] = score;
+        }
+    });
+    return wordScores;
+}
+exports.getCompletions = function (editor, session, pos, prefix, callback) {
+    var wordScore = wordDistance(session, pos);
+    var wordList = Object.keys(wordScore);
+    callback(null, wordList.map(function (word) {
+        return {
+            caption: word,
+            value: word,
+            score: wordScore[word],
+            meta: "local"
+        };
+    }));
+};
 
-    exports.getCompletions = function(editor, session, pos, prefix, callback) {
-        var wordScore = wordDistance(session, pos);
-        var wordList = Object.keys(wordScore);
-        callback(null, wordList.map(function(word) {
-            return {
-                caption: word,
-                value: word,
-                score: wordScore[word],
-                meta: "local"
-            };
-        }));
-    };
 });
 
-define("ace/ext/language_tools",["require","exports","module","ace/snippets","ace/autocomplete","ace/config","ace/lib/lang","ace/autocomplete/util","ace/autocomplete/text_completer","ace/editor","ace/config"], function(require, exports, module) {
-"use strict";
-
+define("ace/ext/language_tools",["require","exports","module","ace/snippets","ace/autocomplete","ace/config","ace/lib/lang","ace/autocomplete/util","ace/autocomplete/text_completer","ace/editor","ace/config"], function(require, exports, module){"use strict";
 var snippetManager = require("../snippets").snippetManager;
 var Autocomplete = require("../autocomplete").Autocomplete;
 var config = require("../config");
 var lang = require("../lib/lang");
 var util = require("../autocomplete/util");
-
 var textCompleter = require("../autocomplete/text_completer");
 var keyWordCompleter = {
-    getCompletions: function(editor, session, pos, prefix, callback) {
+    getCompletions: function (editor, session, pos, prefix, callback) {
         if (session.$mode.completer) {
             return session.$mode.completer.getCompletions(editor, session, pos, prefix, callback);
         }
@@ -1831,19 +1815,25 @@ var keyWordCompleter = {
         callback(null, completions);
     }
 };
-
+var transformSnippetTooltip = function (str) {
+    var record = {};
+    return str.replace(/\${(\d+)(:(.*?))?}/g, function (_, p1, p2, p3) {
+        return (record[p1] = p3 || '');
+    }).replace(/\$(\d+?)/g, function (_, p1) {
+        return record[p1];
+    });
+};
 var snippetCompleter = {
-    getCompletions: function(editor, session, pos, prefix, callback) {
+    getCompletions: function (editor, session, pos, prefix, callback) {
         var scopes = [];
         var token = session.getTokenAt(pos.row, pos.column);
         if (token && token.type.match(/(tag-name|tag-open|tag-whitespace|attribute-name|attribute-value)\.xml$/))
             scopes.push('html-tag');
         else
             scopes = snippetManager.getActiveScopes(editor);
-
         var snippetMap = snippetManager.snippetMap;
         var completions = [];
-        scopes.forEach(function(scope) {
+        scopes.forEach(function (scope) {
             var snippets = snippetMap[scope] || [];
             for (var i = snippets.length; i--;) {
                 var s = snippets[i];
@@ -1860,71 +1850,68 @@ var snippetCompleter = {
         }, this);
         callback(null, completions);
     },
-    getDocTooltip: function(item) {
+    getDocTooltip: function (item) {
         if (item.type == "snippet" && !item.docHTML) {
             item.docHTML = [
                 "<b>", lang.escapeHTML(item.caption), "</b>", "<hr></hr>",
-                lang.escapeHTML(item.snippet)
+                lang.escapeHTML(transformSnippetTooltip(item.snippet))
             ].join("");
         }
     }
 };
-
 var completers = [snippetCompleter, textCompleter, keyWordCompleter];
-exports.setCompleters = function(val) {
+exports.setCompleters = function (val) {
     completers.length = 0;
-    if (val) completers.push.apply(completers, val);
+    if (val)
+        completers.push.apply(completers, val);
 };
-exports.addCompleter = function(completer) {
+exports.addCompleter = function (completer) {
     completers.push(completer);
 };
 exports.textCompleter = textCompleter;
 exports.keyWordCompleter = keyWordCompleter;
 exports.snippetCompleter = snippetCompleter;
-
 var expandSnippet = {
     name: "expandSnippet",
-    exec: function(editor) {
+    exec: function (editor) {
         return snippetManager.expandWithTab(editor);
     },
     bindKey: "Tab"
 };
-
-var onChangeMode = function(e, editor) {
+var onChangeMode = function (e, editor) {
     loadSnippetsForMode(editor.session.$mode);
 };
-
-var loadSnippetsForMode = function(mode) {
-    var id = mode.$id;
+var loadSnippetsForMode = function (mode) {
+    if (typeof mode == "string")
+        mode = config.$modes[mode];
+    if (!mode)
+        return;
     if (!snippetManager.files)
         snippetManager.files = {};
-    loadSnippetFile(id);
+    loadSnippetFile(mode.$id, mode.snippetFileId);
     if (mode.modes)
         mode.modes.forEach(loadSnippetsForMode);
 };
-
-var loadSnippetFile = function(id) {
-    if (!id || snippetManager.files[id])
+var loadSnippetFile = function (id, snippetFilePath) {
+    if (!snippetFilePath || !id || snippetManager.files[id])
         return;
-    var snippetFilePath = id.replace("mode", "snippets");
     snippetManager.files[id] = {};
-    config.loadModule(snippetFilePath, function(m) {
-        if (m) {
-            snippetManager.files[id] = m;
-            if (!m.snippets && m.snippetText)
-                m.snippets = snippetManager.parseSnippetFile(m.snippetText);
-            snippetManager.register(m.snippets || [], m.scope);
-            if (m.includeScopes) {
-                snippetManager.snippetMap[m.scope].includeScopes = m.includeScopes;
-                m.includeScopes.forEach(function(x) {
-                    loadSnippetFile("ace/mode/" + x);
-                });
-            }
+    config.loadModule(snippetFilePath, function (m) {
+        if (!m)
+            return;
+        snippetManager.files[id] = m;
+        if (!m.snippets && m.snippetText)
+            m.snippets = snippetManager.parseSnippetFile(m.snippetText);
+        snippetManager.register(m.snippets || [], m.scope);
+        if (m.includeScopes) {
+            snippetManager.snippetMap[m.scope].includeScopes = m.includeScopes;
+            m.includeScopes.forEach(function (x) {
+                loadSnippetsForMode("ace/mode/" + x);
+            });
         }
     });
 };
-
-var doLiveAutocomplete = function(e) {
+var doLiveAutocomplete = function (e) {
     var editor = e.editor;
     var hasCompleter = editor.completer && editor.completer.activated;
     if (e.command.name === "backspace") {
@@ -1934,48 +1921,48 @@ var doLiveAutocomplete = function(e) {
     else if (e.command.name === "insertstring") {
         var prefix = util.getCompletionPrefix(editor);
         if (prefix && !hasCompleter) {
-            if (!editor.completer) {
-                editor.completer = new Autocomplete();
-            }
-            editor.completer.autoInsert = false;
-            editor.completer.showPopup(editor);
+            var completer = Autocomplete.for(editor);
+            completer.autoInsert = false;
+            completer.showPopup(editor);
         }
     }
 };
-
 var Editor = require("../editor").Editor;
 require("../config").defineOptions(Editor.prototype, "editor", {
     enableBasicAutocompletion: {
-        set: function(val) {
+        set: function (val) {
             if (val) {
                 if (!this.completers)
-                    this.completers = Array.isArray(val)? val: completers;
+                    this.completers = Array.isArray(val) ? val : completers;
                 this.commands.addCommand(Autocomplete.startCommand);
-            } else {
+            }
+            else {
                 this.commands.removeCommand(Autocomplete.startCommand);
             }
         },
         value: false
     },
     enableLiveAutocompletion: {
-        set: function(val) {
+        set: function (val) {
             if (val) {
                 if (!this.completers)
-                    this.completers = Array.isArray(val)? val: completers;
+                    this.completers = Array.isArray(val) ? val : completers;
                 this.commands.on('afterExec', doLiveAutocomplete);
-            } else {
+            }
+            else {
                 this.commands.removeListener('afterExec', doLiveAutocomplete);
             }
         },
         value: false
     },
     enableSnippets: {
-        set: function(val) {
+        set: function (val) {
             if (val) {
                 this.commands.addCommand(expandSnippet);
                 this.on("changeMode", onChangeMode);
                 onChangeMode(null, this);
-            } else {
+            }
+            else {
                 this.commands.removeCommand(expandSnippet);
                 this.off("changeMode", onChangeMode);
             }
@@ -1983,6 +1970,7 @@ require("../config").defineOptions(Editor.prototype, "editor", {
         value: false
     }
 });
+
 });                (function() {
                     window.require(["ace/ext/language_tools"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {