From 1bd38560b4c3d75d692bdd4c3db71dc11ce17a7f Mon Sep 17 00:00:00 2001 From: nightwing Date: Fri, 1 Aug 2014 21:31:40 +0400 Subject: [PATCH] code style --- lib/ace/autocomplete/popup.js | 9 ++++--- lib/ace/edit_session/fold_line.js | 41 +++++++++++++++---------------- lib/ace/editor.js | 16 ++++++------ lib/ace/selection.js | 36 +++++++++++++-------------- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/lib/ace/autocomplete/popup.js b/lib/ace/autocomplete/popup.js index a34ebf09..f580e391 100644 --- a/lib/ace/autocomplete/popup.js +++ b/lib/ace/autocomplete/popup.js @@ -52,6 +52,7 @@ var $singleLineEditor = function(el) { editor.renderer.setHighlightGutterLine(false); editor.$mouseHandler.$focusWaitTimout = 0; + editor.$highlightTagPending = true; return editor; }; @@ -103,7 +104,7 @@ var AcePopup = function(parentNode) { popup.session.removeMarker(hoverMarker.id); hoverMarker.id = null; } - } + }; popup.setSelectOnHover(false); popup.on("mousemove", function(e) { if (!lastMouseEvent) { @@ -171,8 +172,8 @@ var AcePopup = function(parentNode) { }; var bgTokenizer = popup.session.bgTokenizer; - bgTokenizer.$tokenizeRow = function(i) { - var data = popup.data[i]; + bgTokenizer.$tokenizeRow = function(row) { + var data = popup.data[row]; var tokens = []; if (!data) return tokens; @@ -206,7 +207,7 @@ var AcePopup = function(parentNode) { popup.session.$computeWidth = function() { return this.screenWidth = 0; - } + }; // public popup.isOpen = false; diff --git a/lib/ace/edit_session/fold_line.js b/lib/ace/edit_session/fold_line.js index 0218195e..d976de98 100644 --- a/lib/ace/edit_session/fold_line.js +++ b/lib/ace/edit_session/fold_line.js @@ -44,7 +44,7 @@ function FoldLine(foldData, folds) { folds = this.folds = [ folds ]; } - var last = folds[folds.length - 1] + var last = folds[folds.length - 1]; this.range = new Range(folds[0].start.row, folds[0].start.column, last.end.row, last.end.column); this.start = this.range.start; @@ -66,7 +66,7 @@ function FoldLine(foldData, folds) { fold.start.row += shift; fold.end.row += shift; }); - } + }; this.addFold = function(fold) { if (fold.sameRow) { @@ -96,17 +96,17 @@ function FoldLine(foldData, folds) { throw new Error("Trying to add fold to FoldRow that doesn't have a matching row"); } fold.foldLine = this; - } + }; this.containsRow = function(row) { return row >= this.start.row && row <= this.end.row; - } + }; this.walk = function(callback, endRow, endColumn) { var lastEnd = 0, folds = this.folds, fold, - comp, stop, isNewRow = true; + cmp, stop, isNewRow = true; if (endRow == null) { endRow = this.end.row; @@ -116,9 +116,9 @@ function FoldLine(foldData, folds) { for (var i = 0; i < folds.length; i++) { fold = folds[i]; - comp = fold.range.compareStart(endRow, endColumn); + cmp = fold.range.compareStart(endRow, endColumn); // This fold is after the endRow/Column. - if (comp == -1) { + if (cmp == -1) { callback(null, endRow, endColumn, lastEnd, isNewRow); return; } @@ -127,8 +127,8 @@ function FoldLine(foldData, folds) { stop = !stop && callback(fold.placeholder, fold.start.row, fold.start.column, lastEnd); // If the user requested to stop the walk or endRow/endColumn is - // inside of this fold (comp == 0), then end here. - if (stop || comp == 0) { + // inside of this fold (cmp == 0), then end here. + if (stop || cmp === 0) { return; } @@ -138,7 +138,7 @@ function FoldLine(foldData, folds) { lastEnd = fold.end.column; } callback(null, endRow, endColumn, lastEnd, isNewRow); - } + }; this.getNextFoldTo = function(row, column) { var fold, cmp; @@ -150,15 +150,15 @@ function FoldLine(foldData, folds) { fold: fold, kind: "after" }; - } else if (cmp == 0) { + } else if (cmp === 0) { return { fold: fold, kind: "inside" - } + }; } } return null; - } + }; this.addRemoveChars = function(row, column, len) { var ret = this.getNextFoldTo(row, column), @@ -175,7 +175,7 @@ function FoldLine(foldData, folds) { } else if (fold.start.row == row) { folds = this.folds; var i = folds.indexOf(fold); - if (i == 0) { + if (i === 0) { this.start.column += len; } for (i; i < folds.length; i++) { @@ -189,7 +189,7 @@ function FoldLine(foldData, folds) { this.end.column += len; } } - } + }; this.split = function(row, column) { var fold = this.getNextFoldTo(row, column).fold; @@ -211,7 +211,7 @@ function FoldLine(foldData, folds) { var newFoldLine = new FoldLine(foldData, folds); foldData.splice(foldData.indexOf(this) + 1, 0, newFoldLine); return newFoldLine; - } + }; this.merge = function(foldLineNext) { var folds = foldLineNext.folds; @@ -222,7 +222,7 @@ function FoldLine(foldData, folds) { // it's merged now with foldLineNext. var foldData = this.foldData; foldData.splice(foldData.indexOf(foldLineNext), 1); - } + }; this.toString = function() { var ret = [this.range.toString() + ": [" ]; @@ -230,13 +230,12 @@ function FoldLine(foldData, folds) { this.folds.forEach(function(fold) { ret.push(" " + fold.toString()); }); - ret.push("]") + ret.push("]"); return ret.join("\n"); - } + }; this.idxToPosition = function(idx) { var lastFoldEndColumn = 0; - var fold; for (var i = 0; i < this.folds.length; i++) { var fold = this.folds[i]; @@ -261,7 +260,7 @@ function FoldLine(foldData, folds) { row: this.end.row, column: this.end.column + idx }; - } + }; }).call(FoldLine.prototype); exports.FoldLine = FoldLine; diff --git a/lib/ace/editor.js b/lib/ace/editor.js index 83782f06..022653da 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -572,28 +572,28 @@ var Editor = function(renderer, session) { token = iterator.stepForward(); if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) { - if (prevToken.value==='<'){ + if (prevToken.value === '<'){ depth++; - } else if (prevToken.value==='=0); - }else{ + } while (token && depth >= 0); + } else { //find opening tag do { token = prevToken; prevToken = iterator.stepBackward(); - if(token && token.value === tag && token.type.indexOf('tag-name') !== -1) { - if (prevToken.value==='<') { + if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) { + if (prevToken.value === '<') { depth++; - } else if( prevToken.value===' 0) { this.moveCursorTo(cursor.row - 1, this.doc.getLine(cursor.row - 1).length); @@ -639,7 +639,7 @@ var Selection = function(session) { var str = this.session.getFoldStringAt(row, column, -1); if (str == null) { - str = this.doc.getLine(row).substring(0, column) + str = this.doc.getLine(row).substring(0, column); } var leftOfCursor = lang.stringReverse(str); @@ -691,13 +691,13 @@ var Selection = function(session) { index ++; if (whitespaceRe.test(ch)) { if (index > 2) { - index-- + index--; break; } else { while ((ch = rightOfCursor[index]) && whitespaceRe.test(ch)) index ++; if (index > 2) - break + break; } } } @@ -722,11 +722,11 @@ var Selection = function(session) { var l = this.doc.getLength(); do { row++; - rightOfCursor = this.doc.getLine(row) - } while (row < l && /^\s*$/.test(rightOfCursor)) + rightOfCursor = this.doc.getLine(row); + } while (row < l && /^\s*$/.test(rightOfCursor)); if (!/^\s+/.test(rightOfCursor)) - rightOfCursor = "" + rightOfCursor = ""; column = 0; } @@ -744,15 +744,15 @@ var Selection = function(session) { return this.moveCursorTo(fold.start.row, fold.start.column); var line = this.session.getLine(row).substring(0, column); - if (column == 0) { + if (column === 0) { do { row--; line = this.doc.getLine(row); - } while (row > 0 && /^\s*$/.test(line)) + } while (row > 0 && /^\s*$/.test(line)); column = line.length; if (!/\s+$/.test(line)) - line = "" + line = ""; } var leftOfCursor = lang.stringReverse(line); @@ -859,12 +859,12 @@ var Selection = function(session) { this.lead.detach(); this.anchor.detach(); this.session = this.doc = null; - } + }; this.fromOrientedRange = function(range) { this.setSelectionRange(range, range.cursor == range.start); this.$desiredColumn = range.desiredColumn || this.$desiredColumn; - } + }; this.toOrientedRange = function(range) { var r = this.getRange(); @@ -880,7 +880,7 @@ var Selection = function(session) { range.cursor = this.isBackwards() ? range.start : range.end; range.desiredColumn = this.$desiredColumn; return range; - } + }; /** * Saves the current cursor position and calls `func` that can change the cursor @@ -901,7 +901,7 @@ var Selection = function(session) { } finally { this.moveCursorToPosition(start); } - } + }; this.toJSON = function() { if (this.rangeCount) { @@ -944,10 +944,10 @@ var Selection = function(session) { for (var i = this.ranges.length; i--; ) { if (!this.ranges[i].isEqual(data[i])) - return false + return false; } return true; - } + }; }).call(Selection.prototype);