|
|
|
|
@ -939,10 +939,12 @@ Typo.prototype = {
|
|
|
|
|
if (val && !prev) {
|
|
|
|
|
cm.on("blur", onBlur);
|
|
|
|
|
cm.on("change", onChange);
|
|
|
|
|
cm.on("swapDoc", onChange);
|
|
|
|
|
onChange(cm);
|
|
|
|
|
} else if (!val && prev) {
|
|
|
|
|
cm.off("blur", onBlur);
|
|
|
|
|
cm.off("change", onChange);
|
|
|
|
|
cm.off("swapDoc", onChange);
|
|
|
|
|
clearPlaceholder(cm);
|
|
|
|
|
var wrapper = cm.getWrapperElement();
|
|
|
|
|
wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");
|
|
|
|
|
@ -1140,7 +1142,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
else if (typeof define == "function" && define.amd) // AMD
|
|
|
|
|
return define([], mod);
|
|
|
|
|
else // Plain browser env
|
|
|
|
|
this.CodeMirror = mod();
|
|
|
|
|
(this || window).CodeMirror = mod();
|
|
|
|
|
})(function() {
|
|
|
|
|
"use strict";
|
|
|
|
|
|
|
|
|
|
@ -1670,6 +1672,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
|
|
|
|
|
d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
|
|
|
|
|
d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
|
|
|
|
|
d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
|
|
|
|
|
|
|
|
|
|
if (sizes.right && sizes.bottom) {
|
|
|
|
|
d.scrollbarFiller.style.display = "block";
|
|
|
|
|
@ -1914,9 +1917,9 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
|
|
|
|
|
function setDocumentHeight(cm, measure) {
|
|
|
|
|
cm.display.sizer.style.minHeight = measure.docHeight + "px";
|
|
|
|
|
var total = measure.docHeight + cm.display.barHeight;
|
|
|
|
|
cm.display.heightForcer.style.top = total + "px";
|
|
|
|
|
cm.display.gutters.style.height = Math.max(total + scrollGap(cm), measure.clientHeight) + "px";
|
|
|
|
|
cm.display.heightForcer.style.top = measure.docHeight + "px";
|
|
|
|
|
cm.display.gutters.style.height = Math.max(measure.docHeight + cm.display.barHeight + scrollGap(cm),
|
|
|
|
|
measure.clientHeight) + "px";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Read the actual heights of the rendered lines, and update their
|
|
|
|
|
@ -2221,10 +2224,6 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function isReadOnly(cm) {
|
|
|
|
|
return cm.options.readOnly || cm.doc.cantEdit;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// This will be set to an array of strings when copying, so that,
|
|
|
|
|
// when pasting, we know what kind of selections the copied text
|
|
|
|
|
// was made out of.
|
|
|
|
|
@ -2279,7 +2278,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
|
|
|
|
|
if (pasted) {
|
|
|
|
|
e.preventDefault();
|
|
|
|
|
if (!isReadOnly(cm) && !cm.options.disableInput)
|
|
|
|
|
if (!cm.isReadOnly() && !cm.options.disableInput)
|
|
|
|
|
runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
@ -2382,13 +2381,14 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
on(te, "paste", function(e) {
|
|
|
|
|
if (handlePaste(e, cm)) return true;
|
|
|
|
|
if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
|
|
|
|
|
|
|
|
|
|
cm.state.pasteIncoming = true;
|
|
|
|
|
input.fastPoll();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
function prepareCopyCut(e) {
|
|
|
|
|
if (signalDOMEvent(cm, e)) return
|
|
|
|
|
if (cm.somethingSelected()) {
|
|
|
|
|
lastCopied = cm.getSelections();
|
|
|
|
|
if (input.inaccurateSelection) {
|
|
|
|
|
@ -2416,7 +2416,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
on(te, "copy", prepareCopyCut);
|
|
|
|
|
|
|
|
|
|
on(display.scroller, "paste", function(e) {
|
|
|
|
|
if (eventInWidget(display, e)) return;
|
|
|
|
|
if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return;
|
|
|
|
|
cm.state.pasteIncoming = true;
|
|
|
|
|
input.focus();
|
|
|
|
|
});
|
|
|
|
|
@ -2550,7 +2550,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
// in which case reading its value would be expensive.
|
|
|
|
|
if (this.contextMenuPending || !cm.state.focused ||
|
|
|
|
|
(hasSelection(input) && !prevInput && !this.composing) ||
|
|
|
|
|
isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
|
|
|
|
|
cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
var text = input.value;
|
|
|
|
|
@ -2612,10 +2612,11 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
if (reset && cm.doc.sel.contains(pos) == -1)
|
|
|
|
|
operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
|
|
|
|
|
|
|
|
|
|
var oldCSS = te.style.cssText;
|
|
|
|
|
input.wrapper.style.position = "absolute";
|
|
|
|
|
te.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
|
|
|
|
|
"px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
|
|
|
|
|
var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
|
|
|
|
|
input.wrapper.style.cssText = "position: absolute"
|
|
|
|
|
var wrapperBox = input.wrapper.getBoundingClientRect()
|
|
|
|
|
te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
|
|
|
|
|
"px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
|
|
|
|
|
(ie ? "rgba(255, 255, 255, .05)" : "transparent") +
|
|
|
|
|
"; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
|
|
|
|
|
if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
|
|
|
|
|
@ -2646,7 +2647,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
}
|
|
|
|
|
function rehide() {
|
|
|
|
|
input.contextMenuPending = false;
|
|
|
|
|
input.wrapper.style.position = "relative";
|
|
|
|
|
input.wrapper.style.cssText = oldWrapperCSS
|
|
|
|
|
te.style.cssText = oldCSS;
|
|
|
|
|
if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
|
|
|
|
|
|
|
|
|
|
@ -2701,7 +2702,9 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
var div = input.div = display.lineDiv;
|
|
|
|
|
disableBrowserMagic(div);
|
|
|
|
|
|
|
|
|
|
on(div, "paste", function(e) { handlePaste(e, cm); })
|
|
|
|
|
on(div, "paste", function(e) {
|
|
|
|
|
if (!signalDOMEvent(cm, e)) handlePaste(e, cm);
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
on(div, "compositionstart", function(e) {
|
|
|
|
|
var data = e.data;
|
|
|
|
|
@ -2739,11 +2742,12 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
|
|
|
|
|
on(div, "input", function() {
|
|
|
|
|
if (input.composing) return;
|
|
|
|
|
if (isReadOnly(cm) || !input.pollContent())
|
|
|
|
|
if (cm.isReadOnly() || !input.pollContent())
|
|
|
|
|
runInOp(input.cm, function() {regChange(cm);});
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
function onCopyCut(e) {
|
|
|
|
|
if (signalDOMEvent(cm, e)) return
|
|
|
|
|
if (cm.somethingSelected()) {
|
|
|
|
|
lastCopied = cm.getSelections();
|
|
|
|
|
if (e.type == "cut") cm.replaceSelection("", null, "cut");
|
|
|
|
|
@ -2819,8 +2823,13 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
try { var rng = range(start.node, start.offset, end.offset, end.node); }
|
|
|
|
|
catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
|
|
|
|
|
if (rng) {
|
|
|
|
|
sel.removeAllRanges();
|
|
|
|
|
sel.addRange(rng);
|
|
|
|
|
if (!gecko && this.cm.state.focused) {
|
|
|
|
|
sel.collapse(start.node, start.offset);
|
|
|
|
|
if (!rng.collapsed) sel.addRange(rng);
|
|
|
|
|
} else {
|
|
|
|
|
sel.removeAllRanges();
|
|
|
|
|
sel.addRange(rng);
|
|
|
|
|
}
|
|
|
|
|
if (old && sel.anchorNode == null) sel.addRange(old);
|
|
|
|
|
else if (gecko) this.startGracePeriod();
|
|
|
|
|
}
|
|
|
|
|
@ -2964,7 +2973,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
this.div.focus();
|
|
|
|
|
},
|
|
|
|
|
applyComposition: function(composing) {
|
|
|
|
|
if (isReadOnly(this.cm))
|
|
|
|
|
if (this.cm.isReadOnly())
|
|
|
|
|
operation(this.cm, regChange)(this.cm)
|
|
|
|
|
else if (composing.data && composing.data != composing.startData)
|
|
|
|
|
operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
|
|
|
|
|
@ -2976,7 +2985,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
|
|
|
|
|
onKeyPress: function(e) {
|
|
|
|
|
e.preventDefault();
|
|
|
|
|
if (!isReadOnly(this.cm))
|
|
|
|
|
if (!this.cm.isReadOnly())
|
|
|
|
|
operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
@ -3281,7 +3290,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
|
|
|
|
|
// Give beforeSelectionChange handlers a change to influence a
|
|
|
|
|
// selection update.
|
|
|
|
|
function filterSelectionChange(doc, sel) {
|
|
|
|
|
function filterSelectionChange(doc, sel, options) {
|
|
|
|
|
var obj = {
|
|
|
|
|
ranges: sel.ranges,
|
|
|
|
|
update: function(ranges) {
|
|
|
|
|
@ -3289,7 +3298,8 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
for (var i = 0; i < ranges.length; i++)
|
|
|
|
|
this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
|
|
|
|
|
clipPos(doc, ranges[i].head));
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
origin: options && options.origin
|
|
|
|
|
};
|
|
|
|
|
signal(doc, "beforeSelectionChange", doc, obj);
|
|
|
|
|
if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
|
|
|
|
|
@ -3315,7 +3325,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
|
|
|
|
|
function setSelectionNoUndo(doc, sel, options) {
|
|
|
|
|
if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
|
|
|
|
|
sel = filterSelectionChange(doc, sel);
|
|
|
|
|
sel = filterSelectionChange(doc, sel, options);
|
|
|
|
|
|
|
|
|
|
var bias = options && options.bias ||
|
|
|
|
|
(cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
|
|
|
|
|
@ -3377,13 +3387,15 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
|
|
|
|
|
if (oldPos) {
|
|
|
|
|
var near = m.find(dir < 0 ? 1 : -1), diff;
|
|
|
|
|
if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft) near = movePos(doc, near, -dir, line);
|
|
|
|
|
if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
|
|
|
|
|
near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null);
|
|
|
|
|
if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
|
|
|
|
|
return skipAtomicInner(doc, near, pos, dir, mayClear);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var far = m.find(dir < 0 ? -1 : 1);
|
|
|
|
|
if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight) far = movePos(doc, far, dir, line);
|
|
|
|
|
if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
|
|
|
|
|
far = movePos(doc, far, dir, far.line == pos.line ? line : null);
|
|
|
|
|
return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -3430,6 +3442,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
for (var i = 0; i < doc.sel.ranges.length; i++) {
|
|
|
|
|
if (primary === false && i == doc.sel.primIndex) continue;
|
|
|
|
|
var range = doc.sel.ranges[i];
|
|
|
|
|
if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue;
|
|
|
|
|
var collapsed = range.empty();
|
|
|
|
|
if (collapsed || cm.options.showCursorWhenSelecting)
|
|
|
|
|
drawSelectionCursor(cm, range.head, curFragment);
|
|
|
|
|
@ -4260,7 +4273,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
display.scroller.scrollTop = doc.scrollTop;
|
|
|
|
|
}
|
|
|
|
|
if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
|
|
|
|
|
doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - displayWidth(cm), op.scrollLeft));
|
|
|
|
|
doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
|
|
|
|
|
display.scrollbars.setScrollLeft(doc.scrollLeft);
|
|
|
|
|
display.scroller.scrollLeft = doc.scrollLeft;
|
|
|
|
|
alignHorizontally(cm);
|
|
|
|
|
@ -4556,7 +4569,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
return dx * dx + dy * dy > 20 * 20;
|
|
|
|
|
}
|
|
|
|
|
on(d.scroller, "touchstart", function(e) {
|
|
|
|
|
if (!isMouseLikeTouchEvent(e)) {
|
|
|
|
|
if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
|
|
|
|
|
clearTimeout(touchFinished);
|
|
|
|
|
var now = +new Date;
|
|
|
|
|
d.activeTouch = {start: now, moved: false,
|
|
|
|
|
@ -4685,7 +4698,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
// not interfere with, such as a scrollbar or widget.
|
|
|
|
|
function onMouseDown(e) {
|
|
|
|
|
var cm = this, display = cm.display;
|
|
|
|
|
if (display.activeTouch && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
|
|
|
|
|
if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return;
|
|
|
|
|
display.shift = e.shiftKey;
|
|
|
|
|
|
|
|
|
|
if (eventInWidget(display, e)) {
|
|
|
|
|
@ -4741,7 +4754,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
|
|
|
|
|
if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
|
|
|
|
|
if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
|
|
|
|
|
type == "single" && (contained = sel.contains(start)) > -1 &&
|
|
|
|
|
(cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
|
|
|
|
|
(cmp(contained.to(), start) > 0 || start.xRel < 0))
|
|
|
|
|
@ -4965,7 +4978,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
e_preventDefault(e);
|
|
|
|
|
if (ie) lastDrop = +new Date;
|
|
|
|
|
var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
|
|
|
|
|
if (!pos || isReadOnly(cm)) return;
|
|
|
|
|
if (!pos || cm.isReadOnly()) return;
|
|
|
|
|
// Might be a file drop, in which case we simply extract the text
|
|
|
|
|
// and insert it.
|
|
|
|
|
if (files && files.length && window.FileReader && window.File) {
|
|
|
|
|
@ -5204,7 +5217,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
cm.display.input.ensurePolled();
|
|
|
|
|
var prevShift = cm.display.shift, done = false;
|
|
|
|
|
try {
|
|
|
|
|
if (isReadOnly(cm)) cm.state.suppressEdits = true;
|
|
|
|
|
if (cm.isReadOnly()) cm.state.suppressEdits = true;
|
|
|
|
|
if (dropShift) cm.display.shift = false;
|
|
|
|
|
done = bound(cm) != Pass;
|
|
|
|
|
} finally {
|
|
|
|
|
@ -5937,10 +5950,9 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
function findPosH(doc, pos, dir, unit, visually) {
|
|
|
|
|
var line = pos.line, ch = pos.ch, origDir = dir;
|
|
|
|
|
var lineObj = getLine(doc, line);
|
|
|
|
|
var possible = true;
|
|
|
|
|
function findNextLine() {
|
|
|
|
|
var l = line + dir;
|
|
|
|
|
if (l < doc.first || l >= doc.first + doc.size) return (possible = false);
|
|
|
|
|
if (l < doc.first || l >= doc.first + doc.size) return false
|
|
|
|
|
line = l;
|
|
|
|
|
return lineObj = getLine(doc, l);
|
|
|
|
|
}
|
|
|
|
|
@ -5950,14 +5962,16 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
if (!boundToLine && findNextLine()) {
|
|
|
|
|
if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
|
|
|
|
|
else ch = dir < 0 ? lineObj.text.length : 0;
|
|
|
|
|
} else return (possible = false);
|
|
|
|
|
} else return false
|
|
|
|
|
} else ch = next;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (unit == "char") moveOnce();
|
|
|
|
|
else if (unit == "column") moveOnce(true);
|
|
|
|
|
else if (unit == "word" || unit == "group") {
|
|
|
|
|
if (unit == "char") {
|
|
|
|
|
moveOnce()
|
|
|
|
|
} else if (unit == "column") {
|
|
|
|
|
moveOnce(true)
|
|
|
|
|
} else if (unit == "word" || unit == "group") {
|
|
|
|
|
var sawType = null, group = unit == "group";
|
|
|
|
|
var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
|
|
|
|
|
for (var first = true;; first = false) {
|
|
|
|
|
@ -5978,7 +5992,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
|
|
|
|
|
if (!possible) result.hitSide = true;
|
|
|
|
|
if (!cmp(pos, result)) result.hitSide = true;
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -6365,6 +6379,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
signal(this, "overwriteToggle", this, this.state.overwrite);
|
|
|
|
|
},
|
|
|
|
|
hasFocus: function() { return this.display.input.getField() == activeElt(); },
|
|
|
|
|
isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); },
|
|
|
|
|
|
|
|
|
|
scrollTo: methodOp(function(x, y) {
|
|
|
|
|
if (x != null || y != null) resolveScrollToPos(this);
|
|
|
|
|
@ -8211,7 +8226,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
if (nextChange == pos) { // Update current marker set
|
|
|
|
|
spanStyle = spanEndStyle = spanStartStyle = title = css = "";
|
|
|
|
|
collapsed = null; nextChange = Infinity;
|
|
|
|
|
var foundBookmarks = [];
|
|
|
|
|
var foundBookmarks = [], endStyles
|
|
|
|
|
for (var j = 0; j < spans.length; ++j) {
|
|
|
|
|
var sp = spans[j], m = sp.marker;
|
|
|
|
|
if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
|
|
|
|
|
@ -8224,7 +8239,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
if (m.className) spanStyle += " " + m.className;
|
|
|
|
|
if (m.css) css = (css ? css + ";" : "") + m.css;
|
|
|
|
|
if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
|
|
|
|
|
if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
|
|
|
|
|
if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
|
|
|
|
|
if (m.title && !title) title = m.title;
|
|
|
|
|
if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
|
|
|
|
|
collapsed = sp;
|
|
|
|
|
@ -8232,14 +8247,17 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
nextChange = sp.from;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
|
|
|
|
|
if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
|
|
|
|
|
|
|
|
|
|
if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
|
|
|
|
|
buildCollapsedSpan(builder, 0, foundBookmarks[j]);
|
|
|
|
|
if (collapsed && (collapsed.from || 0) == pos) {
|
|
|
|
|
buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
|
|
|
|
|
collapsed.marker, collapsed.from == null);
|
|
|
|
|
if (collapsed.to == null) return;
|
|
|
|
|
if (collapsed.to == pos) collapsed = false;
|
|
|
|
|
}
|
|
|
|
|
if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
|
|
|
|
|
buildCollapsedSpan(builder, 0, foundBookmarks[j]);
|
|
|
|
|
}
|
|
|
|
|
if (pos >= len) break;
|
|
|
|
|
|
|
|
|
|
@ -8579,10 +8597,11 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
|
|
|
|
|
}),
|
|
|
|
|
extendSelections: docMethodOp(function(heads, options) {
|
|
|
|
|
extendSelections(this, clipPosArray(this, heads, options));
|
|
|
|
|
extendSelections(this, clipPosArray(this, heads), options);
|
|
|
|
|
}),
|
|
|
|
|
extendSelectionsBy: docMethodOp(function(f, options) {
|
|
|
|
|
extendSelections(this, map(this.sel.ranges, f), options);
|
|
|
|
|
var heads = map(this.sel.ranges, f);
|
|
|
|
|
extendSelections(this, clipPosArray(this, heads), options);
|
|
|
|
|
}),
|
|
|
|
|
setSelections: docMethodOp(function(ranges, primary, options) {
|
|
|
|
|
if (!ranges.length) return;
|
|
|
|
|
@ -8735,9 +8754,9 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
var spans = line.markedSpans;
|
|
|
|
|
if (spans) for (var i = 0; i < spans.length; i++) {
|
|
|
|
|
var span = spans[i];
|
|
|
|
|
if (!(lineNo == from.line && from.ch > span.to ||
|
|
|
|
|
span.from == null && lineNo != from.line||
|
|
|
|
|
lineNo == to.line && span.from > to.ch) &&
|
|
|
|
|
if (!(span.to != null && lineNo == from.line && from.ch > span.to ||
|
|
|
|
|
span.from == null && lineNo != from.line ||
|
|
|
|
|
span.from != null && lineNo == to.line && span.from > to.ch) &&
|
|
|
|
|
(!filter || filter(span.marker)))
|
|
|
|
|
found.push(span.marker.parent || span.marker);
|
|
|
|
|
}
|
|
|
|
|
@ -9999,7 +10018,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
|
|
|
|
|
|
|
|
|
|
// THE END
|
|
|
|
|
|
|
|
|
|
CodeMirror.version = "5.9.1";
|
|
|
|
|
CodeMirror.version = "5.12.1";
|
|
|
|
|
|
|
|
|
|
return CodeMirror;
|
|
|
|
|
});
|
|
|
|
|
@ -10152,8 +10171,8 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
|
|
|
|
|
|
|
|
|
|
CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
|
|
|
|
|
var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
|
|
|
|
|
var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
|
|
|
|
|
var htmlMode = CodeMirror.getMode(cmCfg, "text/html");
|
|
|
|
|
var htmlModeMissing = htmlMode.name == "null"
|
|
|
|
|
|
|
|
|
|
function getMode(name) {
|
|
|
|
|
if (CodeMirror.findModeByName) {
|
|
|
|
|
@ -10194,8 +10213,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
if (modeCfg.tokenTypeOverrides === undefined)
|
|
|
|
|
modeCfg.tokenTypeOverrides = {};
|
|
|
|
|
|
|
|
|
|
var codeDepth = 0;
|
|
|
|
|
|
|
|
|
|
var tokenTypes = {
|
|
|
|
|
header: "header",
|
|
|
|
|
code: "comment",
|
|
|
|
|
@ -10260,7 +10277,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
state.quote = 0;
|
|
|
|
|
// Reset state.indentedCode
|
|
|
|
|
state.indentedCode = false;
|
|
|
|
|
if (!htmlFound && state.f == htmlBlock) {
|
|
|
|
|
if (htmlModeMissing && state.f == htmlBlock) {
|
|
|
|
|
state.f = inlineNormal;
|
|
|
|
|
state.block = blockNormal;
|
|
|
|
|
}
|
|
|
|
|
@ -10290,10 +10307,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
state.list = null;
|
|
|
|
|
} else if (state.indentation > 0) {
|
|
|
|
|
state.list = null;
|
|
|
|
|
state.listDepth = Math.floor(state.indentation / 4);
|
|
|
|
|
} else { // No longer a list
|
|
|
|
|
state.list = false;
|
|
|
|
|
state.listDepth = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -10340,7 +10355,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
}
|
|
|
|
|
state.indentation = stream.column() + stream.current().length;
|
|
|
|
|
state.list = true;
|
|
|
|
|
state.listDepth++;
|
|
|
|
|
|
|
|
|
|
// While this list item's marker's indentation
|
|
|
|
|
// is less than the deepest list item's content's indentation,
|
|
|
|
|
// pop the deepest list item indentation off the stack.
|
|
|
|
|
while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) {
|
|
|
|
|
state.listStack.pop();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Add this list item's content's indentation to the stack
|
|
|
|
|
state.listStack.push(state.indentation);
|
|
|
|
|
|
|
|
|
|
if (modeCfg.taskLists && stream.match(taskListRE, false)) {
|
|
|
|
|
state.taskList = true;
|
|
|
|
|
}
|
|
|
|
|
@ -10354,7 +10379,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
if (state.localMode) state.localState = state.localMode.startState();
|
|
|
|
|
state.f = state.block = local;
|
|
|
|
|
if (modeCfg.highlightFormatting) state.formatting = "code-block";
|
|
|
|
|
state.code = true;
|
|
|
|
|
state.code = -1
|
|
|
|
|
return getType(state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -10363,18 +10388,21 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
|
|
|
|
|
function htmlBlock(stream, state) {
|
|
|
|
|
var style = htmlMode.token(stream, state.htmlState);
|
|
|
|
|
if ((htmlFound && state.htmlState.tagStart === null &&
|
|
|
|
|
(!state.htmlState.context && state.htmlState.tokenize.isInText)) ||
|
|
|
|
|
(state.md_inside && stream.current().indexOf(">") > -1)) {
|
|
|
|
|
state.f = inlineNormal;
|
|
|
|
|
state.block = blockNormal;
|
|
|
|
|
state.htmlState = null;
|
|
|
|
|
if (!htmlModeMissing) {
|
|
|
|
|
var inner = CodeMirror.innerMode(htmlMode, state.htmlState)
|
|
|
|
|
if ((inner.mode.name == "xml" && inner.state.tagStart === null &&
|
|
|
|
|
(!inner.state.context && inner.state.tokenize.isInText)) ||
|
|
|
|
|
(state.md_inside && stream.current().indexOf(">") > -1)) {
|
|
|
|
|
state.f = inlineNormal;
|
|
|
|
|
state.block = blockNormal;
|
|
|
|
|
state.htmlState = null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return style;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function local(stream, state) {
|
|
|
|
|
if (stream.sol() && state.fencedChars && stream.match(state.fencedChars, false)) {
|
|
|
|
|
if (state.fencedChars && stream.match(state.fencedChars, false)) {
|
|
|
|
|
state.localMode = state.localState = null;
|
|
|
|
|
state.f = state.block = leavingLocal;
|
|
|
|
|
return null;
|
|
|
|
|
@ -10392,9 +10420,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
state.f = inlineNormal;
|
|
|
|
|
state.fencedChars = null;
|
|
|
|
|
if (modeCfg.highlightFormatting) state.formatting = "code-block";
|
|
|
|
|
state.code = true;
|
|
|
|
|
state.code = 1
|
|
|
|
|
var returnType = getType(state);
|
|
|
|
|
state.code = false;
|
|
|
|
|
state.code = 0
|
|
|
|
|
return returnType;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -10459,7 +10487,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state.list !== false) {
|
|
|
|
|
var listMod = (state.listDepth - 1) % 3;
|
|
|
|
|
var listMod = (state.listStack.length - 1) % 3;
|
|
|
|
|
if (!listMod) {
|
|
|
|
|
styles.push(tokenTypes.list1);
|
|
|
|
|
} else if (listMod === 1) {
|
|
|
|
|
@ -10517,15 +10545,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
|
|
|
|
|
var ch = stream.next();
|
|
|
|
|
|
|
|
|
|
if (ch === '\\') {
|
|
|
|
|
stream.next();
|
|
|
|
|
if (modeCfg.highlightFormatting) {
|
|
|
|
|
var type = getType(state);
|
|
|
|
|
var formattingEscape = tokenTypes.formatting + "-escape";
|
|
|
|
|
return type ? type + " " + formattingEscape : formattingEscape;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Matches link titles present on next line
|
|
|
|
|
if (state.linkTitle) {
|
|
|
|
|
state.linkTitle = false;
|
|
|
|
|
@ -10544,26 +10563,32 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
if (ch === '`') {
|
|
|
|
|
var previousFormatting = state.formatting;
|
|
|
|
|
if (modeCfg.highlightFormatting) state.formatting = "code";
|
|
|
|
|
var t = getType(state);
|
|
|
|
|
var before = stream.pos;
|
|
|
|
|
stream.eatWhile('`');
|
|
|
|
|
var difference = 1 + stream.pos - before;
|
|
|
|
|
if (!state.code) {
|
|
|
|
|
codeDepth = difference;
|
|
|
|
|
state.code = true;
|
|
|
|
|
return getType(state);
|
|
|
|
|
var count = stream.current().length
|
|
|
|
|
if (state.code == 0) {
|
|
|
|
|
state.code = count
|
|
|
|
|
return getType(state)
|
|
|
|
|
} else if (count == state.code) { // Must be exact
|
|
|
|
|
var t = getType(state)
|
|
|
|
|
state.code = 0
|
|
|
|
|
return t
|
|
|
|
|
} else {
|
|
|
|
|
if (difference === codeDepth) { // Must be exact
|
|
|
|
|
state.code = false;
|
|
|
|
|
return t;
|
|
|
|
|
}
|
|
|
|
|
state.formatting = previousFormatting;
|
|
|
|
|
return getType(state);
|
|
|
|
|
state.formatting = previousFormatting
|
|
|
|
|
return getType(state)
|
|
|
|
|
}
|
|
|
|
|
} else if (state.code) {
|
|
|
|
|
return getType(state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ch === '\\') {
|
|
|
|
|
stream.next();
|
|
|
|
|
if (modeCfg.highlightFormatting) {
|
|
|
|
|
var type = getType(state);
|
|
|
|
|
var formattingEscape = tokenTypes.formatting + "-escape";
|
|
|
|
|
return type ? type + " " + formattingEscape : formattingEscape;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
|
|
|
|
|
stream.match(/\[[^\]]*\]/);
|
|
|
|
|
state.inline = state.f = linkHref;
|
|
|
|
|
@ -10759,7 +10784,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function footnoteLink(stream, state) {
|
|
|
|
|
if (stream.match(/^[^\]]*\]:/, false)) {
|
|
|
|
|
if (stream.match(/^([^\]\\]|\\.)*\]:/, false)) {
|
|
|
|
|
state.f = footnoteLinkInside;
|
|
|
|
|
stream.next(); // Consume [
|
|
|
|
|
if (modeCfg.highlightFormatting) state.formatting = "link";
|
|
|
|
|
@ -10778,7 +10803,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
return returnType;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
stream.match(/^[^\]]+/, true);
|
|
|
|
|
stream.match(/^([^\]\\]|\\.)+/, true);
|
|
|
|
|
|
|
|
|
|
return tokenTypes.linkText;
|
|
|
|
|
}
|
|
|
|
|
@ -10831,13 +10856,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
linkText: false,
|
|
|
|
|
linkHref: false,
|
|
|
|
|
linkTitle: false,
|
|
|
|
|
code: 0,
|
|
|
|
|
em: false,
|
|
|
|
|
strong: false,
|
|
|
|
|
header: 0,
|
|
|
|
|
hr: false,
|
|
|
|
|
taskList: false,
|
|
|
|
|
list: false,
|
|
|
|
|
listDepth: 0,
|
|
|
|
|
listStack: [],
|
|
|
|
|
quote: 0,
|
|
|
|
|
trailingSpace: 0,
|
|
|
|
|
trailingSpaceNewLine: false,
|
|
|
|
|
@ -10872,7 +10898,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
hr: s.hr,
|
|
|
|
|
taskList: s.taskList,
|
|
|
|
|
list: s.list,
|
|
|
|
|
listDepth: s.listDepth,
|
|
|
|
|
listStack: s.listStack.slice(0),
|
|
|
|
|
quote: s.quote,
|
|
|
|
|
indentedCode: s.indentedCode,
|
|
|
|
|
trailingSpace: s.trailingSpace,
|
|
|
|
|
@ -10912,11 +10938,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
|
|
|
|
|
|
|
|
|
|
state.f = state.block;
|
|
|
|
|
var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, ' ').length;
|
|
|
|
|
var difference = Math.floor((indentation - state.indentation) / 4) * 4;
|
|
|
|
|
if (difference > 4) difference = 4;
|
|
|
|
|
var adjustedIndentation = state.indentation + difference;
|
|
|
|
|
state.indentationDiff = adjustedIndentation - state.indentation;
|
|
|
|
|
state.indentation = adjustedIndentation;
|
|
|
|
|
state.indentationDiff = Math.min(indentation - state.indentation, 4);
|
|
|
|
|
state.indentation = state.indentation + state.indentationDiff;
|
|
|
|
|
if (indentation > 0) return null;
|
|
|
|
|
}
|
|
|
|
|
return state.f(stream, state);
|
|
|
|
|
@ -10965,13 +10988,15 @@ CodeMirror.defineMIME("text/x-markdown", "markdown");
|
|
|
|
|
{name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
|
|
|
|
|
{name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
|
|
|
|
|
{name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
|
|
|
|
|
{name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
|
|
|
|
|
{name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
|
|
|
|
|
{name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
|
|
|
|
|
{name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
|
|
|
|
|
{name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
|
|
|
|
|
{name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
|
|
|
|
|
{name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
|
|
|
|
|
{name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
|
|
|
|
|
{name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
|
|
|
|
|
{name: "Crystal", mime: "text/x-crystal", mode: "crystal", ext: ["cr"]},
|
|
|
|
|
{name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
|
|
|
|
|
{name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
|
|
|
|
|
{name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
|
|
|
|
|
@ -10983,12 +11008,14 @@ CodeMirror.defineMIME("text/x-markdown", "markdown");
|
|
|
|
|
{name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
|
|
|
|
|
{name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
|
|
|
|
|
{name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
|
|
|
|
|
{name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
|
|
|
|
|
{name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
|
|
|
|
|
{name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
|
|
|
|
|
{name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
|
|
|
|
|
{name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
|
|
|
|
|
{name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
|
|
|
|
|
{name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
|
|
|
|
|
{name: "FCL", mime: "text/x-fcl", mode: "fcl"},
|
|
|
|
|
{name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
|
|
|
|
|
{name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
|
|
|
|
|
{name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
|
|
|
|
|
@ -10996,9 +11023,10 @@ CodeMirror.defineMIME("text/x-markdown", "markdown");
|
|
|
|
|
{name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
|
|
|
|
|
{name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
|
|
|
|
|
{name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
|
|
|
|
|
{name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]},
|
|
|
|
|
{name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"]},
|
|
|
|
|
{name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
|
|
|
|
|
{name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
|
|
|
|
|
{name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
|
|
|
|
|
{name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
|
|
|
|
|
{name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
|
|
|
|
|
{name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
|
|
|
|
|
@ -11012,6 +11040,7 @@ CodeMirror.defineMIME("text/x-markdown", "markdown");
|
|
|
|
|
mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
|
|
|
|
|
{name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
|
|
|
|
|
{name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
|
|
|
|
|
{name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
|
|
|
|
|
{name: "Jinja2", mime: "null", mode: "jinja2"},
|
|
|
|
|
{name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
|
|
|
|
|
{name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
|
|
|
|
|
@ -11023,7 +11052,7 @@ CodeMirror.defineMIME("text/x-markdown", "markdown");
|
|
|
|
|
{name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
|
|
|
|
|
{name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
|
|
|
|
|
{name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
|
|
|
|
|
{name: "MUMPS", mime: "text/x-mumps", mode: "mumps"},
|
|
|
|
|
{name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
|
|
|
|
|
{name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
|
|
|
|
|
{name: "MySQL", mime: "text/x-mysql", mode: "sql"},
|
|
|
|
|
{name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
|
|
|
|
|
@ -11041,6 +11070,7 @@ CodeMirror.defineMIME("text/x-markdown", "markdown");
|
|
|
|
|
{name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
|
|
|
|
|
{name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
|
|
|
|
|
{name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
|
|
|
|
|
{name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
|
|
|
|
|
{name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
|
|
|
|
|
{name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
|
|
|
|
|
{name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
|
|
|
|
|
@ -11066,7 +11096,6 @@ CodeMirror.defineMIME("text/x-markdown", "markdown");
|
|
|
|
|
{name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
|
|
|
|
|
{name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
|
|
|
|
|
{name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
|
|
|
|
|
{name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
|
|
|
|
|
{name: "sTeX", mime: "text/x-stex", mode: "stex"},
|
|
|
|
|
{name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
|
|
|
|
|
{name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
|
|
|
|
|
@ -11076,7 +11105,7 @@ CodeMirror.defineMIME("text/x-markdown", "markdown");
|
|
|
|
|
{name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
|
|
|
|
|
{name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
|
|
|
|
|
{name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
|
|
|
|
|
{name: "troff", mime: "troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
|
|
|
|
|
{name: "troff", mime: "text/troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
|
|
|
|
|
{name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
|
|
|
|
|
{name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
|
|
|
|
|
{name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
|
|
|
|
|
@ -11154,54 +11183,56 @@ CodeMirror.defineMIME("text/x-markdown", "markdown");
|
|
|
|
|
})(function(CodeMirror) {
|
|
|
|
|
"use strict";
|
|
|
|
|
|
|
|
|
|
CodeMirror.defineMode("xml", function(config, parserConfig) {
|
|
|
|
|
var indentUnit = config.indentUnit;
|
|
|
|
|
var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
|
|
|
|
|
var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag;
|
|
|
|
|
if (multilineTagIndentPastTag == null) multilineTagIndentPastTag = true;
|
|
|
|
|
|
|
|
|
|
var Kludges = parserConfig.htmlMode ? {
|
|
|
|
|
autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
|
|
|
|
|
'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
|
|
|
|
|
'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
|
|
|
|
|
'track': true, 'wbr': true, 'menuitem': true},
|
|
|
|
|
implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
|
|
|
|
|
'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
|
|
|
|
|
'th': true, 'tr': true},
|
|
|
|
|
contextGrabbers: {
|
|
|
|
|
'dd': {'dd': true, 'dt': true},
|
|
|
|
|
'dt': {'dd': true, 'dt': true},
|
|
|
|
|
'li': {'li': true},
|
|
|
|
|
'option': {'option': true, 'optgroup': true},
|
|
|
|
|
'optgroup': {'optgroup': true},
|
|
|
|
|
'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
|
|
|
|
|
'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
|
|
|
|
|
'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
|
|
|
|
|
'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
|
|
|
|
|
'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
|
|
|
|
|
'rp': {'rp': true, 'rt': true},
|
|
|
|
|
'rt': {'rp': true, 'rt': true},
|
|
|
|
|
'tbody': {'tbody': true, 'tfoot': true},
|
|
|
|
|
'td': {'td': true, 'th': true},
|
|
|
|
|
'tfoot': {'tbody': true},
|
|
|
|
|
'th': {'td': true, 'th': true},
|
|
|
|
|
'thead': {'tbody': true, 'tfoot': true},
|
|
|
|
|
'tr': {'tr': true}
|
|
|
|
|
},
|
|
|
|
|
doNotIndent: {"pre": true},
|
|
|
|
|
allowUnquoted: true,
|
|
|
|
|
allowMissing: true,
|
|
|
|
|
caseFold: true
|
|
|
|
|
} : {
|
|
|
|
|
autoSelfClosers: {},
|
|
|
|
|
implicitlyClosed: {},
|
|
|
|
|
contextGrabbers: {},
|
|
|
|
|
doNotIndent: {},
|
|
|
|
|
allowUnquoted: false,
|
|
|
|
|
allowMissing: false,
|
|
|
|
|
caseFold: false
|
|
|
|
|
};
|
|
|
|
|
var alignCDATA = parserConfig.alignCDATA;
|
|
|
|
|
var htmlConfig = {
|
|
|
|
|
autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
|
|
|
|
|
'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
|
|
|
|
|
'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
|
|
|
|
|
'track': true, 'wbr': true, 'menuitem': true},
|
|
|
|
|
implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
|
|
|
|
|
'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
|
|
|
|
|
'th': true, 'tr': true},
|
|
|
|
|
contextGrabbers: {
|
|
|
|
|
'dd': {'dd': true, 'dt': true},
|
|
|
|
|
'dt': {'dd': true, 'dt': true},
|
|
|
|
|
'li': {'li': true},
|
|
|
|
|
'option': {'option': true, 'optgroup': true},
|
|
|
|
|
'optgroup': {'optgroup': true},
|
|
|
|
|
'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
|
|
|
|
|
'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
|
|
|
|
|
'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
|
|
|
|
|
'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
|
|
|
|
|
'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
|
|
|
|
|
'rp': {'rp': true, 'rt': true},
|
|
|
|
|
'rt': {'rp': true, 'rt': true},
|
|
|
|
|
'tbody': {'tbody': true, 'tfoot': true},
|
|
|
|
|
'td': {'td': true, 'th': true},
|
|
|
|
|
'tfoot': {'tbody': true},
|
|
|
|
|
'th': {'td': true, 'th': true},
|
|
|
|
|
'thead': {'tbody': true, 'tfoot': true},
|
|
|
|
|
'tr': {'tr': true}
|
|
|
|
|
},
|
|
|
|
|
doNotIndent: {"pre": true},
|
|
|
|
|
allowUnquoted: true,
|
|
|
|
|
allowMissing: true,
|
|
|
|
|
caseFold: true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var xmlConfig = {
|
|
|
|
|
autoSelfClosers: {},
|
|
|
|
|
implicitlyClosed: {},
|
|
|
|
|
contextGrabbers: {},
|
|
|
|
|
doNotIndent: {},
|
|
|
|
|
allowUnquoted: false,
|
|
|
|
|
allowMissing: false,
|
|
|
|
|
caseFold: false
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CodeMirror.defineMode("xml", function(editorConf, config_) {
|
|
|
|
|
var indentUnit = editorConf.indentUnit
|
|
|
|
|
var config = {}
|
|
|
|
|
var defaults = config_.htmlMode ? htmlConfig : xmlConfig
|
|
|
|
|
for (var prop in defaults) config[prop] = defaults[prop]
|
|
|
|
|
for (var prop in config_) config[prop] = config_[prop]
|
|
|
|
|
|
|
|
|
|
// Return variables for tokenizers
|
|
|
|
|
var type, setStyle;
|
|
|
|
|
@ -11331,7 +11362,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
|
|
|
|
|
this.tagName = tagName;
|
|
|
|
|
this.indent = state.indented;
|
|
|
|
|
this.startOfLine = startOfLine;
|
|
|
|
|
if (Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
|
|
|
|
|
if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
|
|
|
|
|
this.noIndent = true;
|
|
|
|
|
}
|
|
|
|
|
function popContext(state) {
|
|
|
|
|
@ -11344,8 +11375,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
parentTagName = state.context.tagName;
|
|
|
|
|
if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
|
|
|
|
|
!Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
|
|
|
|
|
if (!config.contextGrabbers.hasOwnProperty(parentTagName) ||
|
|
|
|
|
!config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
popContext(state);
|
|
|
|
|
@ -11376,9 +11407,9 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
|
|
|
|
|
if (type == "word") {
|
|
|
|
|
var tagName = stream.current();
|
|
|
|
|
if (state.context && state.context.tagName != tagName &&
|
|
|
|
|
Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName))
|
|
|
|
|
config.implicitlyClosed.hasOwnProperty(state.context.tagName))
|
|
|
|
|
popContext(state);
|
|
|
|
|
if (state.context && state.context.tagName == tagName) {
|
|
|
|
|
if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) {
|
|
|
|
|
setStyle = "tag";
|
|
|
|
|
return closeState;
|
|
|
|
|
} else {
|
|
|
|
|
@ -11412,7 +11443,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
|
|
|
|
|
var tagName = state.tagName, tagStart = state.tagStart;
|
|
|
|
|
state.tagName = state.tagStart = null;
|
|
|
|
|
if (type == "selfcloseTag" ||
|
|
|
|
|
Kludges.autoSelfClosers.hasOwnProperty(tagName)) {
|
|
|
|
|
config.autoSelfClosers.hasOwnProperty(tagName)) {
|
|
|
|
|
maybePopContext(state, tagName);
|
|
|
|
|
} else {
|
|
|
|
|
maybePopContext(state, tagName);
|
|
|
|
|
@ -11425,12 +11456,12 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
|
|
|
|
|
}
|
|
|
|
|
function attrEqState(type, stream, state) {
|
|
|
|
|
if (type == "equals") return attrValueState;
|
|
|
|
|
if (!Kludges.allowMissing) setStyle = "error";
|
|
|
|
|
if (!config.allowMissing) setStyle = "error";
|
|
|
|
|
return attrState(type, stream, state);
|
|
|
|
|
}
|
|
|
|
|
function attrValueState(type, stream, state) {
|
|
|
|
|
if (type == "string") return attrContinuedState;
|
|
|
|
|
if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return attrState;}
|
|
|
|
|
if (type == "word" && config.allowUnquoted) {setStyle = "string"; return attrState;}
|
|
|
|
|
setStyle = "error";
|
|
|
|
|
return attrState(type, stream, state);
|
|
|
|
|
}
|
|
|
|
|
@ -11440,12 +11471,14 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
startState: function() {
|
|
|
|
|
return {tokenize: inText,
|
|
|
|
|
state: baseState,
|
|
|
|
|
indented: 0,
|
|
|
|
|
tagName: null, tagStart: null,
|
|
|
|
|
context: null};
|
|
|
|
|
startState: function(baseIndent) {
|
|
|
|
|
var state = {tokenize: inText,
|
|
|
|
|
state: baseState,
|
|
|
|
|
indented: baseIndent || 0,
|
|
|
|
|
tagName: null, tagStart: null,
|
|
|
|
|
context: null}
|
|
|
|
|
if (baseIndent != null) state.baseIndent = baseIndent
|
|
|
|
|
return state
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
token: function(stream, state) {
|
|
|
|
|
@ -11478,19 +11511,19 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
|
|
|
|
|
return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
|
|
|
|
|
// Indent the starts of attribute names.
|
|
|
|
|
if (state.tagName) {
|
|
|
|
|
if (multilineTagIndentPastTag)
|
|
|
|
|
if (config.multilineTagIndentPastTag !== false)
|
|
|
|
|
return state.tagStart + state.tagName.length + 2;
|
|
|
|
|
else
|
|
|
|
|
return state.tagStart + indentUnit * multilineTagIndentFactor;
|
|
|
|
|
return state.tagStart + indentUnit * (config.multilineTagIndentFactor || 1);
|
|
|
|
|
}
|
|
|
|
|
if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
|
|
|
|
|
if (config.alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
|
|
|
|
|
var tagAfter = textAfter && /^<(\/)?([\w_:\.-]*)/.exec(textAfter);
|
|
|
|
|
if (tagAfter && tagAfter[1]) { // Closing tag spotted
|
|
|
|
|
while (context) {
|
|
|
|
|
if (context.tagName == tagAfter[2]) {
|
|
|
|
|
context = context.prev;
|
|
|
|
|
break;
|
|
|
|
|
} else if (Kludges.implicitlyClosed.hasOwnProperty(context.tagName)) {
|
|
|
|
|
} else if (config.implicitlyClosed.hasOwnProperty(context.tagName)) {
|
|
|
|
|
context = context.prev;
|
|
|
|
|
} else {
|
|
|
|
|
break;
|
|
|
|
|
@ -11498,25 +11531,30 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
|
|
|
|
|
}
|
|
|
|
|
} else if (tagAfter) { // Opening tag spotted
|
|
|
|
|
while (context) {
|
|
|
|
|
var grabbers = Kludges.contextGrabbers[context.tagName];
|
|
|
|
|
var grabbers = config.contextGrabbers[context.tagName];
|
|
|
|
|
if (grabbers && grabbers.hasOwnProperty(tagAfter[2]))
|
|
|
|
|
context = context.prev;
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (context && !context.startOfLine)
|
|
|
|
|
while (context && context.prev && !context.startOfLine)
|
|
|
|
|
context = context.prev;
|
|
|
|
|
if (context) return context.indent + indentUnit;
|
|
|
|
|
else return 0;
|
|
|
|
|
else return state.baseIndent || 0;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
electricInput: /<\/[\s\w:]+>$/,
|
|
|
|
|
blockCommentStart: "<!--",
|
|
|
|
|
blockCommentEnd: "-->",
|
|
|
|
|
|
|
|
|
|
configuration: parserConfig.htmlMode ? "html" : "xml",
|
|
|
|
|
helperType: parserConfig.htmlMode ? "html" : "xml"
|
|
|
|
|
configuration: config.htmlMode ? "html" : "xml",
|
|
|
|
|
helperType: config.htmlMode ? "html" : "xml",
|
|
|
|
|
|
|
|
|
|
skipAttribute: function(state) {
|
|
|
|
|
if (state.state == attrValueState)
|
|
|
|
|
state.state = attrState
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
@ -14868,6 +14906,5 @@ SimpleMDE.prototype.toTextArea = function() {
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
module.exports = SimpleMDE;
|
|
|
|
|
|
|
|
|
|
},{"./codemirror/tablist":13,"codemirror":7,"codemirror/addon/display/fullscreen.js":3,"codemirror/addon/display/placeholder.js":4,"codemirror/addon/edit/continuelist.js":5,"codemirror/addon/mode/overlay.js":6,"codemirror/mode/gfm/gfm.js":8,"codemirror/mode/markdown/markdown.js":9,"codemirror/mode/xml/xml.js":11,"marked":12,"spell-checker":1}]},{},[14])(14)
|
|
|
|
|
});
|
Wes Cossick
8 years ago