diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 0a668fff..2b9967a7 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -34,6 +34,7 @@ .ace_gutter-cell { padding-left: 19px; padding-right: 6px; + background-repeat: no-repeat; } .ace_gutter-cell.ace_error { @@ -44,7 +45,6 @@ .ace_gutter-cell.ace_warning { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUM2OEZDQTg4RTU0MTFFMUEzM0VFRTM2RUY1M0RBMjYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QUM2OEZDQTk4RTU0MTFFMUEzM0VFRTM2RUY1M0RBMjYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpBQzY4RkNBNjhFNTQxMUUxQTMzRUVFMzZFRjUzREEyNiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQzY4RkNBNzhFNTQxMUUxQTMzRUVFMzZFRjUzREEyNiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pgd7PfIAAAGmSURBVHjaYvr//z8DJZiJgUIANoCRkREb9gLiSVAaQx4OQM7AAkwd7XU2/v++/rOttdYGEB9dASEvOMydGKfH8Gv/p4XTkvRBfLxeQAP+1cUhXopyvzhP7P/IoSj7g7Mw09cNKO6J1QQ0L4gICPIv/veg/8W+JdFvQNLHVsW9/nmn9zk7B+cCkDwhL7gt6knSZnx9/LuCEOcvkIAMP+cvto9nfqyZmmUAksfnBUtbM60gX/3/kgyv3/xSFOL5DZT+L8vP+Yfh5cvfPvp/xUHyQHXGyAYwgpwBjZYFT3Y1OEl/OfCH4ffv3wzc4iwMvNIsDJ+f/mH4+vIPAxsb631WW0Yln6ZpQLXdMK/DXGDflh+sIv37EivD5x//Gb7+YWT4y86sl7BCCkSD+Z++/1dkvsFRl+HnD1Rvje4F8whjMXmGj58YGf5zsDMwcnAwfPvKcml62DsQDeaDxN+/Y0qwlpEHqrdB94IRNIDUgfgfKJChGK4OikEW3gTiXUB950ASLFAF54AC94A0G9QAfOnmF9DCDzABFqS08IHYDIScdijOjQABBgC+/9awBH96jwAAAABJRU5ErkJggg=="); - background-repeat: no-repeat; background-position: 2px center; } diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js index bf5a5578..b903356a 100644 --- a/lib/ace/edit_session.js +++ b/lib/ace/edit_session.js @@ -1061,7 +1061,7 @@ var EditSession = function(text, mode) { if (i > foldStart) { i = foldLine.end.row + 1; if (i >= len) - break + break; foldLine = this.$foldData[foldIndex++]; foldStart = foldLine ? foldLine.start.row : Infinity; } @@ -1478,7 +1478,7 @@ var EditSession = function(text, mode) { this.$clipRangeToDocument = function(range) { if (range.start.row < 0) { range.start.row = 0; - range.start.column = 0 + range.start.column = 0; } else { range.start.column = this.$clipColumnToRow( range.start.row, @@ -1576,7 +1576,7 @@ var EditSession = function(text, mode) { this.$modified = true; if (this.$useWrapMode) { this.$updateWrapData(0, this.getLength() - 1); - this.$resetRowCache(0) + this.$resetRowCache(0); this._emit("changeWrapLimit"); } return true; @@ -1943,7 +1943,7 @@ var EditSession = function(text, mode) { addSplit(split); } return splits; - } + }; /** internal, hide * EditSession.$getDisplayTokens(str, offset) -> Array @@ -1981,7 +1981,7 @@ var EditSession = function(text, mode) { } } return arr; - } + }; /** internal, hide * EditSession.$getStringScreenWidth(str, maxScreenColumn, screenColumn) -> [Number] @@ -2017,12 +2017,12 @@ var EditSession = function(text, mode) { screenColumn += 1; } if (screenColumn > maxScreenColumn) { - break + break; } } return [screenColumn, column]; - } + }; /** * EditSession.getRowLength(row) -> Number @@ -2037,7 +2037,7 @@ var EditSession = function(text, mode) { } else { return this.$wrapData[row].length + 1; } - } + }; /** * EditSession.getRowHeight(config, row) -> Number @@ -2049,7 +2049,7 @@ var EditSession = function(text, mode) { **/ this.getRowHeight = function(config, row) { return this.getRowLength(row) * config.lineHeight; - } + }; /** internal, hide, related to: EditSession.documentToScreenColumn * EditSession.getScreenLastRowColumn(screenRow) -> Number @@ -2058,7 +2058,7 @@ var EditSession = function(text, mode) { * Returns the column position (on screen) for the last character in the provided row. **/ this.getScreenLastRowColumn = function(screenRow) { - var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE) + var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE); return this.documentToScreenColumn(pos.row, pos.column); }; @@ -2145,8 +2145,6 @@ var EditSession = function(text, mode) { var rowCache = this.$screenRowCache; var i = this.$getRowCacheIndex(rowCache, screenRow); - var row1 = rowCache[i]; - var docRow1 = this.$docRowCache[i]; if (0 < i && i < rowCache.length) { var row = rowCache[i]; var docRow = this.$docRowCache[i]; diff --git a/lib/ace/edit_session/bracket_match.js b/lib/ace/edit_session/bracket_match.js index 9b977b8c..6bbc1222 100644 --- a/lib/ace/edit_session/bracket_match.js +++ b/lib/ace/edit_session/bracket_match.js @@ -144,7 +144,7 @@ function BracketMatch() { if (!token) token = iterator.stepForward(); if (!token) - return + return; if (!typeRe){ typeRe = new RegExp( @@ -200,7 +200,7 @@ function BracketMatch() { if (!token) token = iterator.stepForward(); if (!token) - return + return; if (!typeRe){ typeRe = new RegExp( diff --git a/lib/ace/edit_session/fold.js b/lib/ace/edit_session/fold.js index 923d78a0..d1165fb5 100644 --- a/lib/ace/edit_session/fold.js +++ b/lib/ace/edit_session/fold.js @@ -91,7 +91,7 @@ var Fold = exports.Fold = function(range, placeholder) { var afterStart = this.subFolds[i]; if (cmp == 0) - return afterStart.addSubFold(fold) + return afterStart.addSubFold(fold); // cmp == -1 var row = fold.range.end.row, column = fold.range.end.column; @@ -105,11 +105,11 @@ var Fold = exports.Fold = function(range, placeholder) { if (cmp == 0) throw "A fold can't intersect already existing fold" + fold.range + this.range; - var consumedFolds = this.subFolds.splice(i, j - i, fold) + var consumedFolds = this.subFolds.splice(i, j - i, fold); fold.setFoldLine(this.foldLine); return fold; - } + }; }).call(Fold.prototype); diff --git a/lib/ace/edit_session/folding.js b/lib/ace/edit_session/folding.js index 3a113c84..c6292a3f 100644 --- a/lib/ace/edit_session/folding.js +++ b/lib/ace/edit_session/folding.js @@ -470,9 +470,7 @@ function Folding() { this.getRowFoldEnd = function(docRow, startFoldRow) { var foldLine = this.getFoldLine(docRow, startFoldRow); - return (foldLine - ? foldLine.end.row - : docRow); + return foldLine ? foldLine.end.row : docRow; }; this.getFoldDisplayLine = function(foldLine, endRow, endColumn, startRow, startColumn) { diff --git a/lib/ace/keyboard/state_handler.js b/lib/ace/keyboard/state_handler.js index fa7e5d5c..bfd18906 100644 --- a/lib/ace/keyboard/state_handler.js +++ b/lib/ace/keyboard/state_handler.js @@ -109,7 +109,7 @@ StateHandler.prototype = { }; if (e) { - bufferObj.keyIdentifier = e.keyIdentifier + bufferObj.keyIdentifier = e.keyIdentifier; } return bufferObj; diff --git a/lib/ace/keyboard/vim.js b/lib/ace/keyboard/vim.js index c5dc54e8..53916421 100644 --- a/lib/ace/keyboard/vim.js +++ b/lib/ace/keyboard/vim.js @@ -62,7 +62,7 @@ var startCommands = { }, "ctrl-b": { command: "gotopageup" - }, + } }; exports.handler = { diff --git a/lib/ace/lib/event_emitter.js b/lib/ace/lib/event_emitter.js index ccff4d6b..ef1e25a0 100644 --- a/lib/ace/lib/event_emitter.js +++ b/lib/ace/lib/event_emitter.js @@ -93,7 +93,7 @@ EventEmitter.addEventListener = function(eventName, callback) { var listeners = this._eventRegistry[eventName]; if (!listeners) - var listeners = this._eventRegistry[eventName] = []; + listeners = this._eventRegistry[eventName] = []; if (listeners.indexOf(callback) == -1) listeners.push(callback); diff --git a/lib/ace/lib/regexp.js b/lib/ace/lib/regexp.js index 99a8ae51..369f74fc 100644 --- a/lib/ace/lib/regexp.js +++ b/lib/ace/lib/regexp.js @@ -98,7 +98,7 @@ define(function(require, exports, module) { (regex.multiline ? "m" : "") + (regex.extended ? "x" : "") + // Proposed for ES4; included in AS3 (regex.sticky ? "y" : ""); - }; + } function indexOf (array, item, from) { if (Array.prototype.indexOf) // Use the native array method if available @@ -108,6 +108,6 @@ define(function(require, exports, module) { return i; } return -1; - }; + } }); diff --git a/lib/ace/mode/coffee.js b/lib/ace/mode/coffee.js index d16e3ffe..6be4c0d1 100644 --- a/lib/ace/mode/coffee.js +++ b/lib/ace/mode/coffee.js @@ -41,7 +41,7 @@ define(function(require, exports, module) { var Tokenizer = require("../tokenizer").Tokenizer; var Rules = require("./coffee_highlight_rules").CoffeeHighlightRules; var Outdent = require("./matching_brace_outdent").MatchingBraceOutdent; -var PythonFoldMode = require("./folding/coffee").FoldMode; +var FoldMode = require("./folding/coffee").FoldMode; var Range = require("../range").Range; var TextMode = require("./text").Mode; var WorkerClient = require("../worker/worker_client").WorkerClient; @@ -50,7 +50,7 @@ var oop = require("../lib/oop"); function Mode() { this.$tokenizer = new Tokenizer(new Rules().getRules()); this.$outdent = new Outdent(); - this.foldingRules = new PythonFoldMode("=|=>|->|\\s*class [^#]*"); + this.foldingRules = new FoldMode(); } oop.inherits(Mode, TextMode); diff --git a/lib/ace/mode/folding/coffee.js b/lib/ace/mode/folding/coffee.js index b502afc4..6b19a757 100644 --- a/lib/ace/mode/folding/coffee.js +++ b/lib/ace/mode/folding/coffee.js @@ -107,7 +107,7 @@ oop.inherits(FoldMode, BaseFoldMode); if (session.getLine(row - 2).search(/\S/) == -1) { session.foldWidgets[row - 1] = "start"; session.foldWidgets[row + 1] = ""; - return "" + return ""; } } diff --git a/lib/ace/mode/folding/diff.js b/lib/ace/mode/folding/diff.js index 89bea274..4134540c 100644 --- a/lib/ace/mode/folding/diff.js +++ b/lib/ace/mode/folding/diff.js @@ -64,10 +64,10 @@ oop.inherits(FoldMode, BaseFoldMode); for (var l = session.getLength(); ++row < l; ) { line = session.getLine(row); if (re.test(line)) - break + break; } - if (row == start.row + 1) - return; + if (row == start.row + 1) + return; return Range.fromPoints(start, {row: row - 1, column: line.length}); }; diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js index 7fabf75d..21ca5e84 100644 --- a/lib/ace/mouse/default_handlers.js +++ b/lib/ace/mouse/default_handlers.js @@ -76,7 +76,6 @@ function DefaultHandlers(mouseHandler) { var pos = ev.getDocumentPosition(); this.mousedownEvent = ev; var editor = this.editor; - var _self = this; var button = ev.getButton(); if (button !== 0) { @@ -127,7 +126,7 @@ function DefaultHandlers(mouseHandler) { this.editor.selection.clearSelection(); } this.setState("select"); - } + }; this.select = function() { var anchor, editor = this.editor; @@ -201,7 +200,7 @@ function DefaultHandlers(mouseHandler) { command: { exec: function(editor) { var self = editor.$mouseHandler; - self.dragCursor = null + self.dragCursor = null; self.dragEnd(); self.startSelect(); } @@ -276,7 +275,7 @@ function DefaultHandlers(mouseHandler) { this.onDoubleClick = function(ev) { var pos = ev.getDocumentPosition(); var editor = this.editor; - var session = editor.session + var session = editor.session; var range = session.getBracketRange(pos); if (range) { diff --git a/lib/ace/mouse/dragdrop.js b/lib/ace/mouse/dragdrop.js index 8fe5cb5e..2ea2f782 100644 --- a/lib/ace/mouse/dragdrop.js +++ b/lib/ace/mouse/dragdrop.js @@ -47,7 +47,7 @@ var DragdropHandler = function(mouseHandler) { var dragCursor, counter = 0; var mouseTarget = editor.container; - event.addListener(mouseTarget, "dragenter", function(e) {console.log(e.type, counter,e.target); + event.addListener(mouseTarget, "dragenter", function(e) { counter++; if (!dragSelectionMarker) { range = editor.getSelectionRange(); @@ -73,7 +73,7 @@ var DragdropHandler = function(mouseHandler) { editor.renderer.scrollCursorIntoView(); }; - event.addListener(mouseTarget, "dragleave", function(e) {console.log(e.type, counter,e.target); + event.addListener(mouseTarget, "dragleave", function(e) { counter--; if (counter > 0) return;