diff --git a/rhodecode/public/css/codemirror.css b/rhodecode/public/css/codemirror.css
--- a/rhodecode/public/css/codemirror.css
+++ b/rhodecode/public/css/codemirror.css
@@ -192,6 +192,16 @@ div.CodeMirror span.CodeMirror-nonmatchi
white-space: pre-wrap;
word-break: normal;
}
+.CodeMirror-code pre {
+ border-right: 30px solid transparent;
+ width: -webkit-fit-content;
+ width: -moz-fit-content;
+ width: fit-content;
+}
+.CodeMirror-wrap .CodeMirror-code pre {
+ border-right: none;
+ width: auto;
+}
.CodeMirror-linebackground {
position: absolute;
left: 0; right: 0; top: 0; bottom: 0;
diff --git a/rhodecode/public/js/codemirror.js b/rhodecode/public/js/codemirror.js
--- a/rhodecode/public/js/codemirror.js
+++ b/rhodecode/public/js/codemirror.js
@@ -1,4 +1,4 @@
-// CodeMirror version 3.14
+// CodeMirror version 3.15
//
// CodeMirror is the only global var we claim
window.CodeMirror = (function() {
@@ -30,6 +30,7 @@ window.CodeMirror = (function() {
var opera_version = opera && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
if (opera_version) opera_version = Number(opera_version[1]);
+ if (opera_version && opera_version >= 15) { opera = false; webkit = true; }
// Some browsers use the wrong event properties to signal cmd/ctrl on OS X
var flipCtrlCmd = mac && (qtwebkit || opera && (opera_version == null || opera_version < 12.11));
var captureMiddleClick = gecko || (ie && !ie_lt9);
@@ -403,11 +404,12 @@ window.CodeMirror = (function() {
// DISPLAY DRAWING
- function updateDisplay(cm, changes, viewPort) {
+ function updateDisplay(cm, changes, viewPort, forced) {
var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;
var visible = visibleLines(cm.display, cm.doc, viewPort);
for (;;) {
- if (!updateDisplayInner(cm, changes, visible)) break;
+ if (!updateDisplayInner(cm, changes, visible, forced)) break;
+ forced = false;
updated = true;
updateSelection(cm);
updateScrollbars(cm);
@@ -433,7 +435,7 @@ window.CodeMirror = (function() {
// Uses a set of changes plus the current scroll position to
// determine which DOM updates have to be made, and makes the
// updates.
- function updateDisplayInner(cm, changes, visible) {
+ function updateDisplayInner(cm, changes, visible, forced) {
var display = cm.display, doc = cm.doc;
if (!display.wrapper.clientWidth) {
display.showingFrom = display.showingTo = doc.first;
@@ -442,7 +444,7 @@ window.CodeMirror = (function() {
}
// Bail out if the visible area is already rendered and nothing changed.
- if (changes.length == 0 &&
+ if (!forced && changes.length == 0 &&
visible.from > display.showingFrom && visible.to < display.showingTo)
return;
@@ -495,7 +497,7 @@ window.CodeMirror = (function() {
if (range.from >= range.to) intact.splice(i--, 1);
else intactLines += range.to - range.from;
}
- if (intactLines == to - from && from == display.showingFrom && to == display.showingTo) {
+ if (!forced && intactLines == to - from && from == display.showingFrom && to == display.showingTo) {
updateViewOffset(cm);
return;
}
@@ -520,6 +522,14 @@ window.CodeMirror = (function() {
}
display.showingFrom = from; display.showingTo = to;
+ updateHeightsInViewport(cm);
+ updateViewOffset(cm);
+
+ return true;
+ }
+
+ function updateHeightsInViewport(cm) {
+ var display = cm.display;
var prevBottom = display.lineDiv.offsetTop;
for (var node = display.lineDiv.firstChild, height; node; node = node.nextSibling) if (node.lineObj) {
if (ie_lt8) {
@@ -539,9 +549,6 @@ window.CodeMirror = (function() {
widgets[i].height = widgets[i].node.offsetHeight;
}
}
- updateViewOffset(cm);
-
- return true;
}
function updateViewOffset(cm) {
@@ -670,10 +677,10 @@ window.CodeMirror = (function() {
if (!/\bCodeMirror-linewidget\b/.test(n.className)) {
reuse.removeChild(n);
} else {
- for (var i = 0, first = true; i < line.widgets.length; ++i) {
+ for (var i = 0; i < line.widgets.length; ++i) {
var widget = line.widgets[i];
- if (!widget.above) { insertBefore = n; first = false; }
if (widget.node == n.firstChild) {
+ if (!widget.above && !insertBefore) insertBefore = n;
positionLineWidget(widget, n, reuse, dims);
++widgetsSeen;
break;
@@ -966,11 +973,13 @@ window.CodeMirror = (function() {
if (r) break;
if (dir < 0 && pos == 0) dir = 1;
}
- var rightV = (pos < ch || bias == "right") && r.topRight != null;
+ bias = pos > ch ? "left" : pos < ch ? "right" : bias;
+ if (bias == "left" && r.leftSide) r = r.leftSide;
+ else if (bias == "right" && r.rightSide) r = r.rightSide;
return {left: pos < ch ? r.right : r.left,
right: pos > ch ? r.left : r.right,
- top: rightV ? r.topRight : r.top,
- bottom: rightV ? r.bottomRight : r.bottom};
+ top: r.top,
+ bottom: r.bottom};
}
function findCachedMeasurement(cm, line) {
@@ -1007,7 +1016,7 @@ window.CodeMirror = (function() {
function measureLineInner(cm, line) {
var display = cm.display, measure = emptyArray(line.text.length);
- var pre = lineContent(cm, line, measure);
+ var pre = lineContent(cm, line, measure, true);
// IE does not cache element positions of inline elements between
// calls to getBoundingClientRect. This makes the loop below,
@@ -1043,48 +1052,50 @@ window.CodeMirror = (function() {
if (ie_lt9 && display.measure.first != pre)
removeChildrenAndAdd(display.measure, pre);
- function categorizeVSpan(top, bot) {
+ function measureRect(rect) {
+ var top = rect.top - outer.top, bot = rect.bottom - outer.top;
if (bot > maxBot) bot = maxBot;
if (top < 0) top = 0;
- for (var j = 0; j < vranges.length; j += 2) {
- var rtop = vranges[j], rbot = vranges[j+1];
+ for (var i = vranges.length - 2; i >= 0; i -= 2) {
+ var rtop = vranges[i], rbot = vranges[i+1];
if (rtop > bot || rbot < top) continue;
if (rtop <= top && rbot >= bot ||
top <= rtop && bot >= rbot ||
Math.min(bot, rbot) - Math.max(top, rtop) >= (bot - top) >> 1) {
- vranges[j] = Math.min(top, rtop);
- vranges[j+1] = Math.max(bot, rbot);
- return j;
+ vranges[i] = Math.min(top, rtop);
+ vranges[i+1] = Math.max(bot, rbot);
+ break;
}
}
- vranges.push(top, bot);
- return j;
+ if (i < 0) { i = vranges.length; vranges.push(top, bot); }
+ return {left: rect.left - outer.left,
+ right: rect.right - outer.left,
+ top: i, bottom: null};
+ }
+ function finishRect(rect) {
+ rect.bottom = vranges[rect.top+1];
+ rect.top = vranges[rect.top];
}
for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {
- var size, node = cur;
+ var node = cur, rect = null;
// A widget might wrap, needs special care
if (/\bCodeMirror-widget\b/.test(cur.className) && cur.getClientRects) {
if (cur.firstChild.nodeType == 1) node = cur.firstChild;
- var rects = node.getClientRects(), rLeft = rects[0], rRight = rects[rects.length - 1];
+ var rects = node.getClientRects();
if (rects.length > 1) {
- var vCatLeft = categorizeVSpan(rLeft.top - outer.top, rLeft.bottom - outer.top);
- var vCatRight = categorizeVSpan(rRight.top - outer.top, rRight.bottom - outer.top);
- data[i] = {left: rLeft.left - outer.left, right: rRight.right - outer.left,
- top: vCatLeft, topRight: vCatRight};
- continue;
+ rect = data[i] = measureRect(rects[0]);
+ rect.rightSide = measureRect(rects[rects.length - 1]);
}
}
- size = getRect(node);
- var vCat = categorizeVSpan(size.top - outer.top, size.bottom - outer.top);
- var right = size.right;
- if (cur.measureRight) right = getRect(cur.measureRight).left;
- data[i] = {left: size.left - outer.left, right: right - outer.left, top: vCat};
+ if (!rect) rect = data[i] = measureRect(getRect(node));
+ if (cur.measureRight) rect.right = getRect(cur.measureRight).left;
+ if (cur.leftSide) rect.leftSide = measureRect(getRect(cur.leftSide));
}
for (var i = 0, cur; i < data.length; ++i) if (cur = data[i]) {
- var vr = cur.top, vrRight = cur.topRight;
- cur.top = vranges[vr]; cur.bottom = vranges[vr+1];
- if (vrRight != null) { cur.topRight = vranges[vrRight]; cur.bottomRight = vranges[vrRight+1]; }
+ finishRect(cur);
+ if (cur.leftSide) finishRect(cur.leftSide);
+ if (cur.rightSide) finishRect(cur.rightSide);
}
return data;
}
@@ -1098,7 +1109,7 @@ window.CodeMirror = (function() {
var cached = !hasBadSpan && findCachedMeasurement(cm, line);
if (cached) return measureChar(cm, line, line.text.length, cached.measure, "right").right;
- var pre = lineContent(cm, line);
+ var pre = lineContent(cm, line, null, true);
var end = pre.appendChild(zeroWidthElement(cm.display.measure));
removeChildrenAndAdd(cm.display.measure, pre);
return getRect(end).right - getRect(cm.display.lineDiv).left;
@@ -1302,6 +1313,7 @@ window.CodeMirror = (function() {
// An array of ranges of lines that have to be updated. See
// updateDisplay.
changes: [],
+ forceUpdate: false,
updateInput: null,
userSelChange: null,
textChanged: null,
@@ -1334,8 +1346,8 @@ window.CodeMirror = (function() {
var coords = cursorCoords(cm, doc.sel.head);
newScrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);
}
- if (op.changes.length || newScrollPos && newScrollPos.scrollTop != null) {
- updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop);
+ if (op.changes.length || op.forceUpdate || newScrollPos && newScrollPos.scrollTop != null) {
+ updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop, op.forceUpdate);
if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
}
if (!updated && op.selectionChanged) updateSelection(cm);
@@ -2105,6 +2117,7 @@ window.CodeMirror = (function() {
var detectingSelectAll;
function onContextMenu(cm, e) {
+ if (signalDOMEvent(cm, e, "contextmenu")) return;
var display = cm.display, sel = cm.doc.sel;
if (eventInWidget(display, e)) return;
@@ -2755,7 +2768,7 @@ window.CodeMirror = (function() {
function findWordAt(line, pos) {
var start = pos.ch, end = pos.ch;
if (line) {
- if (pos.xRel < 0 || end == line.length) --start; else ++end;
+ if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
var startChar = line.charAt(start);
var check = isWordChar(startChar) ? isWordChar
: /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
@@ -2796,7 +2809,7 @@ window.CodeMirror = (function() {
removeKeyMap: function(map) {
var maps = this.state.keyMaps;
for (var i = 0; i < maps.length; ++i)
- if ((typeof map == "string" ? maps[i].name : maps[i]) == map) {
+ if (maps[i] == map || (typeof maps[i] != "string" && maps[i].name == map)) {
maps.splice(i, 1);
return true;
}
@@ -2860,6 +2873,7 @@ window.CodeMirror = (function() {
pos = clipPos(this.doc, pos);
var styles = getLineStyles(this, getLine(this.doc, pos.line));
var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
+ if (ch == 0) return styles[2];
for (;;) {
var mid = (before + after) >> 1;
if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
@@ -2868,6 +2882,20 @@ window.CodeMirror = (function() {
}
},
+ getModeAt: function(pos) {
+ var mode = this.doc.mode;
+ if (!mode.innerMode) return mode;
+ return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;
+ },
+
+ getHelper: function(pos, type) {
+ if (!helpers.hasOwnProperty(type)) return;
+ var help = helpers[type], mode = this.getModeAt(pos);
+ return mode[type] && help[mode[type]] ||
+ mode.helperType && help[mode.helperType] ||
+ help[mode.name];
+ },
+
getStateAfter: function(line, precise) {
var doc = this.doc;
line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
@@ -3097,17 +3125,16 @@ window.CodeMirror = (function() {
updateScrollPos(this, sPos.scrollLeft, sPos.scrollTop);
}),
- setSize: function(width, height) {
+ setSize: operation(null, function(width, height) {
function interpret(val) {
return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
}
if (width != null) this.display.wrapper.style.width = interpret(width);
if (height != null) this.display.wrapper.style.height = interpret(height);
- this.refresh();
- },
-
- on: function(type, f) {on(this, type, f);},
- off: function(type, f) {off(this, type, f);},
+ if (this.options.lineWrapping)
+ this.display.measureLineCache.length = this.display.measureLineCachePos = 0;
+ this.curOp.forceUpdate = true;
+ }),
operation: function(f){return runInOp(this, f);},
@@ -3132,6 +3159,7 @@ window.CodeMirror = (function() {
getScrollerElement: function(){return this.display.scroller;},
getGutterElement: function(){return this.display.gutters;}
};
+ eventMixin(CodeMirror);
// OPTION DEFAULTS
@@ -3256,7 +3284,7 @@ window.CodeMirror = (function() {
};
CodeMirror.getMode = function(options, spec) {
- spec = CodeMirror.resolveMode(spec);
+ var spec = CodeMirror.resolveMode(spec);
var mfactory = modes[spec.name];
if (!mfactory) return CodeMirror.getMode(options, "text/plain");
var modeObj = mfactory(options, spec);
@@ -3269,6 +3297,7 @@ window.CodeMirror = (function() {
}
}
modeObj.name = spec.name;
+
return modeObj;
};
@@ -3296,6 +3325,16 @@ window.CodeMirror = (function() {
var initHooks = [];
CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
+ var helpers = CodeMirror.helpers = {};
+ CodeMirror.registerHelper = function(type, name, value) {
+ if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {};
+ helpers[type][name] = value;
+ };
+
+ // UTILITIES
+
+ CodeMirror.isWordChar = isWordChar;
+
// MODE STATE HANDLING
// Utility functions for working with state. Exported because modes
@@ -3321,6 +3360,7 @@ window.CodeMirror = (function() {
CodeMirror.innerMode = function(mode, state) {
while (mode.innerMode) {
var info = mode.innerMode(state);
+ if (!info || info.mode == mode) break;
state = info.state;
mode = info.mode;
}
@@ -3633,11 +3673,16 @@ window.CodeMirror = (function() {
this.doc = doc;
}
CodeMirror.TextMarker = TextMarker;
+ eventMixin(TextMarker);
TextMarker.prototype.clear = function() {
if (this.explicitlyCleared) return;
var cm = this.doc.cm, withOp = cm && !cm.curOp;
if (withOp) startOperation(cm);
+ if (hasHandler(this, "clear")) {
+ var found = this.find();
+ if (found) signalLater(this, "clear", found.from, found.to);
+ }
var min = null, max = null;
for (var i = 0; i < this.lines.length; ++i) {
var line = this.lines[i];
@@ -3666,7 +3711,6 @@ window.CodeMirror = (function() {
if (cm) reCheckSelection(cm);
}
if (withOp) endOperation(cm);
- signalLater(this, "clear");
};
TextMarker.prototype.find = function() {
@@ -3694,7 +3738,9 @@ window.CodeMirror = (function() {
if (node.offsetHeight != line.height) updateLineHeight(line, node.offsetHeight);
break;
}
- runInOp(cm, function() { cm.curOp.selectionChanged = true; });
+ runInOp(cm, function() {
+ cm.curOp.selectionChanged = cm.curOp.forceUpdate = cm.curOp.updateMaxLine = true;
+ });
}
};
@@ -3767,7 +3813,7 @@ window.CodeMirror = (function() {
}
if (cm) {
if (updateMaxLine) cm.curOp.updateMaxLine = true;
- if (marker.className || marker.startStyle || marker.endStyle || marker.collapsed)
+ if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.collapsed)
regChange(cm, from.line, to.line + 1);
if (marker.atomic) reCheckSelection(cm);
}
@@ -3785,6 +3831,7 @@ window.CodeMirror = (function() {
}
}
CodeMirror.SharedTextMarker = SharedTextMarker;
+ eventMixin(SharedTextMarker);
SharedTextMarker.prototype.clear = function() {
if (this.explicitlyCleared) return;
@@ -4037,11 +4084,12 @@ window.CodeMirror = (function() {
// LINE WIDGETS
var LineWidget = CodeMirror.LineWidget = function(cm, node, options) {
- for (var opt in options) if (options.hasOwnProperty(opt))
+ if (options) for (var opt in options) if (options.hasOwnProperty(opt))
this[opt] = options[opt];
this.cm = cm;
this.node = node;
};
+ eventMixin(LineWidget);
function widgetOperation(f) {
return function() {
var withOp = !this.cm.curOp;
@@ -4056,7 +4104,9 @@ window.CodeMirror = (function() {
if (no == null || !ws) return;
for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
if (!ws.length) this.line.widgets = null;
+ var aboveVisible = heightAtLine(this.cm, this.line) < this.cm.doc.scrollTop;
updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));
+ if (aboveVisible) addToScrollPos(this.cm, 0, -this.height);
regChange(this.cm, no, no + 1);
});
LineWidget.prototype.changed = widgetOperation(function() {
@@ -4080,10 +4130,12 @@ window.CodeMirror = (function() {
var widget = new LineWidget(cm, node, options);
if (widget.noHScroll) cm.display.alignWidgets = true;
changeLine(cm, handle, function(line) {
- (line.widgets || (line.widgets = [])).push(widget);
+ var widgets = line.widgets || (line.widgets = []);
+ if (widget.insertAt == null) widgets.push(widget);
+ else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
widget.line = line;
if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {
- var aboveVisible = heightAtLine(cm, line) < cm.display.scroller.scrollTop;
+ var aboveVisible = heightAtLine(cm, line) < cm.doc.scrollTop;
updateLineHeight(line, line.height + widgetHeight(widget));
if (aboveVisible) addToScrollPos(cm, 0, widget.height);
}
@@ -4096,12 +4148,12 @@ window.CodeMirror = (function() {
// Line objects. These hold state related to a line, including
// highlighting info (the styles array).
- function makeLine(text, markedSpans, estimateHeight) {
- var line = {text: text};
- attachMarkedSpans(line, markedSpans);
- line.height = estimateHeight ? estimateHeight(line) : 1;
- return line;
- }
+ var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) {
+ this.text = text;
+ attachMarkedSpans(this, markedSpans);
+ this.height = estimateHeight ? estimateHeight(this) : 1;
+ };
+ eventMixin(Line);
function updateLine(line, text, markedSpans, estimateHeight) {
line.text = text;
@@ -4207,13 +4259,14 @@ window.CodeMirror = (function() {
(styleToClassCache[style] = "cm-" + style.replace(/ +/g, " cm-"));
}
- function lineContent(cm, realLine, measure) {
+ function lineContent(cm, realLine, measure, copyWidgets) {
var merged, line = realLine, empty = true;
while (merged = collapsedSpanAtStart(line))
line = getLine(cm.doc, merged.find().from.line);
- var builder = {pre: elt("pre"), col: 0, pos: 0, display: !measure,
- measure: null, measuredSomething: false, cm: cm};
+ var builder = {pre: elt("pre"), col: 0, pos: 0,
+ measure: null, measuredSomething: false, cm: cm,
+ copyWidgets: copyWidgets};
if (line.textClass) builder.pre.className = line.textClass;
do {
@@ -4256,7 +4309,7 @@ window.CodeMirror = (function() {
}
var tokenSpecialChars = /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\uFEFF]/g;
- function buildToken(builder, text, style, startStyle, endStyle) {
+ function buildToken(builder, text, style, startStyle, endStyle, title) {
if (!text) return;
if (!tokenSpecialChars.test(text)) {
builder.col += text.length;
@@ -4289,7 +4342,9 @@ window.CodeMirror = (function() {
var fullStyle = style || "";
if (startStyle) fullStyle += startStyle;
if (endStyle) fullStyle += endStyle;
- return builder.pre.appendChild(elt("span", [content], fullStyle));
+ var token = elt("span", [content], fullStyle);
+ if (title) token.title = title;
+ return builder.pre.appendChild(token);
}
builder.pre.appendChild(content);
}
@@ -4304,9 +4359,11 @@ window.CodeMirror = (function() {
} else if (i && wrapping && spanAffectsWrapping(text, i)) {
builder.pre.appendChild(elt("wbr"));
}
+ var old = builder.measure[builder.pos];
var span = builder.measure[builder.pos] =
buildToken(builder, ch, style,
start && startStyle, i == text.length - 1 && endStyle);
+ if (old) span.leftSide = old.leftSide || old;
// In IE single-space nodes wrap differently than spaces
// embedded in larger text nodes, except when set to
// white-space: normal (issue #1268).
@@ -4325,20 +4382,28 @@ window.CodeMirror = (function() {
out += " ";
return out;
}
- return function(builder, text, style, startStyle, endStyle) {
- return inner(builder, text.replace(/ {3,}/, split), style, startStyle, endStyle);
+ return function(builder, text, style, startStyle, endStyle, title) {
+ return inner(builder, text.replace(/ {3,}/, split), style, startStyle, endStyle, title);
};
}
- function buildCollapsedSpan(builder, size, widget) {
+ function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
+ var widget = !ignoreWidget && marker.replacedWith;
if (widget) {
- if (!builder.display) widget = widget.cloneNode(true);
+ if (builder.copyWidgets) widget = widget.cloneNode(true);
+ builder.pre.appendChild(widget);
if (builder.measure) {
- builder.measure[builder.pos] = size ? widget
- : builder.pre.appendChild(zeroWidthElement(builder.cm.display.measure));
+ if (size) {
+ builder.measure[builder.pos] = widget;
+ } else {
+ var elt = builder.measure[builder.pos] = zeroWidthElement(builder.cm.display.measure);
+ if (marker.type != "bookmark" || marker.insertLeft)
+ builder.pre.insertBefore(elt, widget);
+ else
+ builder.pre.appendChild(elt);
+ }
builder.measuredSomething = true;
}
- builder.pre.appendChild(widget);
}
builder.pos += size;
}
@@ -4354,10 +4419,10 @@ window.CodeMirror = (function() {
}
var len = allText.length, pos = 0, i = 1, text = "", style;
- var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, collapsed;
+ var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
for (;;) {
if (nextChange == pos) { // Update current marker set
- spanStyle = spanEndStyle = spanStartStyle = "";
+ spanStyle = spanEndStyle = spanStartStyle = title = "";
collapsed = null; nextChange = Infinity;
var foundBookmark = null;
for (var j = 0; j < spans.length; ++j) {
@@ -4367,17 +4432,17 @@ window.CodeMirror = (function() {
if (m.className) spanStyle += " " + m.className;
if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
+ if (m.title && !title) title = m.title;
if (m.collapsed && (!collapsed || collapsed.marker.size < m.size))
collapsed = sp;
} else if (sp.from > pos && nextChange > sp.from) {
nextChange = sp.from;
}
- if (m.type == "bookmark" && sp.from == pos && m.replacedWith)
- foundBookmark = m.replacedWith;
+ if (m.type == "bookmark" && sp.from == pos && m.replacedWith) foundBookmark = m;
}
if (collapsed && (collapsed.from || 0) == pos) {
buildCollapsedSpan(builder, (collapsed.to == null ? len : collapsed.to) - pos,
- collapsed.from != null && collapsed.marker.replacedWith);
+ collapsed.marker, collapsed.from == null);
if (collapsed.to == null) return collapsed.marker.find();
}
if (foundBookmark && !collapsed) buildCollapsedSpan(builder, 0, foundBookmark);
@@ -4391,7 +4456,7 @@ window.CodeMirror = (function() {
if (!collapsed) {
var tokenText = end > upto ? text.slice(0, upto - pos) : text;
builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
- spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "");
+ spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title);
}
if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
pos = end;
@@ -4421,7 +4486,7 @@ window.CodeMirror = (function() {
// This is a whole-line replace. Treated specially to make
// sure line objects move the way they are supposed to.
for (var i = 0, e = text.length - 1, added = []; i < e; ++i)
- added.push(makeLine(text[i], spansFor(i), estimateHeight));
+ added.push(new Line(text[i], spansFor(i), estimateHeight));
update(lastLine, lastLine.text, lastSpans);
if (nlines) doc.remove(from.line, nlines);
if (added.length) doc.insert(from.line, added);
@@ -4430,8 +4495,8 @@ window.CodeMirror = (function() {
update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
} else {
for (var added = [], i = 1, e = text.length - 1; i < e; ++i)
- added.push(makeLine(text[i], spansFor(i), estimateHeight));
- added.push(makeLine(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
+ added.push(new Line(text[i], spansFor(i), estimateHeight));
+ added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
doc.insert(from.line + 1, added);
}
@@ -4442,7 +4507,7 @@ window.CodeMirror = (function() {
update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
for (var i = 1, e = text.length - 1, added = []; i < e; ++i)
- added.push(makeLine(text[i], spansFor(i), estimateHeight));
+ added.push(new Line(text[i], spansFor(i), estimateHeight));
if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
doc.insert(from.line + 1, added);
}
@@ -4585,7 +4650,7 @@ window.CodeMirror = (function() {
if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
if (firstLine == null) firstLine = 0;
- BranchChunk.call(this, [new LeafChunk([makeLine("", null)])]);
+ BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
this.first = firstLine;
this.scrollTop = this.scrollLeft = 0;
this.cantEdit = false;
@@ -4650,6 +4715,11 @@ window.CodeMirror = (function() {
getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
getLineNumber: function(line) {return lineNo(line);},
+ getLineHandleVisualStart: function(line) {
+ if (typeof line == "number") line = getLine(this, line);
+ return visualLine(this, line);
+ },
+
lineCount: function() {return this.size;},
firstLine: function() {return this.first;},
lastLine: function() {return this.first + this.size - 1;},
@@ -4820,6 +4890,8 @@ window.CodeMirror = (function() {
return function() {return method.apply(this.doc, arguments);};
})(Doc.prototype[prop]);
+ eventMixin(Doc);
+
function linkedDocs(doc, f, sharedHistOnly) {
function propagate(doc, skip, sharedHist) {
if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
@@ -4963,7 +5035,8 @@ window.CodeMirror = (function() {
}
function historyChangeFromChange(doc, change) {
- var histChange = {from: change.from, to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
+ var from = { line: change.from.line, ch: change.from.ch };
+ var histChange = {from: from, to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
return histChange;
@@ -5183,9 +5256,9 @@ window.CodeMirror = (function() {
delayedCallbacks.push(bnd(arr[i]));
}
- function signalDOMEvent(cm, e) {
- signal(cm, e.type, cm, e);
- return e_defaultPrevented(e);
+ function signalDOMEvent(cm, e, override) {
+ signal(cm, override || e.type, cm, e);
+ return e_defaultPrevented(e) || e.codemirrorIgnore;
}
function fireDelayed() {
@@ -5202,6 +5275,11 @@ window.CodeMirror = (function() {
CodeMirror.on = on; CodeMirror.off = off; CodeMirror.signal = signal;
+ function eventMixin(ctor) {
+ ctor.prototype.on = function(type, f) {on(this, type, f);};
+ ctor.prototype.off = function(type, f) {off(this, type, f);};
+ }
+
// MISC UTILITIES
// Number of pixels added to scroller and sizer to hide scrollbar
@@ -5353,10 +5431,12 @@ window.CodeMirror = (function() {
spanAffectsWrapping = function(str, i) {
return /\-[^ \-?]|\?[^ !\'\"\),.\-\/:;\?\]\}]/.test(str.slice(i - 1, i + 1));
};
- else if (webkit)
+ else if (webkit && !/Chrome\/(?:29|[3-9]\d|\d\d\d)\./.test(navigator.userAgent))
spanAffectsWrapping = function(str, i) {
- if (i > 1 && str.charCodeAt(i - 1) == 45 && /\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i)))
- return true;
+ if (i > 1 && str.charCodeAt(i - 1) == 45) {
+ if (/\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i))) return true;
+ if (i > 2 && /[\d\.,]/.test(str.charAt(i - 2)) && /[\d\.,]/.test(str.charAt(i))) return false;
+ }
return /[~!#%&*)=+}\]|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|…[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
};
@@ -5443,11 +5523,15 @@ window.CodeMirror = (function() {
function iterateBidiSections(order, from, to, f) {
if (!order) return f(from, to, "ltr");
+ var found = false;
for (var i = 0; i < order.length; ++i) {
var part = order[i];
- if (part.from < to && part.to > from || from == to && part.to == from)
+ if (part.from < to && part.to > from || from == to && part.to == from) {
f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
- }
+ found = true;
+ }
+ }
+ if (!found) f(from, to, "ltr");
}
function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
@@ -5709,7 +5793,7 @@ window.CodeMirror = (function() {
// THE END
- CodeMirror.version = "3.14.0";
+ CodeMirror.version = "3.15.0";
return CodeMirror;
})();
diff --git a/rhodecode/public/js/mode/clike/clike.js b/rhodecode/public/js/mode/clike/clike.js
--- a/rhodecode/public/js/mode/clike/clike.js
+++ b/rhodecode/public/js/mode/clike/clike.js
@@ -158,7 +158,8 @@ CodeMirror.defineMode("clike", function(
electricChars: "{}",
blockCommentStart: "/*",
blockCommentEnd: "*/",
- lineComment: "//"
+ lineComment: "//",
+ fold: "brace"
};
});
diff --git a/rhodecode/public/js/mode/coffeescript/coffeescript.js b/rhodecode/public/js/mode/coffeescript/coffeescript.js
--- a/rhodecode/public/js/mode/coffeescript/coffeescript.js
+++ b/rhodecode/public/js/mode/coffeescript/coffeescript.js
@@ -339,7 +339,8 @@ CodeMirror.defineMode('coffeescript', fu
return state.scopes[0].offset;
},
- lineComment: "#"
+ lineComment: "#",
+ fold: "indent"
};
return external;
});
diff --git a/rhodecode/public/js/mode/css/css.js b/rhodecode/public/js/mode/css/css.js
--- a/rhodecode/public/js/mode/css/css.js
+++ b/rhodecode/public/js/mode/css/css.js
@@ -103,7 +103,8 @@ CodeMirror.defineMode("css-base", functi
startState: function(base) {
return {tokenize: tokenBase,
baseIndent: base || 0,
- stack: []};
+ stack: [],
+ lastToken: null};
},
token: function(stream, state) {
@@ -163,7 +164,7 @@ CodeMirror.defineMode("css-base", functi
var context = state.stack[state.stack.length-1];
if (style == "variable") {
if (type == "variable-definition") state.stack.push("propertyValue");
- return "variable-2";
+ return state.lastToken = "variable-2";
} else if (style == "property") {
var word = stream.current().toLowerCase();
if (context == "propertyValue") {
@@ -251,7 +252,6 @@ CodeMirror.defineMode("css-base", functi
// Push/pop context stack
if (type == "{") {
if (context == "@media" || context == "@mediaType") {
- state.stack.pop();
state.stack[state.stack.length-1] = "@media{";
}
else {
@@ -260,8 +260,7 @@ CodeMirror.defineMode("css-base", functi
}
}
else if (type == "}") {
- var lastState = state.stack[state.stack.length - 1];
- if (lastState == "interpolation") style = "operator";
+ if (context == "interpolation") style = "operator";
state.stack.pop();
if (context == "propertyValue") state.stack.pop();
}
@@ -269,26 +268,44 @@ CodeMirror.defineMode("css-base", functi
else if (type == "@media") state.stack.push("@media");
else if (type == "@import") state.stack.push("@import");
else if (context == "@media" && /\b(keyword|attribute)\b/.test(style))
- state.stack.push("@mediaType");
- else if (context == "@mediaType" && stream.current() == ",") state.stack.pop();
- else if (context == "@mediaType" && type == "(") state.stack.push("@mediaType(");
- else if (context == "@mediaType(" && type == ")") state.stack.pop();
- else if ((context == "rule" || context == "block") && type == ":") state.stack.push("propertyValue");
+ state.stack[state.stack.length-1] = "@mediaType";
+ else if (context == "@mediaType" && stream.current() == ",")
+ state.stack[state.stack.length-1] = "@media";
+ else if (type == "(") {
+ if (context == "@media" || context == "@mediaType") {
+ // Make sure @mediaType is used to avoid error on {
+ state.stack[state.stack.length-1] = "@mediaType";
+ state.stack.push("@mediaType(");
+ }
+ }
+ else if (type == ")") {
+ if (context == "propertyValue" && state.stack[state.stack.length-2] == "@mediaType(") {
+ // In @mediaType( without closing ; after propertyValue
+ state.stack.pop();
+ state.stack.pop();
+ }
+ else if (context == "@mediaType(") {
+ state.stack.pop();
+ }
+ }
+ else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
else if (context == "propertyValue" && type == ";") state.stack.pop();
else if (context == "@import" && type == ";") state.stack.pop();
- return style;
+
+ return state.lastToken = style;
},
indent: function(state, textAfter) {
var n = state.stack.length;
if (/^\}/.test(textAfter))
- n -= state.stack[state.stack.length-1] == "propertyValue" ? 2 : 1;
+ n -= state.stack[n-1] == "propertyValue" ? 2 : 1;
return state.baseIndent + n * indentUnit;
},
electricChars: "}",
blockCommentStart: "/*",
- blockCommentEnd: "*/"
+ blockCommentEnd: "*/",
+ fold: "brace"
};
});
@@ -384,15 +401,15 @@ CodeMirror.defineMode("css-base", functi
"text-decoration-color", "text-decoration-line", "text-decoration-skip",
"text-decoration-style", "text-emphasis", "text-emphasis-color",
"text-emphasis-position", "text-emphasis-style", "text-height",
- "text-indent", "text-justify", "text-outline", "text-shadow",
- "text-space-collapse", "text-transform", "text-underline-position",
+ "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
+ "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
"text-wrap", "top", "transform", "transform-origin", "transform-style",
"transition", "transition-delay", "transition-duration",
"transition-property", "transition-timing-function", "unicode-bidi",
"vertical-align", "visibility", "voice-balance", "voice-duration",
"voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
"voice-volume", "volume", "white-space", "widows", "width", "word-break",
- "word-spacing", "word-wrap", "z-index",
+ "word-spacing", "word-wrap", "z-index", "zoom",
// SVG-specific
"clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
"flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
diff --git a/rhodecode/public/js/mode/css/scss_test.js b/rhodecode/public/js/mode/css/scss_test.js
--- a/rhodecode/public/js/mode/css/scss_test.js
+++ b/rhodecode/public/js/mode/css/scss_test.js
@@ -64,7 +64,7 @@
"[tag p] { [tag a] { [property color][operator :][atom #000]; } }");
MT('interpolation_in_property',
- "[tag foo] { [operator #{][variable-2 $hello][operator }:][atom #000]; }");
+ "[tag foo] { [operator #{][variable-2 $hello][operator }:][number 2]; }");
MT('interpolation_in_selector',
"[tag foo][operator #{][variable-2 $hello][operator }] { [property color][operator :][atom #000]; }");
diff --git a/rhodecode/public/js/mode/css/test.js b/rhodecode/public/js/mode/css/test.js
--- a/rhodecode/public/js/mode/css/test.js
+++ b/rhodecode/public/js/mode/css/test.js
@@ -15,6 +15,12 @@
MT("atMediaCheckStack",
"[def @media] [attribute screen] ([property color]) { } [tag foo] { }");
+ MT("atMediaPropertyOnly",
+ "[def @media] ([property color]) { } [tag foo] { }");
+
+ MT("atMediaCheckStackInvalidAttribute",
+ "[def @media] [attribute&error foobarhello] { [tag foo] { } }");
+
MT("atMediaCheckStackInvalidAttribute",
"[def @media] [attribute&error foobarhello] { } [tag foo] { }");
@@ -53,6 +59,10 @@
MT("atMediaUnknownProperty",
"[def @media] [attribute screen] [operator and] ([property&error foobarhello]) { }");
+ // Make sure nesting works with media queries
+ MT("atMediaMaxWidthNested",
+ "[def @media] [attribute screen] [operator and] ([property max-width][operator :] [number 25px]) { [tag foo] { } }");
+
MT("tagSelector",
"[tag foo] { }");
@@ -108,6 +118,9 @@
MT("tagTwoProperties",
"[tag foo] { [property margin][operator :] [number 0]; [property padding][operator :] [number 0]; }");
+ MT("tagTwoPropertiesURL",
+ "[tag foo] { [property background][operator :] [string-2 url]([string //example.com/foo.png]); [property padding][operator :] [number 0]; }");
+
MT("commentSGML",
"[comment ]");
})();
diff --git a/rhodecode/public/js/mode/groovy/groovy.js b/rhodecode/public/js/mode/groovy/groovy.js
--- a/rhodecode/public/js/mode/groovy/groovy.js
+++ b/rhodecode/public/js/mode/groovy/groovy.js
@@ -203,7 +203,8 @@ CodeMirror.defineMode("groovy", function
else return ctx.indented + (closing ? 0 : config.indentUnit);
},
- electricChars: "{}"
+ electricChars: "{}",
+ fold: "brace"
};
});
diff --git a/rhodecode/public/js/mode/jade/index.html b/rhodecode/public/js/mode/jade/index.html
new file mode 100644
--- /dev/null
+++ b/rhodecode/public/js/mode/jade/index.html
@@ -0,0 +1,54 @@
+
+
+
+ CodeMirror: Jade Templating Mode
+ CodeMirror: Jade Templating Mode
+
+
+ The Jade Templating Mode
+ Created by Drew Bratcher. Managed as part of an Adobe Brackets extension at https://github.com/dbratcher/brackets-jade .
+ MIME type defined: text/x-jade.
+
+
diff --git a/rhodecode/public/js/mode/jade/jade.js b/rhodecode/public/js/mode/jade/jade.js
new file mode 100644
--- /dev/null
+++ b/rhodecode/public/js/mode/jade/jade.js
@@ -0,0 +1,90 @@
+CodeMirror.defineMode("jade", function () {
+ var symbol_regex1 = /^(?:~|!|%|\^|\*|\+|=|\\|:|;|,|\/|\?|&|<|>|\|)/;
+ var open_paren_regex = /^(\(|\[)/;
+ var close_paren_regex = /^(\)|\])/;
+ var keyword_regex1 = /^(if|else|return|var|function|include|doctype|each)/;
+ var keyword_regex2 = /^(#|{|}|\.)/;
+ var keyword_regex3 = /^(in)/;
+ var html_regex1 = /^(html|head|title|meta|link|script|body|br|div|input|span|a|img)/;
+ var html_regex2 = /^(h1|h2|h3|h4|h5|p|strong|em)/;
+ return {
+ startState: function () {
+ return {
+ inString: false,
+ stringType: "",
+ beforeTag: true,
+ justMatchedKeyword: false,
+ afterParen: false
+ };
+ },
+ token: function (stream, state) {
+ //check for state changes
+ if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
+ state.stringType = stream.peek();
+ stream.next(); // Skip quote
+ state.inString = true; // Update state
+ }
+
+ //return state
+ if (state.inString) {
+ if (stream.skipTo(state.stringType)) { // Quote found on this line
+ stream.next(); // Skip quote
+ state.inString = false; // Clear flag
+ } else {
+ stream.skipToEnd(); // Rest of line is string
+ }
+ state.justMatchedKeyword = false;
+ return "string"; // Token style
+ } else if (stream.sol() && stream.eatSpace()) {
+ if (stream.match(keyword_regex1)) {
+ state.justMatchedKeyword = true;
+ stream.eatSpace();
+ return "keyword";
+ }
+ if (stream.match(html_regex1) || stream.match(html_regex2)) {
+ state.justMatchedKeyword = true;
+ return "variable";
+ }
+ } else if (stream.sol() && stream.match(keyword_regex1)) {
+ state.justMatchedKeyword = true;
+ stream.eatSpace();
+ return "keyword";
+ } else if (stream.sol() && (stream.match(html_regex1) || stream.match(html_regex2))) {
+ state.justMatchedKeyword = true;
+ return "variable";
+ } else if (stream.eatSpace()) {
+ state.justMatchedKeyword = false;
+ if (stream.match(keyword_regex3) && stream.eatSpace()) {
+ state.justMatchedKeyword = true;
+ return "keyword";
+ }
+ } else if (stream.match(symbol_regex1)) {
+ state.justMatchedKeyword = false;
+ return "atom";
+ } else if (stream.match(open_paren_regex)) {
+ state.afterParen = true;
+ state.justMatchedKeyword = true;
+ return "def";
+ } else if (stream.match(close_paren_regex)) {
+ state.afterParen = false;
+ state.justMatchedKeyword = true;
+ return "def";
+ } else if (stream.match(keyword_regex2)) {
+ state.justMatchedKeyword = true;
+ return "keyword";
+ } else if (stream.eatSpace()) {
+ state.justMatchedKeyword = false;
+ } else {
+ stream.next();
+ if (state.justMatchedKeyword) {
+ return "property";
+ } else if (state.afterParen) {
+ return "property";
+ }
+ }
+ return null;
+ }
+ };
+});
+
+CodeMirror.defineMIME('text/x-jade', 'jade');
diff --git a/rhodecode/public/js/mode/javascript/javascript.js b/rhodecode/public/js/mode/javascript/javascript.js
--- a/rhodecode/public/js/mode/javascript/javascript.js
+++ b/rhodecode/public/js/mode/javascript/javascript.js
@@ -258,17 +258,17 @@ CodeMirror.defineMode("javascript", func
if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
if (type == "{") return cont(pushlex("}"), block, poplex);
if (type == ";") return cont();
- if (type == "if") return cont(pushlex("form"), expression, statement, poplex, maybeelse(cx.state.indented));
+ if (type == "if") return cont(pushlex("form"), expression, statement, poplex, maybeelse);
if (type == "function") return cont(functiondef);
if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"),
- poplex, statement, poplex);
+ poplex, statement, poplex);
if (type == "variable") return cont(pushlex("stat"), maybelabel);
if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
- block, poplex, poplex);
+ block, poplex, poplex);
if (type == "case") return cont(expression, expect(":"));
if (type == "default") return cont(expect(":"));
if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
- statement, poplex, popcontext);
+ statement, poplex, popcontext);
return pass(pushlex("stat"), expression, expect(";"), poplex);
}
function expression(type) {
@@ -299,19 +299,20 @@ CodeMirror.defineMode("javascript", func
function maybeoperatorComma(type, value) {
if (type == ",") return cont(expression);
- return maybeoperatorNoComma(type, value, maybeoperatorComma);
+ return maybeoperatorNoComma(type, value, false);
}
- function maybeoperatorNoComma(type, value, me) {
- if (!me) me = maybeoperatorNoComma;
+ function maybeoperatorNoComma(type, value, noComma) {
+ var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
+ var expr = noComma == false ? expression : expressionNoComma;
if (type == "operator") {
if (/\+\+|--/.test(value)) return cont(me);
- if (value == "?") return cont(expression, expect(":"), expression);
- return cont(expression);
+ if (value == "?") return cont(expression, expect(":"), expr);
+ return cont(expr);
}
if (type == ";") return;
if (type == "(") return cont(pushlex(")", "call"), commasep(expressionNoComma, ")"), poplex, me);
if (type == ".") return cont(property, me);
- if (type == "[") return cont(pushlex("]"), expression, expect("]"), poplex, me);
+ if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
}
function maybelabel(type) {
if (type == ":") return cont(poplex, statement);
@@ -373,14 +374,8 @@ CodeMirror.defineMode("javascript", func
if (value == "=") return cont(expressionNoComma, vardef2);
if (type == ",") return cont(vardef1);
}
- function maybeelse(indent) {
- return function(type, value) {
- if (type == "keyword b" && value == "else") {
- cx.state.lexical = new JSLexical(indent, 0, "form", null, cx.state.lexical);
- return cont(statement, poplex);
- }
- return pass();
- };
+ function maybeelse(type, value) {
+ if (type == "keyword b" && value == "else") return cont(pushlex("form"), statement, poplex);
}
function forspec1(type) {
if (type == "var") return cont(vardef1, expect(";"), forspec2);
@@ -441,6 +436,12 @@ CodeMirror.defineMode("javascript", func
if (state.tokenize == jsTokenComment) return CodeMirror.Pass;
if (state.tokenize != jsTokenBase) return 0;
var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
+ // Kludge to prevent 'maybelse' from blocking lexical scope pops
+ for (var i = state.cc.length - 1; i >= 0; --i) {
+ var c = state.cc[i];
+ if (c == poplex) lexical = lexical.prev;
+ else if (c != maybeelse || /^else\b/.test(textAfter)) break;
+ }
if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
lexical = lexical.prev;
@@ -461,7 +462,9 @@ CodeMirror.defineMode("javascript", func
blockCommentStart: jsonMode ? null : "/*",
blockCommentEnd: jsonMode ? null : "*/",
lineComment: jsonMode ? null : "//",
+ fold: "brace",
+ helperType: jsonMode ? "json" : "javascript",
jsonMode: jsonMode
};
});
diff --git a/rhodecode/public/js/mode/javascript/test.js b/rhodecode/public/js/mode/javascript/test.js
new file mode 100644
--- /dev/null
+++ b/rhodecode/public/js/mode/javascript/test.js
@@ -0,0 +1,10 @@
+(function() {
+ var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+ MT("locals",
+ "[keyword function] [variable foo]([def a], [def b]) { [keyword var] [def c] = [number 10]; [keyword return] [variable-2 a] + [variable-2 c] + [variable d]; }");
+
+ MT("comma-and-binop",
+ "[keyword function](){ [keyword var] [def x] = [number 1] + [number 2], [def y]; }");
+})();
diff --git a/rhodecode/public/js/mode/markdown/index.html b/rhodecode/public/js/mode/markdown/index.html
--- a/rhodecode/public/js/mode/markdown/index.html
+++ b/rhodecode/public/js/mode/markdown/index.html
@@ -8,7 +8,12 @@
-
+
CodeMirror: NGINX mode
+ CodeMirror: NGINX mode
+
+
+
+ MIME types defined: text/nginx.
+
+
+
diff --git a/rhodecode/public/js/mode/nginx/nginx.js b/rhodecode/public/js/mode/nginx/nginx.js
new file mode 100644
--- /dev/null
+++ b/rhodecode/public/js/mode/nginx/nginx.js
@@ -0,0 +1,163 @@
+CodeMirror.defineMode("nginx", function(config) {
+
+ function words(str) {
+ var obj = {}, words = str.split(" ");
+ for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+ return obj;
+ }
+
+ var keywords = words(
+ /* ngxDirectiveControl */ "break return rewrite set" +
+ /* ngxDirective */ " accept_mutex accept_mutex_delay access_log add_after_body add_before_body add_header addition_types aio alias allow ancient_browser ancient_browser_value auth_basic auth_basic_user_file auth_http auth_http_header auth_http_timeout autoindex autoindex_exact_size autoindex_localtime charset charset_types client_body_buffer_size client_body_in_file_only client_body_in_single_buffer client_body_temp_path client_body_timeout client_header_buffer_size client_header_timeout client_max_body_size connection_pool_size create_full_put_path daemon dav_access dav_methods debug_connection debug_points default_type degradation degrade deny devpoll_changes devpoll_events directio directio_alignment empty_gif env epoll_events error_log eventport_events expires fastcgi_bind fastcgi_buffer_size fastcgi_buffers fastcgi_busy_buffers_size fastcgi_cache fastcgi_cache_key fastcgi_cache_methods fastcgi_cache_min_uses fastcgi_cache_path fastcgi_cache_use_stale fastcgi_cache_valid fastcgi_catch_stderr fastcgi_connect_timeout fastcgi_hide_header fastcgi_ignore_client_abort fastcgi_ignore_headers fastcgi_index fastcgi_intercept_errors fastcgi_max_temp_file_size fastcgi_next_upstream fastcgi_param fastcgi_pass_header fastcgi_pass_request_body fastcgi_pass_request_headers fastcgi_read_timeout fastcgi_send_lowat fastcgi_send_timeout fastcgi_split_path_info fastcgi_store fastcgi_store_access fastcgi_temp_file_write_size fastcgi_temp_path fastcgi_upstream_fail_timeout fastcgi_upstream_max_fails flv geoip_city geoip_country google_perftools_profiles gzip gzip_buffers gzip_comp_level gzip_disable gzip_hash gzip_http_version gzip_min_length gzip_no_buffer gzip_proxied gzip_static gzip_types gzip_vary gzip_window if_modified_since ignore_invalid_headers image_filter image_filter_buffer image_filter_jpeg_quality image_filter_transparency imap_auth imap_capabilities imap_client_buffer index ip_hash keepalive_requests keepalive_timeout kqueue_changes kqueue_events large_client_header_buffers limit_conn limit_conn_log_level limit_rate limit_rate_after limit_req limit_req_log_level limit_req_zone limit_zone lingering_time lingering_timeout lock_file log_format log_not_found log_subrequest map_hash_bucket_size map_hash_max_size master_process memcached_bind memcached_buffer_size memcached_connect_timeout memcached_next_upstream memcached_read_timeout memcached_send_timeout memcached_upstream_fail_timeout memcached_upstream_max_fails merge_slashes min_delete_depth modern_browser modern_browser_value msie_padding msie_refresh multi_accept open_file_cache open_file_cache_errors open_file_cache_events open_file_cache_min_uses open_file_cache_valid open_log_file_cache output_buffers override_charset perl perl_modules perl_require perl_set pid pop3_auth pop3_capabilities port_in_redirect postpone_gzipping postpone_output protocol proxy proxy_bind proxy_buffer proxy_buffer_size proxy_buffering proxy_buffers proxy_busy_buffers_size proxy_cache proxy_cache_key proxy_cache_methods proxy_cache_min_uses proxy_cache_path proxy_cache_use_stale proxy_cache_valid proxy_connect_timeout proxy_headers_hash_bucket_size proxy_headers_hash_max_size proxy_hide_header proxy_ignore_client_abort proxy_ignore_headers proxy_intercept_errors proxy_max_temp_file_size proxy_method proxy_next_upstream proxy_pass_error_message proxy_pass_header proxy_pass_request_body proxy_pass_request_headers proxy_read_timeout proxy_redirect proxy_send_lowat proxy_send_timeout proxy_set_body proxy_set_header proxy_ssl_session_reuse proxy_store proxy_store_access proxy_temp_file_write_size proxy_temp_path proxy_timeout proxy_upstream_fail_timeout proxy_upstream_max_fails random_index read_ahead real_ip_header recursive_error_pages request_pool_size reset_timedout_connection resolver resolver_timeout rewrite_log rtsig_overflow_events rtsig_overflow_test rtsig_overflow_threshold rtsig_signo satisfy secure_link_secret send_lowat send_timeout sendfile sendfile_max_chunk server_name_in_redirect server_names_hash_bucket_size server_names_hash_max_size server_tokens set_real_ip_from smtp_auth smtp_capabilities smtp_client_buffer smtp_greeting_delay so_keepalive source_charset ssi ssi_ignore_recycled_buffers ssi_min_file_chunk ssi_silent_errors ssi_types ssi_value_length ssl ssl_certificate ssl_certificate_key ssl_ciphers ssl_client_certificate ssl_crl ssl_dhparam ssl_engine ssl_prefer_server_ciphers ssl_protocols ssl_session_cache ssl_session_timeout ssl_verify_client ssl_verify_depth starttls stub_status sub_filter sub_filter_once sub_filter_types tcp_nodelay tcp_nopush thread_stack_size timeout timer_resolution types_hash_bucket_size types_hash_max_size underscores_in_headers uninitialized_variable_warn use user userid userid_domain userid_expires userid_mark userid_name userid_p3p userid_path userid_service valid_referers variables_hash_bucket_size variables_hash_max_size worker_connections worker_cpu_affinity worker_priority worker_processes worker_rlimit_core worker_rlimit_nofile worker_rlimit_sigpending worker_threads working_directory xclient xml_entities xslt_stylesheet xslt_typesdrew@li229-23"
+ );
+
+ var keywords_block = words(
+ /* ngxDirectiveBlock */ "http mail events server types location upstream charset_map limit_except if geo map"
+ );
+
+ var keywords_important = words(
+ /* ngxDirectiveImportant */ "include root server server_name listen internal proxy_pass memcached_pass fastcgi_pass try_files"
+ );
+
+ var indentUnit = config.indentUnit, type;
+ function ret(style, tp) {type = tp; return style;}
+
+ function tokenBase(stream, state) {
+
+
+ stream.eatWhile(/[\w\$_]/);
+
+ var cur = stream.current();
+
+
+ if (keywords.propertyIsEnumerable(cur)) {
+ return "keyword";
+ }
+ else if (keywords_block.propertyIsEnumerable(cur)) {
+ return "variable-2";
+ }
+ else if (keywords_important.propertyIsEnumerable(cur)) {
+ return "string-2";
+ }
+ /**/
+
+ var ch = stream.next();
+ if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("meta", stream.current());}
+ else if (ch == "/" && stream.eat("*")) {
+ state.tokenize = tokenCComment;
+ return tokenCComment(stream, state);
+ }
+ else if (ch == "<" && stream.eat("!")) {
+ state.tokenize = tokenSGMLComment;
+ return tokenSGMLComment(stream, state);
+ }
+ else if (ch == "=") ret(null, "compare");
+ else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare");
+ else if (ch == "\"" || ch == "'") {
+ state.tokenize = tokenString(ch);
+ return state.tokenize(stream, state);
+ }
+ else if (ch == "#") {
+ stream.skipToEnd();
+ return ret("comment", "comment");
+ }
+ else if (ch == "!") {
+ stream.match(/^\s*\w*/);
+ return ret("keyword", "important");
+ }
+ else if (/\d/.test(ch)) {
+ stream.eatWhile(/[\w.%]/);
+ return ret("number", "unit");
+ }
+ else if (/[,.+>*\/]/.test(ch)) {
+ return ret(null, "select-op");
+ }
+ else if (/[;{}:\[\]]/.test(ch)) {
+ return ret(null, ch);
+ }
+ else {
+ stream.eatWhile(/[\w\\\-]/);
+ return ret("variable", "variable");
+ }
+ }
+
+ function tokenCComment(stream, state) {
+ var maybeEnd = false, ch;
+ while ((ch = stream.next()) != null) {
+ if (maybeEnd && ch == "/") {
+ state.tokenize = tokenBase;
+ break;
+ }
+ maybeEnd = (ch == "*");
+ }
+ return ret("comment", "comment");
+ }
+
+ function tokenSGMLComment(stream, state) {
+ var dashes = 0, ch;
+ while ((ch = stream.next()) != null) {
+ if (dashes >= 2 && ch == ">") {
+ state.tokenize = tokenBase;
+ break;
+ }
+ dashes = (ch == "-") ? dashes + 1 : 0;
+ }
+ return ret("comment", "comment");
+ }
+
+ function tokenString(quote) {
+ return function(stream, state) {
+ var escaped = false, ch;
+ while ((ch = stream.next()) != null) {
+ if (ch == quote && !escaped)
+ break;
+ escaped = !escaped && ch == "\\";
+ }
+ if (!escaped) state.tokenize = tokenBase;
+ return ret("string", "string");
+ };
+ }
+
+ return {
+ startState: function(base) {
+ return {tokenize: tokenBase,
+ baseIndent: base || 0,
+ stack: []};
+ },
+
+ token: function(stream, state) {
+ if (stream.eatSpace()) return null;
+ type = null;
+ var style = state.tokenize(stream, state);
+
+ var context = state.stack[state.stack.length-1];
+ if (type == "hash" && context == "rule") style = "atom";
+ else if (style == "variable") {
+ if (context == "rule") style = "number";
+ else if (!context || context == "@media{") style = "tag";
+ }
+
+ if (context == "rule" && /^[\{\};]$/.test(type))
+ state.stack.pop();
+ if (type == "{") {
+ if (context == "@media") state.stack[state.stack.length-1] = "@media{";
+ else state.stack.push("{");
+ }
+ else if (type == "}") state.stack.pop();
+ else if (type == "@media") state.stack.push("@media");
+ else if (context == "{" && type != "comment") state.stack.push("rule");
+ return style;
+ },
+
+ indent: function(state, textAfter) {
+ var n = state.stack.length;
+ if (/^\}/.test(textAfter))
+ n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;
+ return state.baseIndent + n * indentUnit;
+ },
+
+ electricChars: "}"
+ };
+});
+
+CodeMirror.defineMIME("text/nginx", "text/x-nginx-conf");
diff --git a/rhodecode/public/js/mode/python/index.html b/rhodecode/public/js/mode/python/index.html
--- a/rhodecode/public/js/mode/python/index.html
+++ b/rhodecode/public/js/mode/python/index.html
@@ -12,7 +12,7 @@
CodeMirror: Python mode
-
+ Python mode
+
+
+Cython mode
+
+
+
- Configuration Options:
+ Configuration Options for Python mode:
- MIME types defined: text/x-python.
+ MIME types defined: text/x-python and text/x-cython.