ace-rails-ap 4.3 → 4.4

data/vendor/assets/javascripts/ace/ext-beautify.js

@@ -43,9 +43,9 @@ exports.beautify = function(session) {
 
     var trimNext = function() {
         if (nextToken && nextToken.value && nextToken.type !== 'string.regexp')
-            nextToken.value = nextToken.value.trim();
+            nextToken.value = nextToken.value.replace(/^\s*/, "");
     };
-
+    
     var trimLine = function() {
         code = code.replace(/ +$/, "");
     };
@@ -264,6 +264,9 @@ exports.beautify = function(session) {
                         }
                     }
                 }
+                
+                if (token.type == "text")
+                    value = value.replace(/\s+$/, " ");
                 if (spaceBefore && !breakBefore) {
                     trimLine();
                     if (code.substr(-1) !== "\n")

data/vendor/assets/javascripts/ace/ext-code_lens.js

@@ -0,0 +1,238 @@
+define("ace/ext/code_lens",["require","exports","module","ace/line_widgets","ace/lib/event","ace/lib/lang","ace/lib/dom","ace/editor","ace/config"], function(require, exports, module) {
+"use strict";
+var LineWidgets = require("../line_widgets").LineWidgets;
+var event = require("../lib/event");
+var lang = require("../lib/lang");
+var dom = require("../lib/dom");
+
+function clearLensElements(renderer) {
+    var textLayer = renderer.$textLayer;
+    var lensElements = textLayer.$lenses;
+    if (lensElements)
+        lensElements.forEach(function(el) {el.remove(); });
+    textLayer.$lenses = null;
+}
+
+function renderWidgets(changes, renderer) {
+    var changed = changes & renderer.CHANGE_LINES
+        || changes & renderer.CHANGE_FULL
+        || changes & renderer.CHANGE_SCROLL
+        || changes & renderer.CHANGE_TEXT;
+    if (!changed)
+        return;
+
+    var session = renderer.session;
+    var lineWidgets = renderer.session.lineWidgets;
+    var textLayer = renderer.$textLayer;
+    var lensElements = textLayer.$lenses;
+    if (!lineWidgets) {
+        if (lensElements)
+            clearLensElements(renderer);
+        return;
+    }
+
+    var textCells = renderer.$textLayer.$lines.cells;
+    var config = renderer.layerConfig;
+    var padding = renderer.$padding;
+
+    if (!lensElements)
+        lensElements = textLayer.$lenses = [];
+
+
+    var index = 0;
+    for (var i = 0; i < textCells.length; i++) {
+        var row = textCells[i].row;
+        var widget = lineWidgets[row];
+        var lenses = widget && widget.lenses;
+
+        if (!lenses || !lenses.length) continue;
+
+        var lensContainer = lensElements[index];
+        if (!lensContainer) {
+            lensContainer = lensElements[index]
+                = dom.buildDom(["div", {class: "ace_codeLens"}], renderer.container);
+        }
+        lensContainer.style.height = config.lineHeight + "px";
+        index++;
+
+        for (var j = 0; j < lenses.length; j++) {
+            var el = lensContainer.childNodes[2 * j];
+            if (!el) {
+                if (j != 0) lensContainer.appendChild(dom.createTextNode("\xa0|\xa0"));
+                el = dom.buildDom(["a"], lensContainer);
+            }
+            el.textContent = lenses[j].title;
+            el.lensCommand = lenses[j];
+        }
+        while (lensContainer.childNodes.length > 2 * j - 1)
+            lensContainer.lastChild.remove();
+
+        var top = renderer.$cursorLayer.getPixelPosition({
+            row: row,
+            column: 0
+        }, true).top - config.lineHeight * widget.rowsAbove - config.offset;
+        lensContainer.style.top = top + "px";
+
+        var left = renderer.gutterWidth;
+        var indent = session.getLine(row).search(/\S|$/);
+        if (indent == -1)
+            indent = 0;
+        left += indent * config.characterWidth;
+        left -= renderer.scrollLeft;
+        lensContainer.style.paddingLeft = padding + left + "px";
+    }
+    while (index < lensElements.length)
+        lensElements.pop().remove();
+}
+
+function clearCodeLensWidgets(session) {
+    if (!session.lineWidgets) return;
+    var widgetManager = session.widgetManager;
+    session.lineWidgets.forEach(function(widget) {
+        if (widget && widget.lenses)
+            widgetManager.removeLineWidget(widget);
+    });
+}
+
+exports.setLenses = function(session, lenses) {
+    var firstRow = Number.MAX_VALUE;
+
+    clearCodeLensWidgets(session);
+    lenses && lenses.forEach(function(lens) {
+        var row = lens.start.row;
+        var column = lens.start.column;
+        var widget = session.lineWidgets && session.lineWidgets[row];
+        if (!widget || !widget.lenses) {
+            widget = session.widgetManager.$registerLineWidget({
+                rowCount: 1,
+                rowsAbove: 1,
+                row: row,
+                column: column,
+                lenses: []
+            });
+        }
+        widget.lenses.push(lens.command);
+        if (row < firstRow)
+            firstRow = row;
+    });
+    session._emit("changeFold", {data: {start: {row: firstRow}}});
+};
+
+function attachToEditor(editor) {
+    editor.codeLensProviders = [];
+    editor.renderer.on("afterRender", renderWidgets);
+    if (!editor.$codeLensClickHandler) {
+        editor.$codeLensClickHandler = function(e) {
+            var command = e.target.lensCommand;
+            if (command)
+                editor.execCommand(command.id, command.arguments);
+        };
+        event.addListener(editor.container, "click", editor.$codeLensClickHandler, editor);
+    }
+    editor.$updateLenses = function() {
+        var session = editor.session;
+        if (!session) return;
+
+        if (!session.widgetManager) {
+            session.widgetManager = new LineWidgets(session);
+            session.widgetManager.attach(editor);
+        }
+
+        var providersToWaitNum = editor.codeLensProviders.length;
+        var lenses = [];
+        editor.codeLensProviders.forEach(function(provider) {
+            provider.provideCodeLenses(session, function(err, payload) {
+                if (err) return;
+                payload.forEach(function(lens) {
+                    lenses.push(lens);
+                });
+                providersToWaitNum--;
+                if (providersToWaitNum == 0) {
+                    applyLenses();
+                }
+            });
+        });
+
+        function applyLenses() {
+            var cursor = session.selection.cursor;
+            var oldRow = session.documentToScreenRow(cursor);
+            exports.setLenses(session, lenses);
+
+            var lastDelta = session.$undoManager && session.$undoManager.$lastDelta;
+            if (lastDelta && lastDelta.action == "remove" && lastDelta.lines.length > 1)
+                return;
+            var row = session.documentToScreenRow(cursor);
+            var lineHeight = editor.renderer.layerConfig.lineHeight;
+            var top = session.getScrollTop() + (row - oldRow) * lineHeight;
+            session.setScrollTop(top);
+        }
+    };
+    var updateLenses = lang.delayedCall(editor.$updateLenses);
+    editor.$updateLensesOnInput = function() {
+        updateLenses.delay(250);
+    };
+    editor.on("input", editor.$updateLensesOnInput);
+}
+
+function detachFromEditor(editor) {
+    editor.off("input", editor.$updateLensesOnInput);
+    editor.renderer.off("afterRender", renderWidgets);
+    if (editor.$codeLensClickHandler)
+        editor.container.removeEventListener("click", editor.$codeLensClickHandler);
+}
+
+exports.registerCodeLensProvider = function(editor, codeLensProvider) {
+    editor.setOption("enableCodeLens", true);
+    editor.codeLensProviders.push(codeLensProvider);
+    editor.$updateLensesOnInput();
+};
+
+exports.clear = function(session) {
+    exports.setLenses(session, null);
+};
+
+var Editor = require("../editor").Editor;
+require("../config").defineOptions(Editor.prototype, "editor", {
+    enableCodeLens: {
+        set: function(val) {
+            if (val) {
+                attachToEditor(this);
+            } else {
+                detachFromEditor(this);
+            }
+        }
+    }
+});
+
+dom.importCssString("\
+.ace_codeLens {\
+    position: absolute;\
+    color: #aaa;\
+    font-size: 88%;\
+    background: inherit;\
+    width: 100%;\
+    display: flex;\
+    align-items: flex-end;\
+    pointer-events: none;\
+}\
+.ace_codeLens > a {\
+    cursor: pointer;\
+    pointer-events: auto;\
+}\
+.ace_codeLens > a:hover {\
+    color: #0000ff;\
+    text-decoration: underline;\
+}\
+.ace_dark > .ace_codeLens > a:hover {\
+    color: #4e94ce;\
+}\
+", "");
+
+});                (function() {
+                    window.require(["ace/ext/code_lens"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            

data/vendor/assets/javascripts/ace/ext-emmet.js

@@ -144,7 +144,9 @@ var SnippetManager = function() {
                 {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");
+                    }).split("\x00").map(function(value){
+                        return {value: value};
+                    });
                     stack[0].choices = choices;
                     return [choices[0]];
                 }, next: "start"},
@@ -615,6 +617,12 @@ var SnippetManager = function() {
             }
             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";
@@ -631,10 +639,13 @@ var SnippetManager = function() {
             s.endTriggerRe = new RegExp(s.endTrigger);
         }
 
-        if (snippets && snippets.content)
-            addSnippet(snippets);
-        else if (Array.isArray(snippets))
+        if (Array.isArray(snippets)) {
             snippets.forEach(addSnippet);
+        } else {
+            Object.keys(snippets).forEach(function(key) {
+                addSnippet(snippets[key]);
+            });
+        }
         
         this._signal("registerSnippets", {scope: scope});
     };
@@ -684,7 +695,7 @@ var SnippetManager = function() {
                     snippet.tabTrigger = val.match(/^\S*/)[0];
                     if (!snippet.name)
                         snippet.name = val;
-                } else {
+                } else if (key) {
                     snippet[key] = val;
                 }
             }
@@ -747,15 +758,16 @@ var TabstopManager = function(editor) {
 
     this.onChange = function(delta) {
         var isRemove = delta.action[0] == "r";
-        var parents = this.selectedTabstop && this.selectedTabstop.parents || {};
+        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 == this.selectedTabstop || parents[ts.index];
+            var active = ts == selectedTabstop || parents[ts.index];
             ts.rangeList.$bias = active ? 0 : 1;
             
-            if (delta.action == "remove" && ts !== this.selectedTabstop) {
-                var parentActive = ts.parents && ts.parents[this.selectedTabstop.index];
+            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);
@@ -832,18 +844,17 @@ var TabstopManager = function(editor) {
         
         this.selectedTabstop = ts;
         var range = ts.firstNonLinked || ts;
+        if (ts.choices) range.cursor = range.start;
         if (!this.editor.inVirtualSelectionMode) {
             var sel = this.editor.multiSelect;
-            sel.toSingleRange(range.clone());
+            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(range);
+            this.editor.selection.fromOrientedRange(range);
         }
         
         this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
@@ -868,8 +879,6 @@ var TabstopManager = function(editor) {
         var ranges = this.ranges;
         tabstops.forEach(function(ts, index) {
             var dest = this.$openTabstops[index] || ts;
-            ts.rangeList = new RangeList();
-            ts.rangeList.$bias = 0;
             
             for (var i = 0; i < ts.length; i++) {
                 var p = ts[i];
@@ -879,7 +888,6 @@ var TabstopManager = function(editor) {
                 range.original = p;
                 range.tabstop = dest;
                 ranges.push(range);
-                ts.rangeList.ranges.push(range);
                 if (dest != ts)
                     dest.unshift(range);
                 else
@@ -897,6 +905,9 @@ 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) {
@@ -939,21 +950,18 @@ var TabstopManager = function(editor) {
 
     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);

data/vendor/assets/javascripts/ace/ext-language_tools.js

@@ -144,7 +144,9 @@ var SnippetManager = function() {
                 {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");
+                    }).split("\x00").map(function(value){
+                        return {value: value};
+                    });
                     stack[0].choices = choices;
                     return [choices[0]];
                 }, next: "start"},
@@ -615,6 +617,12 @@ var SnippetManager = function() {
             }
             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";
@@ -631,10 +639,13 @@ var SnippetManager = function() {
             s.endTriggerRe = new RegExp(s.endTrigger);
         }
 
-        if (snippets && snippets.content)
-            addSnippet(snippets);
-        else if (Array.isArray(snippets))
+        if (Array.isArray(snippets)) {
             snippets.forEach(addSnippet);
+        } else {
+            Object.keys(snippets).forEach(function(key) {
+                addSnippet(snippets[key]);
+            });
+        }
         
         this._signal("registerSnippets", {scope: scope});
     };
@@ -684,7 +695,7 @@ var SnippetManager = function() {
                     snippet.tabTrigger = val.match(/^\S*/)[0];
                     if (!snippet.name)
                         snippet.name = val;
-                } else {
+                } else if (key) {
                     snippet[key] = val;
                 }
             }
@@ -747,15 +758,16 @@ var TabstopManager = function(editor) {
 
     this.onChange = function(delta) {
         var isRemove = delta.action[0] == "r";
-        var parents = this.selectedTabstop && this.selectedTabstop.parents || {};
+        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 == this.selectedTabstop || parents[ts.index];
+            var active = ts == selectedTabstop || parents[ts.index];
             ts.rangeList.$bias = active ? 0 : 1;
             
-            if (delta.action == "remove" && ts !== this.selectedTabstop) {
-                var parentActive = ts.parents && ts.parents[this.selectedTabstop.index];
+            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);
@@ -832,18 +844,17 @@ var TabstopManager = function(editor) {
         
         this.selectedTabstop = ts;
         var range = ts.firstNonLinked || ts;
+        if (ts.choices) range.cursor = range.start;
         if (!this.editor.inVirtualSelectionMode) {
             var sel = this.editor.multiSelect;
-            sel.toSingleRange(range.clone());
+            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(range);
+            this.editor.selection.fromOrientedRange(range);
         }
         
         this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
@@ -868,8 +879,6 @@ var TabstopManager = function(editor) {
         var ranges = this.ranges;
         tabstops.forEach(function(ts, index) {
             var dest = this.$openTabstops[index] || ts;
-            ts.rangeList = new RangeList();
-            ts.rangeList.$bias = 0;
             
             for (var i = 0; i < ts.length; i++) {
                 var p = ts[i];
@@ -879,7 +888,6 @@ var TabstopManager = function(editor) {
                 range.original = p;
                 range.tabstop = dest;
                 ranges.push(range);
-                ts.rangeList.ranges.push(range);
                 if (dest != ts)
                     dest.unshift(range);
                 else
@@ -897,6 +905,9 @@ 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) {
@@ -939,21 +950,18 @@ var TabstopManager = function(editor) {
 
     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);
@@ -1355,7 +1363,7 @@ exports.parForEach = function(array, fn, callback) {
     }
 };
 
-var ID_REGEX = /[a-zA-Z_0-9\$\-\u00A2-\uFFFF]/;
+var ID_REGEX = /[a-zA-Z_0-9\$\-\u00A2-\u2000\u2070-\uFFFF]/;
 
 exports.retrievePrecedingIdentifier = function(text, pos, regex) {
     regex = regex || ID_REGEX;
@@ -1478,6 +1486,7 @@ var Autocomplete = function() {
         } else if (keepPopupPosition && !prefix) {
             this.detach();
         }
+        this.changeTimer.cancel();
     };
 
     this.detach = function() {
@@ -1540,13 +1549,15 @@ var Autocomplete = function() {
         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) {
+            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);
                 }
             }
@@ -1555,7 +1566,9 @@ var Autocomplete = function() {
             else
                 this.editor.execCommand("insertstring", data.value || data);
         }
-        this.detach();
+        if (this.completions == completions)
+            this.detach();
+        this.editor.endOperation();
     };
 
 
@@ -2034,31 +2047,33 @@ var onChangeMode = function(e, editor) {
 };
 
 var loadSnippetsForMode = function(mode) {
-    var id = mode.$id;
+    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);
-                });
-            }
+        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);
+            });
         }
     });
 };