Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Admin panel - Update Codemirror to the version 5.65.7
KrzysztofPajak8a6334df9c40
diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/codemirror.css b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/codemirror.cssindex c7a8ae704..f4d5718a7 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/codemirror.css+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/codemirror.css@@ -13,7 +13,8 @@.CodeMirror-lines {padding: 4px 0; /* Vertical padding around content */}-.CodeMirror pre {+.CodeMirror pre.CodeMirror-line,+.CodeMirror pre.CodeMirror-line-like {padding: 0 4px; /* Horizontal padding of content */}@@ -59,20 +60,13 @@.cm-fat-cursor div.CodeMirror-cursors {z-index: 1;}-.cm-fat-cursor-mark {- background-color: rgba(20, 255, 20, 0.5);- -webkit-animation: blink 1.06s steps(1) infinite;- -moz-animation: blink 1.06s steps(1) infinite;- animation: blink 1.06s steps(1) infinite;-}-.cm-animate-fat-cursor {- width: auto;- border: 0;- -webkit-animation: blink 1.06s steps(1) infinite;- -moz-animation: blink 1.06s steps(1) infinite;- animation: blink 1.06s steps(1) infinite;- background-color: #7e7;-}+.cm-fat-cursor .CodeMirror-line::selection,+.cm-fat-cursor .CodeMirror-line > span::selection,+.cm-fat-cursor .CodeMirror-line > span > span::selection { background: transparent; }+.cm-fat-cursor .CodeMirror-line::-moz-selection,+.cm-fat-cursor .CodeMirror-line > span::-moz-selection,+.cm-fat-cursor .CodeMirror-line > span > span::-moz-selection { background: transparent; }+.cm-fat-cursor { caret-color: transparent; }@-moz-keyframes blink {0% {}50% { background-color: transparent; }@@ -96,7 +90,7 @@.CodeMirror-rulers {position: absolute;- left: 0; right: 0; top: -50px; bottom: -20px;+ left: 0; right: 0; top: -50px; bottom: 0;overflow: hidden;}.CodeMirror-ruler {@@ -163,17 +157,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}.CodeMirror-scroll {overflow: scroll !important; /* Things will break if this is overridden */- /* 30px is the magic margin used to hide the element's real scrollbars */+ /* 50px is the magic margin used to hide the element's real scrollbars *//* See overflow: hidden in .CodeMirror */- margin-bottom: -30px; margin-right: -30px;- padding-bottom: 30px;+ margin-bottom: -50px; margin-right: -50px;+ padding-bottom: 50px;height: 100%;outline: none; /* Prevent dragging from highlighting the element */position: relative;+ z-index: 0;}.CodeMirror-sizer {position: relative;- border-right: 30px solid transparent;+ border-right: 50px solid transparent;}/* The fake, visible scrollbars. Used to force redraw during scrolling@@ -183,6 +178,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}position: absolute;z-index: 6;display: none;+ outline: none;}.CodeMirror-vscrollbar {right: 0; top: 0;@@ -211,7 +207,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}height: 100%;display: inline-block;vertical-align: top;- margin-bottom: -30px;+ margin-bottom: -50px;}.CodeMirror-gutter-wrapper {position: absolute;@@ -236,7 +232,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}cursor: text;min-height: 1px; /* prevents collapsing before first draw */}-.CodeMirror pre {+.CodeMirror pre.CodeMirror-line,+.CodeMirror pre.CodeMirror-line-like {/* Reset some styles that the rest of the page might have set */-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;border-width: 0;@@ -255,7 +252,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}-webkit-font-variant-ligatures: contextual;font-variant-ligatures: contextual;}-.CodeMirror-wrap pre {+.CodeMirror-wrap pre.CodeMirror-line,+.CodeMirror-wrap pre.CodeMirror-line-like {word-wrap: break-word;white-space: pre-wrap;word-break: normal;diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/codemirror.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/codemirror.jsindex c5a9da5f8..5ff61d9ed 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/codemirror.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/codemirror.js@@ -1,7 +1,7 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE-// This is CodeMirror (https://codemirror.net), a code editor+// This is CodeMirror (https://codemirror.net/5), a code editor// implemented in JavaScript on top of the browser's DOM.//// You can find some technical background for some of the code below@@ -10,7 +10,7 @@(function (global, factory) {typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :typeof define === 'function' && define.amd ? define(factory) :- (global.CodeMirror = factory());+ (global = global || self, global.CodeMirror = factory());}(this, (function () { 'use strict';// Kludges for bugs and behavior differences that can't be feature@@ -26,13 +26,14 @@var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1]);var webkit = !edge && /WebKit\//.test(userAgent);var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);- var chrome = !edge && /Chrome\//.test(userAgent);+ var chrome = !edge && /Chrome\/(\d+)/.exec(userAgent);+ var chrome_version = chrome && +chrome[1];var presto = /Opera\//.test(userAgent);var safari = /Apple Computer/.test(navigator.vendor);var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);var phantom = /PhantomJS/.test(userAgent);- var ios = !edge && /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);+ var ios = safari && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2);var android = /Android/.test(userAgent);// This is woefully incomplete. Suggestions for alternative methods welcome.var mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);@@ -111,15 +112,15 @@} while (child = child.parentNode)}- function activeElt() {+ function activeElt(doc) {// IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.// IE < 10 will throw when accessed while the page is loading or in an iframe.// IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.var activeElement;try {- activeElement = document.activeElement;+ activeElement = doc.activeElement;} catch(e) {- activeElement = document.body || null;+ activeElement = doc.body || null;}while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement){ activeElement = activeElement.shadowRoot.activeElement; }@@ -143,6 +144,10 @@else if (ie) // Suppress mysterious IE10 errors{ selectInput = function(node) { try { node.select(); } catch(_e) {} }; }+ function doc(cm) { return cm.display.wrapper.ownerDocument }++ function win(cm) { return doc(cm).defaultView }+function bind(f) {var args = Array.prototype.slice.call(arguments, 1);return function(){return f.apply(null, args)}@@ -173,10 +178,28 @@}}- var Delayed = function() {this.id = null;};+ var Delayed = function() {+ this.id = null;+ this.f = null;+ this.time = 0;+ this.handler = bind(this.onTimeout, this);+ };+ Delayed.prototype.onTimeout = function (self) {+ self.id = 0;+ if (self.time <= +new Date) {+ self.f();+ } else {+ setTimeout(self.handler, self.time - +new Date);+ }+ };Delayed.prototype.set = function (ms, f) {- clearTimeout(this.id);- this.id = setTimeout(f, ms);+ this.f = f;+ var time = +new Date + ms;+ if (!this.id || time < this.time) {+ clearTimeout(this.id);+ this.id = setTimeout(this.handler, ms);+ this.time = time;+ }};function indexOf(array, elt) {@@ -186,7 +209,7 @@}// Number of pixels added to scroller and sizer to hide scrollbar- var scrollerGap = 30;+ var scrollerGap = 50;// Returned or thrown by various protocols to signal 'I'm not// handling this'.@@ -292,1474 +315,1376 @@}}- // The display handles the DOM integration, both for input reading- // and content drawing. It holds references to DOM nodes and- // display-related state.-- function Display(place, doc, input) {- var d = this;- this.input = input;-- // Covers bottom-right square when both scrollbars are present.- d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");- d.scrollbarFiller.setAttribute("cm-not-content", "true");- // Covers bottom of gutter when coverGutterNextToScrollbar is on- // and h scrollbar is present.- d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");- d.gutterFiller.setAttribute("cm-not-content", "true");- // Will contain the actual code, positioned to cover the viewport.- d.lineDiv = eltP("div", null, "CodeMirror-code");- // Elements are added to these to represent selection and cursors.- d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");- d.cursorDiv = elt("div", null, "CodeMirror-cursors");- // A visibility: hidden element used to find the size of things.- d.measure = elt("div", null, "CodeMirror-measure");- // When lines outside of the viewport are measured, they are drawn in this.- d.lineMeasure = elt("div", null, "CodeMirror-measure");- // Wraps everything that needs to exist inside the vertically-padded coordinate system- d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],- null, "position: relative; outline: none");- var lines = eltP("div", [d.lineSpace], "CodeMirror-lines");- // Moved around its parent to cover visible view.- d.mover = elt("div", [lines], null, "position: relative");- // Set to the height of the document, allowing scrolling.- d.sizer = elt("div", [d.mover], "CodeMirror-sizer");- d.sizerWidth = null;- // Behavior of elts with overflow: auto and padding is- // inconsistent across browsers. This is used to ensure the- // scrollable area is big enough.- d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");- // Will contain the gutters, if any.- d.gutters = elt("div", null, "CodeMirror-gutters");- d.lineGutter = null;- // Actual scrollable element.- d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");- d.scroller.setAttribute("tabIndex", "-1");- // The element in which the editor lives.- d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");+ // BIDI HELPERS- // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)- if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }- if (!webkit && !(gecko && mobile)) { d.scroller.draggable = true; }+ function iterateBidiSections(order, from, to, f) {+ if (!order) { return f(from, to, "ltr", 0) }+ 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) {+ f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i);+ found = true;+ }+ }+ if (!found) { f(from, to, "ltr"); }+ }- if (place) {- if (place.appendChild) { place.appendChild(d.wrapper); }- else { place(d.wrapper); }+ var bidiOther = null;+ function getBidiPartAt(order, ch, sticky) {+ var found;+ bidiOther = null;+ for (var i = 0; i < order.length; ++i) {+ var cur = order[i];+ if (cur.from < ch && cur.to > ch) { return i }+ if (cur.to == ch) {+ if (cur.from != cur.to && sticky == "before") { found = i; }+ else { bidiOther = i; }+ }+ if (cur.from == ch) {+ if (cur.from != cur.to && sticky != "before") { found = i; }+ else { bidiOther = i; }+ }}+ return found != null ? found : bidiOther+ }- // Current rendered range (may be bigger than the view window).- d.viewFrom = d.viewTo = doc.first;- d.reportedViewFrom = d.reportedViewTo = doc.first;- // Information about the rendered lines.- d.view = [];- d.renderedView = null;- // Holds info about a single rendered line when it was rendered- // for measurement, while not in view.- d.externalMeasured = null;- // Empty space (in pixels) above the view- d.viewOffset = 0;- d.lastWrapHeight = d.lastWrapWidth = 0;- d.updateLineNumbers = null;+ // Bidirectional ordering algorithm+ // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm+ // that this (partially) implements.- d.nativeBarWidth = d.barHeight = d.barWidth = 0;- d.scrollbarsClipped = false;+ // One-char codes used for character types:+ // L (L): Left-to-Right+ // R (R): Right-to-Left+ // r (AL): Right-to-Left Arabic+ // 1 (EN): European Number+ // + (ES): European Number Separator+ // % (ET): European Number Terminator+ // n (AN): Arabic Number+ // , (CS): Common Number Separator+ // m (NSM): Non-Spacing Mark+ // b (BN): Boundary Neutral+ // s (B): Paragraph Separator+ // t (S): Segment Separator+ // w (WS): Whitespace+ // N (ON): Other Neutrals- // Used to only resize the line number gutter when necessary (when- // the amount of lines crosses a boundary that makes its width change)- d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;- // Set to true when a non-horizontal-scrolling line widget is- // added. As an optimization, line widget aligning is skipped when- // this is false.- d.alignWidgets = false;+ // Returns null if characters are ordered as they appear+ // (left-to-right), or an array of sections ({from, to, level}+ // objects) in the order in which they occur visually.+ var bidiOrdering = (function() {+ // Character types for codepoints 0 to 0xff+ var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";+ // Character types for codepoints 0x600 to 0x6f9+ var arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111";+ function charType(code) {+ if (code <= 0xf7) { return lowTypes.charAt(code) }+ else if (0x590 <= code && code <= 0x5f4) { return "R" }+ else if (0x600 <= code && code <= 0x6f9) { return arabicTypes.charAt(code - 0x600) }+ else if (0x6ee <= code && code <= 0x8ac) { return "r" }+ else if (0x2000 <= code && code <= 0x200b) { return "w" }+ else if (code == 0x200c) { return "b" }+ else { return "L" }+ }- d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;+ var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;+ var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;- // Tracks the maximum line length so that the horizontal scrollbar- // can be kept static when scrolling.- d.maxLine = null;- d.maxLineLength = 0;- d.maxLineChanged = false;+ function BidiSpan(level, from, to) {+ this.level = level;+ this.from = from; this.to = to;+ }- // Used for measuring wheel scrolling granularity- d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;+ return function(str, direction) {+ var outerType = direction == "ltr" ? "L" : "R";- // True when shift is held down.- d.shift = false;+ if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) { return false }+ var len = str.length, types = [];+ for (var i = 0; i < len; ++i)+ { types.push(charType(str.charCodeAt(i))); }- // Used to track whether anything happened since the context menu- // was opened.- d.selForContextMenu = null;+ // W1. Examine each non-spacing mark (NSM) in the level run, and+ // change the type of the NSM to the type of the previous+ // character. If the NSM is at the start of the level run, it will+ // get the type of sor.+ for (var i$1 = 0, prev = outerType; i$1 < len; ++i$1) {+ var type = types[i$1];+ if (type == "m") { types[i$1] = prev; }+ else { prev = type; }+ }- d.activeTouch = null;+ // W2. Search backwards from each instance of a European number+ // until the first strong type (R, L, AL, or sor) is found. If an+ // AL is found, change the type of the European number to Arabic+ // number.+ // W3. Change all ALs to R.+ for (var i$2 = 0, cur = outerType; i$2 < len; ++i$2) {+ var type$1 = types[i$2];+ if (type$1 == "1" && cur == "r") { types[i$2] = "n"; }+ else if (isStrong.test(type$1)) { cur = type$1; if (type$1 == "r") { types[i$2] = "R"; } }+ }- input.init(d);- }+ // W4. A single European separator between two European numbers+ // changes to a European number. A single common separator between+ // two numbers of the same type changes to that type.+ for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) {+ var type$2 = types[i$3];+ if (type$2 == "+" && prev$1 == "1" && types[i$3+1] == "1") { types[i$3] = "1"; }+ else if (type$2 == "," && prev$1 == types[i$3+1] &&+ (prev$1 == "1" || prev$1 == "n")) { types[i$3] = prev$1; }+ prev$1 = type$2;+ }- // Find the line object corresponding to the given line number.- function getLine(doc, n) {- n -= doc.first;- if (n < 0 || n >= doc.size) { throw new Error("There is no line " + (n + doc.first) + " in the document.") }- var chunk = doc;- while (!chunk.lines) {- for (var i = 0;; ++i) {- var child = chunk.children[i], sz = child.chunkSize();- if (n < sz) { chunk = child; break }- n -= sz;+ // W5. A sequence of European terminators adjacent to European+ // numbers changes to all European numbers.+ // W6. Otherwise, separators and terminators change to Other+ // Neutral.+ for (var i$4 = 0; i$4 < len; ++i$4) {+ var type$3 = types[i$4];+ if (type$3 == ",") { types[i$4] = "N"; }+ else if (type$3 == "%") {+ var end = (void 0);+ for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {}+ var replace = (i$4 && types[i$4-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";+ for (var j = i$4; j < end; ++j) { types[j] = replace; }+ i$4 = end - 1;+ }}- }- return chunk.lines[n]- }- // Get the part of a document between two positions, as an array of- // strings.- function getBetween(doc, start, end) {- var out = [], n = start.line;- doc.iter(start.line, end.line + 1, function (line) {- var text = line.text;- if (n == end.line) { text = text.slice(0, end.ch); }- if (n == start.line) { text = text.slice(start.ch); }- out.push(text);- ++n;- });- return out- }- // Get the lines between from and to, as array of strings.- function getLines(doc, from, to) {- var out = [];- doc.iter(from, to, function (line) { out.push(line.text); }); // iter aborts when callback returns truthy value- return out- }+ // W7. Search backwards from each instance of a European number+ // until the first strong type (R, L, or sor) is found. If an L is+ // found, then change the type of the European number to L.+ for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) {+ var type$4 = types[i$5];+ if (cur$1 == "L" && type$4 == "1") { types[i$5] = "L"; }+ else if (isStrong.test(type$4)) { cur$1 = type$4; }+ }- // Update the height of a line, propagating the height change- // upwards to parent nodes.- function updateLineHeight(line, height) {- var diff = height - line.height;- if (diff) { for (var n = line; n; n = n.parent) { n.height += diff; } }- }-- // Given a line object, find its line number by walking up through- // its parent links.- function lineNo(line) {- if (line.parent == null) { return null }- var cur = line.parent, no = indexOf(cur.lines, line);- for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {- for (var i = 0;; ++i) {- if (chunk.children[i] == cur) { break }- no += chunk.children[i].chunkSize();+ // N1. A sequence of neutrals takes the direction of the+ // surrounding strong text if the text on both sides has the same+ // direction. European and Arabic numbers act as if they were R in+ // terms of their influence on neutrals. Start-of-level-run (sor)+ // and end-of-level-run (eor) are used at level run boundaries.+ // N2. Any remaining neutrals take the embedding direction.+ for (var i$6 = 0; i$6 < len; ++i$6) {+ if (isNeutral.test(types[i$6])) {+ var end$1 = (void 0);+ for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {}+ var before = (i$6 ? types[i$6-1] : outerType) == "L";+ var after = (end$1 < len ? types[end$1] : outerType) == "L";+ var replace$1 = before == after ? (before ? "L" : "R") : outerType;+ for (var j$1 = i$6; j$1 < end$1; ++j$1) { types[j$1] = replace$1; }+ i$6 = end$1 - 1;+ }}- }- return no + cur.first- }- // Find the line at the given vertical position, using the height- // information in the document tree.- function lineAtHeight(chunk, h) {- var n = chunk.first;- outer: do {- for (var i$1 = 0; i$1 < chunk.children.length; ++i$1) {- var child = chunk.children[i$1], ch = child.height;- if (h < ch) { chunk = child; continue outer }- h -= ch;- n += child.chunkSize();+ // Here we depart from the documented algorithm, in order to avoid+ // building up an actual levels array. Since there are only three+ // levels (0, 1, 2) in an implementation that doesn't take+ // explicit embedding into account, we can build up the order on+ // the fly, without following the level-based algorithm.+ var order = [], m;+ for (var i$7 = 0; i$7 < len;) {+ if (countsAsLeft.test(types[i$7])) {+ var start = i$7;+ for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {}+ order.push(new BidiSpan(0, start, i$7));+ } else {+ var pos = i$7, at = order.length, isRTL = direction == "rtl" ? 1 : 0;+ for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {}+ for (var j$2 = pos; j$2 < i$7;) {+ if (countsAsNum.test(types[j$2])) {+ if (pos < j$2) { order.splice(at, 0, new BidiSpan(1, pos, j$2)); at += isRTL; }+ var nstart = j$2;+ for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {}+ order.splice(at, 0, new BidiSpan(2, nstart, j$2));+ at += isRTL;+ pos = j$2;+ } else { ++j$2; }+ }+ if (pos < i$7) { order.splice(at, 0, new BidiSpan(1, pos, i$7)); }+ }+ }+ if (direction == "ltr") {+ if (order[0].level == 1 && (m = str.match(/^\s+/))) {+ order[0].from = m[0].length;+ order.unshift(new BidiSpan(0, 0, m[0].length));+ }+ if (lst(order).level == 1 && (m = str.match(/\s+$/))) {+ lst(order).to -= m[0].length;+ order.push(new BidiSpan(0, len - m[0].length, len));+ }}- return n- } while (!chunk.lines)- var i = 0;- for (; i < chunk.lines.length; ++i) {- var line = chunk.lines[i], lh = line.height;- if (h < lh) { break }- h -= lh;- }- return n + i- }- function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size}+ return direction == "rtl" ? order.reverse() : order+ }+ })();- function lineNumberFor(options, i) {- return String(options.lineNumberFormatter(i + options.firstLineNumber))+ // Get the bidi ordering for the given line (and cache it). Returns+ // false for lines that are fully left-to-right, and an array of+ // BidiSpan objects otherwise.+ function getOrder(line, direction) {+ var order = line.order;+ if (order == null) { order = line.order = bidiOrdering(line.text, direction); }+ return order}- // A Pos instance represents a position within the text.- function Pos(line, ch, sticky) {- if ( sticky === void 0 ) sticky = null;-- if (!(this instanceof Pos)) { return new Pos(line, ch, sticky) }- this.line = line;- this.ch = ch;- this.sticky = sticky;- }+ // EVENT HANDLING- // Compare two positions, return 0 if they are the same, a negative- // number when a is less, and a positive number otherwise.- function cmp(a, b) { return a.line - b.line || a.ch - b.ch }+ // Lightweight event framework. on/off also work on DOM nodes,+ // registering native DOM handlers.- function equalCursorPos(a, b) { return a.sticky == b.sticky && cmp(a, b) == 0 }+ var noHandlers = [];- function copyPos(x) {return Pos(x.line, x.ch)}- function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }- function minPos(a, b) { return cmp(a, b) < 0 ? a : b }+ var on = function(emitter, type, f) {+ if (emitter.addEventListener) {+ emitter.addEventListener(type, f, false);+ } else if (emitter.attachEvent) {+ emitter.attachEvent("on" + type, f);+ } else {+ var map = emitter._handlers || (emitter._handlers = {});+ map[type] = (map[type] || noHandlers).concat(f);+ }+ };- // Most of the external API clips given positions to make sure they- // actually exist within the document.- function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))}- function clipPos(doc, pos) {- if (pos.line < doc.first) { return Pos(doc.first, 0) }- var last = doc.first + doc.size - 1;- if (pos.line > last) { return Pos(last, getLine(doc, last).text.length) }- return clipToLen(pos, getLine(doc, pos.line).text.length)- }- function clipToLen(pos, linelen) {- var ch = pos.ch;- if (ch == null || ch > linelen) { return Pos(pos.line, linelen) }- else if (ch < 0) { return Pos(pos.line, 0) }- else { return pos }+ function getHandlers(emitter, type) {+ return emitter._handlers && emitter._handlers[type] || noHandlers}- function clipPosArray(doc, array) {- var out = [];- for (var i = 0; i < array.length; i++) { out[i] = clipPos(doc, array[i]); }- return out++ function off(emitter, type, f) {+ if (emitter.removeEventListener) {+ emitter.removeEventListener(type, f, false);+ } else if (emitter.detachEvent) {+ emitter.detachEvent("on" + type, f);+ } else {+ var map = emitter._handlers, arr = map && map[type];+ if (arr) {+ var index = indexOf(arr, f);+ if (index > -1)+ { map[type] = arr.slice(0, index).concat(arr.slice(index + 1)); }+ }+ }}- // Optimize some code when these features are not used.- var sawReadOnlySpans = false, sawCollapsedSpans = false;+ function signal(emitter, type /*, values...*/) {+ var handlers = getHandlers(emitter, type);+ if (!handlers.length) { return }+ var args = Array.prototype.slice.call(arguments, 2);+ for (var i = 0; i < handlers.length; ++i) { handlers[i].apply(null, args); }+ }- function seeReadOnlySpans() {- sawReadOnlySpans = true;+ // The DOM events that CodeMirror handles can be overridden by+ // registering a (non-DOM) handler on the editor for the event name,+ // and preventDefault-ing the event in that handler.+ function signalDOMEvent(cm, e, override) {+ if (typeof e == "string")+ { e = {type: e, preventDefault: function() { this.defaultPrevented = true; }}; }+ signal(cm, override || e.type, cm, e);+ return e_defaultPrevented(e) || e.codemirrorIgnore}- function seeCollapsedSpans() {- sawCollapsedSpans = true;+ function signalCursorActivity(cm) {+ var arr = cm._handlers && cm._handlers.cursorActivity;+ if (!arr) { return }+ var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);+ for (var i = 0; i < arr.length; ++i) { if (indexOf(set, arr[i]) == -1)+ { set.push(arr[i]); } }}- // TEXTMARKER SPANS+ function hasHandler(emitter, type) {+ return getHandlers(emitter, type).length > 0+ }- function MarkedSpan(marker, from, to) {- this.marker = marker;- this.from = from; this.to = to;+ // Add on and off methods to a constructor's prototype, to make+ // registering events on such objects more convenient.+ function eventMixin(ctor) {+ ctor.prototype.on = function(type, f) {on(this, type, f);};+ ctor.prototype.off = function(type, f) {off(this, type, f);};}- // Search an array of spans for a span matching the given marker.- function getMarkedSpanFor(spans, marker) {- if (spans) { for (var i = 0; i < spans.length; ++i) {- var span = spans[i];- if (span.marker == marker) { return span }- } }+ // Due to the fact that we still support jurassic IE versions, some+ // compatibility wrappers are needed.++ function e_preventDefault(e) {+ if (e.preventDefault) { e.preventDefault(); }+ else { e.returnValue = false; }}- // Remove a span from an array, returning undefined if no spans are- // left (we don't store arrays for lines without spans).- function removeMarkedSpan(spans, span) {- var r;- for (var i = 0; i < spans.length; ++i)- { if (spans[i] != span) { (r || (r = [])).push(spans[i]); } }- return r+ function e_stopPropagation(e) {+ if (e.stopPropagation) { e.stopPropagation(); }+ else { e.cancelBubble = true; }}- // Add a span to a line.- function addMarkedSpan(line, span) {- line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];- span.marker.attachLine(line);+ function e_defaultPrevented(e) {+ return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false}+ function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}- // Used for the algorithm that adjusts markers for a change in the- // document. These functions cut an array of spans at a given- // character position, returning an array of remaining chunks (or- // undefined if nothing remains).- function markedSpansBefore(old, startCh, isInsert) {- var nw;- if (old) { for (var i = 0; i < old.length; ++i) {- var span = old[i], marker = span.marker;- var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);- if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {- var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh)- ;(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));- }- } }- return nw+ function e_target(e) {return e.target || e.srcElement}+ function e_button(e) {+ var b = e.which;+ if (b == null) {+ if (e.button & 1) { b = 1; }+ else if (e.button & 2) { b = 3; }+ else if (e.button & 4) { b = 2; }+ }+ if (mac && e.ctrlKey && b == 1) { b = 3; }+ return b}- function markedSpansAfter(old, endCh, isInsert) {- var nw;- if (old) { for (var i = 0; i < old.length; ++i) {- var span = old[i], marker = span.marker;- var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);- if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {- var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh)- ;(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,- span.to == null ? null : span.to - endCh));- }- } }- return nw- }-- // Given a change object, compute the new set of marker spans that- // cover the line in which the change took place. Removes spans- // entirely within the change, reconnects spans belonging to the- // same marker that appear on both sides of the change, and cuts off- // spans partially within the change. Returns an array of span- // arrays with one element for each line in (after) the change.- function stretchSpansOverChange(doc, change) {- if (change.full) { return null }- var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;- var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;- if (!oldFirst && !oldLast) { return null }-- var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;- // Get the spans that 'stick out' on both sides- var first = markedSpansBefore(oldFirst, startCh, isInsert);- var last = markedSpansAfter(oldLast, endCh, isInsert);- // Next, merge those two ends- var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);- if (first) {- // Fix up .to properties of first- for (var i = 0; i < first.length; ++i) {- var span = first[i];- if (span.to == null) {- var found = getMarkedSpanFor(last, span.marker);- if (!found) { span.to = startCh; }- else if (sameLine) { span.to = found.to == null ? null : found.to + offset; }- }- }- }- if (last) {- // Fix up .from in last (or move them into first in case of sameLine)- for (var i$1 = 0; i$1 < last.length; ++i$1) {- var span$1 = last[i$1];- if (span$1.to != null) { span$1.to += offset; }- if (span$1.from == null) {- var found$1 = getMarkedSpanFor(first, span$1.marker);- if (!found$1) {- span$1.from = offset;- if (sameLine) { (first || (first = [])).push(span$1); }- }- } else {- span$1.from += offset;- if (sameLine) { (first || (first = [])).push(span$1); }- }- }- }- // Make sure we didn't create any zero-length spans- if (first) { first = clearEmptySpans(first); }- if (last && last != first) { last = clearEmptySpans(last); }+ // Detect drag-and-drop+ var dragAndDrop = function() {+ // There is *some* kind of drag-and-drop support in IE6-8, but I+ // couldn't get it to work yet.+ if (ie && ie_version < 9) { return false }+ var div = elt('div');+ return "draggable" in div || "dragDrop" in div+ }();- var newMarkers = [first];- if (!sameLine) {- // Fill gap with whole-line-spans- var gap = change.text.length - 2, gapMarkers;- if (gap > 0 && first)- { for (var i$2 = 0; i$2 < first.length; ++i$2)- { if (first[i$2].to == null)- { (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$2].marker, null, null)); } } }- for (var i$3 = 0; i$3 < gap; ++i$3)- { newMarkers.push(gapMarkers); }- newMarkers.push(last);+ var zwspSupported;+ function zeroWidthElement(measure) {+ if (zwspSupported == null) {+ var test = elt("span", "\u200b");+ removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));+ if (measure.firstChild.offsetHeight != 0)+ { zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); }}- return newMarkers+ var node = zwspSupported ? elt("span", "\u200b") :+ elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");+ node.setAttribute("cm-text", "");+ return node}- // Remove spans that are empty and don't have a clearWhenEmpty- // option of false.- function clearEmptySpans(spans) {- for (var i = 0; i < spans.length; ++i) {- var span = spans[i];- if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)- { spans.splice(i--, 1); }- }- if (!spans.length) { return null }- return spans+ // Feature-detect IE's crummy client rect reporting for bidi text+ var badBidiRects;+ function hasBadBidiRects(measure) {+ if (badBidiRects != null) { return badBidiRects }+ var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));+ var r0 = range(txt, 0, 1).getBoundingClientRect();+ var r1 = range(txt, 1, 2).getBoundingClientRect();+ removeChildren(measure);+ if (!r0 || r0.left == r0.right) { return false } // Safari returns null in some cases (#2780)+ return badBidiRects = (r1.right - r0.right < 3)}- // Used to 'clip' out readOnly ranges when making a change.- function removeReadOnlyRanges(doc, from, to) {- var markers = null;- doc.iter(from.line, to.line + 1, function (line) {- if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {- var mark = line.markedSpans[i].marker;- if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))- { (markers || (markers = [])).push(mark); }- } }- });- if (!markers) { return null }- var parts = [{from: from, to: to}];- for (var i = 0; i < markers.length; ++i) {- var mk = markers[i], m = mk.find(0);- for (var j = 0; j < parts.length; ++j) {- var p = parts[j];- if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { continue }- var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);- if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)- { newParts.push({from: p.from, to: m.from}); }- if (dto > 0 || !mk.inclusiveRight && !dto)- { newParts.push({from: m.to, to: p.to}); }- parts.splice.apply(parts, newParts);- j += newParts.length - 3;+ // See if "".split is the broken IE version, if so, provide an+ // alternative way to split lines.+ var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) {+ var pos = 0, result = [], l = string.length;+ while (pos <= l) {+ var nl = string.indexOf("\n", pos);+ if (nl == -1) { nl = string.length; }+ var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);+ var rt = line.indexOf("\r");+ if (rt != -1) {+ result.push(line.slice(0, rt));+ pos += rt + 1;+ } else {+ result.push(line);+ pos = nl + 1;}}- return parts- }+ return result+ } : function (string) { return string.split(/\r\n?|\n/); };- // Connect or disconnect spans from a line.- function detachMarkedSpans(line) {- var spans = line.markedSpans;- if (!spans) { return }- for (var i = 0; i < spans.length; ++i)- { spans[i].marker.detachLine(line); }- line.markedSpans = null;- }- function attachMarkedSpans(line, spans) {- if (!spans) { return }- for (var i = 0; i < spans.length; ++i)- { spans[i].marker.attachLine(line); }- line.markedSpans = spans;- }+ var hasSelection = window.getSelection ? function (te) {+ try { return te.selectionStart != te.selectionEnd }+ catch(e) { return false }+ } : function (te) {+ var range;+ try {range = te.ownerDocument.selection.createRange();}+ catch(e) {}+ if (!range || range.parentElement() != te) { return false }+ return range.compareEndPoints("StartToEnd", range) != 0+ };- // Helpers used when computing which overlapping collapsed span- // counts as the larger one.- function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0 }- function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 }+ var hasCopyEvent = (function () {+ var e = elt("div");+ if ("oncopy" in e) { return true }+ e.setAttribute("oncopy", "return;");+ return typeof e.oncopy == "function"+ })();- // Returns a number indicating which of two overlapping collapsed- // spans is larger (and thus includes the other). Falls back to- // comparing ids when the spans cover exactly the same range.- function compareCollapsedMarkers(a, b) {- var lenDiff = a.lines.length - b.lines.length;- if (lenDiff != 0) { return lenDiff }- var aPos = a.find(), bPos = b.find();- var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);- if (fromCmp) { return -fromCmp }- var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);- if (toCmp) { return toCmp }- return b.id - a.id+ var badZoomedRects = null;+ function hasBadZoomedRects(measure) {+ if (badZoomedRects != null) { return badZoomedRects }+ var node = removeChildrenAndAdd(measure, elt("span", "x"));+ var normal = node.getBoundingClientRect();+ var fromRange = range(node, 0, 1).getBoundingClientRect();+ return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1}- // Find out whether a line ends or starts in a collapsed span. If- // so, return the marker for that span.- function collapsedSpanAtSide(line, start) {- var sps = sawCollapsedSpans && line.markedSpans, found;- if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {- sp = sps[i];- if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&- (!found || compareCollapsedMarkers(found, sp.marker) < 0))- { found = sp.marker; }- } }- return found- }- function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }- function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }+ // Known modes, by name and by MIME+ var modes = {}, mimeModes = {};- function collapsedSpanAround(line, ch) {- var sps = sawCollapsedSpans && line.markedSpans, found;- if (sps) { for (var i = 0; i < sps.length; ++i) {- var sp = sps[i];- if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) &&- (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { found = sp.marker; }- } }- return found+ // Extra arguments are stored as the mode's dependencies, which is+ // used by (legacy) mechanisms like loadmode.js to automatically+ // load a mode. (Preferred mechanism is the require/define calls.)+ function defineMode(name, mode) {+ if (arguments.length > 2)+ { mode.dependencies = Array.prototype.slice.call(arguments, 2); }+ modes[name] = mode;}- // Test whether there exists a collapsed span that partially- // overlaps (covers the start or end, but not both) of a new span.- // Such overlap is not allowed.- function conflictingCollapsedRange(doc, lineNo$$1, from, to, marker) {- var line = getLine(doc, lineNo$$1);- var sps = sawCollapsedSpans && line.markedSpans;- if (sps) { for (var i = 0; i < sps.length; ++i) {- var sp = sps[i];- if (!sp.marker.collapsed) { continue }- var found = sp.marker.find(0);- var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);- var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);- if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { continue }- if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||- fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))- { return true }- } }+ function defineMIME(mime, spec) {+ mimeModes[mime] = spec;}- // A visual line is a line as drawn on the screen. Folding, for- // example, can cause multiple logical lines to appear on the same- // visual line. This finds the start of the visual line that the- // given line is part of (usually that is the line itself).- function visualLine(line) {- var merged;- while (merged = collapsedSpanAtStart(line))- { line = merged.find(-1, true).line; }- return line- }-- function visualLineEnd(line) {- var merged;- while (merged = collapsedSpanAtEnd(line))- { line = merged.find(1, true).line; }- return line- }-- // Returns an array of logical lines that continue the visual line- // started by the argument, or undefined if there are no such lines.- function visualLineContinued(line) {- var merged, lines;- while (merged = collapsedSpanAtEnd(line)) {- line = merged.find(1, true).line- ;(lines || (lines = [])).push(line);- }- return lines- }-- // Get the line number of the start of the visual line that the- // given line number is part of.- function visualLineNo(doc, lineN) {- var line = getLine(doc, lineN), vis = visualLine(line);- if (line == vis) { return lineN }- return lineNo(vis)- }-- // Get the line number of the start of the next visual line after- // the given line.- function visualLineEndNo(doc, lineN) {- if (lineN > doc.lastLine()) { return lineN }- var line = getLine(doc, lineN), merged;- if (!lineIsHidden(doc, line)) { return lineN }- while (merged = collapsedSpanAtEnd(line))- { line = merged.find(1, true).line; }- return lineNo(line) + 1- }-- // Compute whether a line is hidden. Lines count as hidden when they- // are part of a visual line that starts with another line, or when- // they are entirely covered by collapsed, non-widget span.- function lineIsHidden(doc, line) {- var sps = sawCollapsedSpans && line.markedSpans;- if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {- sp = sps[i];- if (!sp.marker.collapsed) { continue }- if (sp.from == null) { return true }- if (sp.marker.widgetNode) { continue }- if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))- { return true }- } }- }- function lineIsHiddenInner(doc, line, span) {- if (span.to == null) {- var end = span.marker.find(1, true);- return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker))- }- if (span.marker.inclusiveRight && span.to == line.text.length)- { return true }- for (var sp = (void 0), i = 0; i < line.markedSpans.length; ++i) {- sp = line.markedSpans[i];- if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&- (sp.to == null || sp.to != span.from) &&- (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&- lineIsHiddenInner(doc, line, sp)) { return true }+ // Given a MIME type, a {name, ...options} config object, or a name+ // string, return a mode config object.+ function resolveMode(spec) {+ if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {+ spec = mimeModes[spec];+ } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {+ var found = mimeModes[spec.name];+ if (typeof found == "string") { found = {name: found}; }+ spec = createObj(found, spec);+ spec.name = found.name;+ } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {+ return resolveMode("application/xml")+ } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {+ return resolveMode("application/json")}+ if (typeof spec == "string") { return {name: spec} }+ else { return spec || {name: "null"} }}- // Find the height above the given line.- function heightAtLine(lineObj) {- lineObj = visualLine(lineObj);-- var h = 0, chunk = lineObj.parent;- for (var i = 0; i < chunk.lines.length; ++i) {- var line = chunk.lines[i];- if (line == lineObj) { break }- else { h += line.height; }- }- for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {- for (var i$1 = 0; i$1 < p.children.length; ++i$1) {- var cur = p.children[i$1];- if (cur == chunk) { break }- else { h += cur.height; }+ // Given a mode spec (anything that resolveMode accepts), find and+ // initialize an actual mode object.+ function getMode(options, spec) {+ spec = resolveMode(spec);+ var mfactory = modes[spec.name];+ if (!mfactory) { return getMode(options, "text/plain") }+ var modeObj = mfactory(options, spec);+ if (modeExtensions.hasOwnProperty(spec.name)) {+ var exts = modeExtensions[spec.name];+ for (var prop in exts) {+ if (!exts.hasOwnProperty(prop)) { continue }+ if (modeObj.hasOwnProperty(prop)) { modeObj["_" + prop] = modeObj[prop]; }+ modeObj[prop] = exts[prop];}}- return h- }+ modeObj.name = spec.name;+ if (spec.helperType) { modeObj.helperType = spec.helperType; }+ if (spec.modeProps) { for (var prop$1 in spec.modeProps)+ { modeObj[prop$1] = spec.modeProps[prop$1]; } }- // Compute the character length of a line, taking into account- // collapsed ranges (see markText) that might hide parts, and join- // other lines onto it.- function lineLength(line) {- if (line.height == 0) { return 0 }- var len = line.text.length, merged, cur = line;- while (merged = collapsedSpanAtStart(cur)) {- var found = merged.find(0, true);- cur = found.from.line;- len += found.from.ch - found.to.ch;- }- cur = line;- while (merged = collapsedSpanAtEnd(cur)) {- var found$1 = merged.find(0, true);- len -= cur.text.length - found$1.from.ch;- cur = found$1.to.line;- len += cur.text.length - found$1.to.ch;- }- return len+ return modeObj}- // Find the longest line in the document.- function findMaxLine(cm) {- var d = cm.display, doc = cm.doc;- d.maxLine = getLine(doc, doc.first);- d.maxLineLength = lineLength(d.maxLine);- d.maxLineChanged = true;- doc.iter(function (line) {- var len = lineLength(line);- if (len > d.maxLineLength) {- d.maxLineLength = len;- d.maxLine = line;- }- });+ // This can be used to attach properties to mode objects from+ // outside the actual mode definition.+ var modeExtensions = {};+ function extendMode(mode, properties) {+ var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});+ copyObj(properties, exts);}- // BIDI HELPERS-- function iterateBidiSections(order, from, to, f) {- if (!order) { return f(from, to, "ltr", 0) }- 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) {- f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i);- found = true;- }+ function copyState(mode, state) {+ if (state === true) { return state }+ if (mode.copyState) { return mode.copyState(state) }+ var nstate = {};+ for (var n in state) {+ var val = state[n];+ if (val instanceof Array) { val = val.concat([]); }+ nstate[n] = val;}- if (!found) { f(from, to, "ltr"); }+ return nstate}- var bidiOther = null;- function getBidiPartAt(order, ch, sticky) {- var found;- bidiOther = null;- for (var i = 0; i < order.length; ++i) {- var cur = order[i];- if (cur.from < ch && cur.to > ch) { return i }- if (cur.to == ch) {- if (cur.from != cur.to && sticky == "before") { found = i; }- else { bidiOther = i; }- }- if (cur.from == ch) {- if (cur.from != cur.to && sticky != "before") { found = i; }- else { bidiOther = i; }- }+ // Given a mode and a state (for that mode), find the inner mode and+ // state at the position that the state refers to.+ function innerMode(mode, state) {+ var info;+ while (mode.innerMode) {+ info = mode.innerMode(state);+ if (!info || info.mode == mode) { break }+ state = info.state;+ mode = info.mode;}- return found != null ? found : bidiOther+ return info || {mode: mode, state: state}}- // Bidirectional ordering algorithm- // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm- // that this (partially) implements.+ function startState(mode, a1, a2) {+ return mode.startState ? mode.startState(a1, a2) : true+ }- // One-char codes used for character types:- // L (L): Left-to-Right- // R (R): Right-to-Left- // r (AL): Right-to-Left Arabic- // 1 (EN): European Number- // + (ES): European Number Separator- // % (ET): European Number Terminator- // n (AN): Arabic Number- // , (CS): Common Number Separator- // m (NSM): Non-Spacing Mark- // b (BN): Boundary Neutral- // s (B): Paragraph Separator- // t (S): Segment Separator- // w (WS): Whitespace- // N (ON): Other Neutrals+ // STRING STREAM- // Returns null if characters are ordered as they appear- // (left-to-right), or an array of sections ({from, to, level}- // objects) in the order in which they occur visually.- var bidiOrdering = (function() {- // Character types for codepoints 0 to 0xff- var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";- // Character types for codepoints 0x600 to 0x6f9- var arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111";- function charType(code) {- if (code <= 0xf7) { return lowTypes.charAt(code) }- else if (0x590 <= code && code <= 0x5f4) { return "R" }- else if (0x600 <= code && code <= 0x6f9) { return arabicTypes.charAt(code - 0x600) }- else if (0x6ee <= code && code <= 0x8ac) { return "r" }- else if (0x2000 <= code && code <= 0x200b) { return "w" }- else if (code == 0x200c) { return "b" }- else { return "L" }- }+ // Fed to the mode parsers, provides helper functions to make+ // parsers more succinct.- var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;- var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;+ var StringStream = function(string, tabSize, lineOracle) {+ this.pos = this.start = 0;+ this.string = string;+ this.tabSize = tabSize || 8;+ this.lastColumnPos = this.lastColumnValue = 0;+ this.lineStart = 0;+ this.lineOracle = lineOracle;+ };- function BidiSpan(level, from, to) {- this.level = level;- this.from = from; this.to = to;+ StringStream.prototype.eol = function () {return this.pos >= this.string.length};+ StringStream.prototype.sol = function () {return this.pos == this.lineStart};+ StringStream.prototype.peek = function () {return this.string.charAt(this.pos) || undefined};+ StringStream.prototype.next = function () {+ if (this.pos < this.string.length)+ { return this.string.charAt(this.pos++) }+ };+ StringStream.prototype.eat = function (match) {+ var ch = this.string.charAt(this.pos);+ var ok;+ if (typeof match == "string") { ok = ch == match; }+ else { ok = ch && (match.test ? match.test(ch) : match(ch)); }+ if (ok) {++this.pos; return ch}+ };+ StringStream.prototype.eatWhile = function (match) {+ var start = this.pos;+ while (this.eat(match)){}+ return this.pos > start+ };+ StringStream.prototype.eatSpace = function () {+ var start = this.pos;+ while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { ++this.pos; }+ return this.pos > start+ };+ StringStream.prototype.skipToEnd = function () {this.pos = this.string.length;};+ StringStream.prototype.skipTo = function (ch) {+ var found = this.string.indexOf(ch, this.pos);+ if (found > -1) {this.pos = found; return true}+ };+ StringStream.prototype.backUp = function (n) {this.pos -= n;};+ StringStream.prototype.column = function () {+ if (this.lastColumnPos < this.start) {+ this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);+ this.lastColumnPos = this.start;}-- return function(str, direction) {- var outerType = direction == "ltr" ? "L" : "R";-- if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) { return false }- var len = str.length, types = [];- for (var i = 0; i < len; ++i)- { types.push(charType(str.charCodeAt(i))); }-- // W1. Examine each non-spacing mark (NSM) in the level run, and- // change the type of the NSM to the type of the previous- // character. If the NSM is at the start of the level run, it will- // get the type of sor.- for (var i$1 = 0, prev = outerType; i$1 < len; ++i$1) {- var type = types[i$1];- if (type == "m") { types[i$1] = prev; }- else { prev = type; }- }-- // W2. Search backwards from each instance of a European number- // until the first strong type (R, L, AL, or sor) is found. If an- // AL is found, change the type of the European number to Arabic- // number.- // W3. Change all ALs to R.- for (var i$2 = 0, cur = outerType; i$2 < len; ++i$2) {- var type$1 = types[i$2];- if (type$1 == "1" && cur == "r") { types[i$2] = "n"; }- else if (isStrong.test(type$1)) { cur = type$1; if (type$1 == "r") { types[i$2] = "R"; } }+ return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)+ };+ StringStream.prototype.indentation = function () {+ return countColumn(this.string, null, this.tabSize) -+ (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)+ };+ StringStream.prototype.match = function (pattern, consume, caseInsensitive) {+ if (typeof pattern == "string") {+ var cased = function (str) { return caseInsensitive ? str.toLowerCase() : str; };+ var substr = this.string.substr(this.pos, pattern.length);+ if (cased(substr) == cased(pattern)) {+ if (consume !== false) { this.pos += pattern.length; }+ return true}+ } else {+ var match = this.string.slice(this.pos).match(pattern);+ if (match && match.index > 0) { return null }+ if (match && consume !== false) { this.pos += match[0].length; }+ return match+ }+ };+ StringStream.prototype.current = function (){return this.string.slice(this.start, this.pos)};+ StringStream.prototype.hideFirstChars = function (n, inner) {+ this.lineStart += n;+ try { return inner() }+ finally { this.lineStart -= n; }+ };+ StringStream.prototype.lookAhead = function (n) {+ var oracle = this.lineOracle;+ return oracle && oracle.lookAhead(n)+ };+ StringStream.prototype.baseToken = function () {+ var oracle = this.lineOracle;+ return oracle && oracle.baseToken(this.pos)+ };- // W4. A single European separator between two European numbers- // changes to a European number. A single common separator between- // two numbers of the same type changes to that type.- for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) {- var type$2 = types[i$3];- if (type$2 == "+" && prev$1 == "1" && types[i$3+1] == "1") { types[i$3] = "1"; }- else if (type$2 == "," && prev$1 == types[i$3+1] &&- (prev$1 == "1" || prev$1 == "n")) { types[i$3] = prev$1; }- prev$1 = type$2;+ // Find the line object corresponding to the given line number.+ function getLine(doc, n) {+ n -= doc.first;+ if (n < 0 || n >= doc.size) { throw new Error("There is no line " + (n + doc.first) + " in the document.") }+ var chunk = doc;+ while (!chunk.lines) {+ for (var i = 0;; ++i) {+ var child = chunk.children[i], sz = child.chunkSize();+ if (n < sz) { chunk = child; break }+ n -= sz;}+ }+ return chunk.lines[n]+ }- // W5. A sequence of European terminators adjacent to European- // numbers changes to all European numbers.- // W6. Otherwise, separators and terminators change to Other- // Neutral.- for (var i$4 = 0; i$4 < len; ++i$4) {- var type$3 = types[i$4];- if (type$3 == ",") { types[i$4] = "N"; }- else if (type$3 == "%") {- var end = (void 0);- for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {}- var replace = (i$4 && types[i$4-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";- for (var j = i$4; j < end; ++j) { types[j] = replace; }- i$4 = end - 1;- }- }+ // Get the part of a document between two positions, as an array of+ // strings.+ function getBetween(doc, start, end) {+ var out = [], n = start.line;+ doc.iter(start.line, end.line + 1, function (line) {+ var text = line.text;+ if (n == end.line) { text = text.slice(0, end.ch); }+ if (n == start.line) { text = text.slice(start.ch); }+ out.push(text);+ ++n;+ });+ return out+ }+ // Get the lines between from and to, as array of strings.+ function getLines(doc, from, to) {+ var out = [];+ doc.iter(from, to, function (line) { out.push(line.text); }); // iter aborts when callback returns truthy value+ return out+ }- // W7. Search backwards from each instance of a European number- // until the first strong type (R, L, or sor) is found. If an L is- // found, then change the type of the European number to L.- for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) {- var type$4 = types[i$5];- if (cur$1 == "L" && type$4 == "1") { types[i$5] = "L"; }- else if (isStrong.test(type$4)) { cur$1 = type$4; }- }+ // Update the height of a line, propagating the height change+ // upwards to parent nodes.+ function updateLineHeight(line, height) {+ var diff = height - line.height;+ if (diff) { for (var n = line; n; n = n.parent) { n.height += diff; } }+ }- // N1. A sequence of neutrals takes the direction of the- // surrounding strong text if the text on both sides has the same- // direction. European and Arabic numbers act as if they were R in- // terms of their influence on neutrals. Start-of-level-run (sor)- // and end-of-level-run (eor) are used at level run boundaries.- // N2. Any remaining neutrals take the embedding direction.- for (var i$6 = 0; i$6 < len; ++i$6) {- if (isNeutral.test(types[i$6])) {- var end$1 = (void 0);- for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {}- var before = (i$6 ? types[i$6-1] : outerType) == "L";- var after = (end$1 < len ? types[end$1] : outerType) == "L";- var replace$1 = before == after ? (before ? "L" : "R") : outerType;- for (var j$1 = i$6; j$1 < end$1; ++j$1) { types[j$1] = replace$1; }- i$6 = end$1 - 1;- }+ // Given a line object, find its line number by walking up through+ // its parent links.+ function lineNo(line) {+ if (line.parent == null) { return null }+ var cur = line.parent, no = indexOf(cur.lines, line);+ for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {+ for (var i = 0;; ++i) {+ if (chunk.children[i] == cur) { break }+ no += chunk.children[i].chunkSize();}+ }+ return no + cur.first+ }- // Here we depart from the documented algorithm, in order to avoid- // building up an actual levels array. Since there are only three- // levels (0, 1, 2) in an implementation that doesn't take- // explicit embedding into account, we can build up the order on- // the fly, without following the level-based algorithm.- var order = [], m;- for (var i$7 = 0; i$7 < len;) {- if (countsAsLeft.test(types[i$7])) {- var start = i$7;- for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {}- order.push(new BidiSpan(0, start, i$7));- } else {- var pos = i$7, at = order.length;- for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {}- for (var j$2 = pos; j$2 < i$7;) {- if (countsAsNum.test(types[j$2])) {- if (pos < j$2) { order.splice(at, 0, new BidiSpan(1, pos, j$2)); }- var nstart = j$2;- for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {}- order.splice(at, 0, new BidiSpan(2, nstart, j$2));- pos = j$2;- } else { ++j$2; }- }- if (pos < i$7) { order.splice(at, 0, new BidiSpan(1, pos, i$7)); }- }- }- if (direction == "ltr") {- if (order[0].level == 1 && (m = str.match(/^\s+/))) {- order[0].from = m[0].length;- order.unshift(new BidiSpan(0, 0, m[0].length));- }- if (lst(order).level == 1 && (m = str.match(/\s+$/))) {- lst(order).to -= m[0].length;- order.push(new BidiSpan(0, len - m[0].length, len));- }+ // Find the line at the given vertical position, using the height+ // information in the document tree.+ function lineAtHeight(chunk, h) {+ var n = chunk.first;+ outer: do {+ for (var i$1 = 0; i$1 < chunk.children.length; ++i$1) {+ var child = chunk.children[i$1], ch = child.height;+ if (h < ch) { chunk = child; continue outer }+ h -= ch;+ n += child.chunkSize();}-- return direction == "rtl" ? order.reverse() : order+ return n+ } while (!chunk.lines)+ var i = 0;+ for (; i < chunk.lines.length; ++i) {+ var line = chunk.lines[i], lh = line.height;+ if (h < lh) { break }+ h -= lh;}- })();-- // Get the bidi ordering for the given line (and cache it). Returns- // false for lines that are fully left-to-right, and an array of- // BidiSpan objects otherwise.- function getOrder(line, direction) {- var order = line.order;- if (order == null) { order = line.order = bidiOrdering(line.text, direction); }- return order+ return n + i}- // EVENT HANDLING-- // Lightweight event framework. on/off also work on DOM nodes,- // registering native DOM handlers.-- var noHandlers = [];-- var on = function(emitter, type, f) {- if (emitter.addEventListener) {- emitter.addEventListener(type, f, false);- } else if (emitter.attachEvent) {- emitter.attachEvent("on" + type, f);- } else {- var map$$1 = emitter._handlers || (emitter._handlers = {});- map$$1[type] = (map$$1[type] || noHandlers).concat(f);- }- };-- function getHandlers(emitter, type) {- return emitter._handlers && emitter._handlers[type] || noHandlers- }-- function off(emitter, type, f) {- if (emitter.removeEventListener) {- emitter.removeEventListener(type, f, false);- } else if (emitter.detachEvent) {- emitter.detachEvent("on" + type, f);- } else {- var map$$1 = emitter._handlers, arr = map$$1 && map$$1[type];- if (arr) {- var index = indexOf(arr, f);- if (index > -1)- { map$$1[type] = arr.slice(0, index).concat(arr.slice(index + 1)); }- }- }- }+ function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size}- function signal(emitter, type /*, values...*/) {- var handlers = getHandlers(emitter, type);- if (!handlers.length) { return }- var args = Array.prototype.slice.call(arguments, 2);- for (var i = 0; i < handlers.length; ++i) { handlers[i].apply(null, args); }+ function lineNumberFor(options, i) {+ return String(options.lineNumberFormatter(i + options.firstLineNumber))}- // The DOM events that CodeMirror handles can be overridden by- // registering a (non-DOM) handler on the editor for the event name,- // and preventDefault-ing the event in that handler.- function signalDOMEvent(cm, e, override) {- if (typeof e == "string")- { e = {type: e, preventDefault: function() { this.defaultPrevented = true; }}; }- signal(cm, override || e.type, cm, e);- return e_defaultPrevented(e) || e.codemirrorIgnore- }+ // A Pos instance represents a position within the text.+ function Pos(line, ch, sticky) {+ if ( sticky === void 0 ) sticky = null;- function signalCursorActivity(cm) {- var arr = cm._handlers && cm._handlers.cursorActivity;- if (!arr) { return }- var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);- for (var i = 0; i < arr.length; ++i) { if (indexOf(set, arr[i]) == -1)- { set.push(arr[i]); } }+ if (!(this instanceof Pos)) { return new Pos(line, ch, sticky) }+ this.line = line;+ this.ch = ch;+ this.sticky = sticky;}- function hasHandler(emitter, type) {- return getHandlers(emitter, type).length > 0- }+ // Compare two positions, return 0 if they are the same, a negative+ // number when a is less, and a positive number otherwise.+ function cmp(a, b) { return a.line - b.line || a.ch - b.ch }- // Add on and off methods to a constructor's prototype, to make- // registering events on such objects more convenient.- function eventMixin(ctor) {- ctor.prototype.on = function(type, f) {on(this, type, f);};- ctor.prototype.off = function(type, f) {off(this, type, f);};- }+ function equalCursorPos(a, b) { return a.sticky == b.sticky && cmp(a, b) == 0 }- // Due to the fact that we still support jurassic IE versions, some- // compatibility wrappers are needed.+ function copyPos(x) {return Pos(x.line, x.ch)}+ function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }+ function minPos(a, b) { return cmp(a, b) < 0 ? a : b }- function e_preventDefault(e) {- if (e.preventDefault) { e.preventDefault(); }- else { e.returnValue = false; }- }- function e_stopPropagation(e) {- if (e.stopPropagation) { e.stopPropagation(); }- else { e.cancelBubble = true; }+ // Most of the external API clips given positions to make sure they+ // actually exist within the document.+ function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))}+ function clipPos(doc, pos) {+ if (pos.line < doc.first) { return Pos(doc.first, 0) }+ var last = doc.first + doc.size - 1;+ if (pos.line > last) { return Pos(last, getLine(doc, last).text.length) }+ return clipToLen(pos, getLine(doc, pos.line).text.length)}- function e_defaultPrevented(e) {- return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false+ function clipToLen(pos, linelen) {+ var ch = pos.ch;+ if (ch == null || ch > linelen) { return Pos(pos.line, linelen) }+ else if (ch < 0) { return Pos(pos.line, 0) }+ else { return pos }}- function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}-- function e_target(e) {return e.target || e.srcElement}- function e_button(e) {- var b = e.which;- if (b == null) {- if (e.button & 1) { b = 1; }- else if (e.button & 2) { b = 3; }- else if (e.button & 4) { b = 2; }- }- if (mac && e.ctrlKey && b == 1) { b = 3; }- return b+ function clipPosArray(doc, array) {+ var out = [];+ for (var i = 0; i < array.length; i++) { out[i] = clipPos(doc, array[i]); }+ return out}- // Detect drag-and-drop- var dragAndDrop = function() {- // There is *some* kind of drag-and-drop support in IE6-8, but I- // couldn't get it to work yet.- if (ie && ie_version < 9) { return false }- var div = elt('div');- return "draggable" in div || "dragDrop" in div- }();-- var zwspSupported;- function zeroWidthElement(measure) {- if (zwspSupported == null) {- var test = elt("span", "\u200b");- removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));- if (measure.firstChild.offsetHeight != 0)- { zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); }- }- var node = zwspSupported ? elt("span", "\u200b") :- elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");- node.setAttribute("cm-text", "");- return node- }+ var SavedContext = function(state, lookAhead) {+ this.state = state;+ this.lookAhead = lookAhead;+ };- // Feature-detect IE's crummy client rect reporting for bidi text- var badBidiRects;- function hasBadBidiRects(measure) {- if (badBidiRects != null) { return badBidiRects }- var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));- var r0 = range(txt, 0, 1).getBoundingClientRect();- var r1 = range(txt, 1, 2).getBoundingClientRect();- removeChildren(measure);- if (!r0 || r0.left == r0.right) { return false } // Safari returns null in some cases (#2780)- return badBidiRects = (r1.right - r0.right < 3)- }+ var Context = function(doc, state, line, lookAhead) {+ this.state = state;+ this.doc = doc;+ this.line = line;+ this.maxLookAhead = lookAhead || 0;+ this.baseTokens = null;+ this.baseTokenPos = 1;+ };- // See if "".split is the broken IE version, if so, provide an- // alternative way to split lines.- var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) {- var pos = 0, result = [], l = string.length;- while (pos <= l) {- var nl = string.indexOf("\n", pos);- if (nl == -1) { nl = string.length; }- var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);- var rt = line.indexOf("\r");- if (rt != -1) {- result.push(line.slice(0, rt));- pos += rt + 1;- } else {- result.push(line);- pos = nl + 1;- }- }- return result- } : function (string) { return string.split(/\r\n?|\n/); };+ Context.prototype.lookAhead = function (n) {+ var line = this.doc.getLine(this.line + n);+ if (line != null && n > this.maxLookAhead) { this.maxLookAhead = n; }+ return line+ };- var hasSelection = window.getSelection ? function (te) {- try { return te.selectionStart != te.selectionEnd }- catch(e) { return false }- } : function (te) {- var range$$1;- try {range$$1 = te.ownerDocument.selection.createRange();}- catch(e) {}- if (!range$$1 || range$$1.parentElement() != te) { return false }- return range$$1.compareEndPoints("StartToEnd", range$$1) != 0+ Context.prototype.baseToken = function (n) {+ if (!this.baseTokens) { return null }+ while (this.baseTokens[this.baseTokenPos] <= n)+ { this.baseTokenPos += 2; }+ var type = this.baseTokens[this.baseTokenPos + 1];+ return {type: type && type.replace(/( |^)overlay .*/, ""),+ size: this.baseTokens[this.baseTokenPos] - n}};- var hasCopyEvent = (function () {- var e = elt("div");- if ("oncopy" in e) { return true }- e.setAttribute("oncopy", "return;");- return typeof e.oncopy == "function"- })();+ Context.prototype.nextLine = function () {+ this.line++;+ if (this.maxLookAhead > 0) { this.maxLookAhead--; }+ };- var badZoomedRects = null;- function hasBadZoomedRects(measure) {- if (badZoomedRects != null) { return badZoomedRects }- var node = removeChildrenAndAdd(measure, elt("span", "x"));- var normal = node.getBoundingClientRect();- var fromRange = range(node, 0, 1).getBoundingClientRect();- return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1- }+ Context.fromSaved = function (doc, saved, line) {+ if (saved instanceof SavedContext)+ { return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead) }+ else+ { return new Context(doc, copyState(doc.mode, saved), line) }+ };- // Known modes, by name and by MIME- var modes = {}, mimeModes = {};+ Context.prototype.save = function (copy) {+ var state = copy !== false ? copyState(this.doc.mode, this.state) : this.state;+ return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state+ };- // Extra arguments are stored as the mode's dependencies, which is- // used by (legacy) mechanisms like loadmode.js to automatically- // load a mode. (Preferred mechanism is the require/define calls.)- function defineMode(name, mode) {- if (arguments.length > 2)- { mode.dependencies = Array.prototype.slice.call(arguments, 2); }- modes[name] = mode;- }- function defineMIME(mime, spec) {- mimeModes[mime] = spec;- }+ // Compute a style array (an array starting with a mode generation+ // -- for invalidation -- followed by pairs of end positions and+ // style strings), which is used to highlight the tokens on the+ // line.+ function highlightLine(cm, line, context, forceToEnd) {+ // A styles array always starts with a number identifying the+ // mode/overlays that it is based on (for easy invalidation).+ var st = [cm.state.modeGen], lineClasses = {};+ // Compute the base array of styles+ runMode(cm, line.text, cm.doc.mode, context, function (end, style) { return st.push(end, style); },+ lineClasses, forceToEnd);+ var state = context.state;- // Given a MIME type, a {name, ...options} config object, or a name- // string, return a mode config object.- function resolveMode(spec) {- if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {- spec = mimeModes[spec];- } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {- var found = mimeModes[spec.name];- if (typeof found == "string") { found = {name: found}; }- spec = createObj(found, spec);- spec.name = found.name;- } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {- return resolveMode("application/xml")- } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {- return resolveMode("application/json")- }- if (typeof spec == "string") { return {name: spec} }- else { return spec || {name: "null"} }- }+ // Run overlays, adjust style array.+ var loop = function ( o ) {+ context.baseTokens = st;+ var overlay = cm.state.overlays[o], i = 1, at = 0;+ context.state = true;+ runMode(cm, line.text, overlay.mode, context, function (end, style) {+ var start = i;+ // Ensure there's a token end at the current position, and that i points at it+ while (at < end) {+ var i_end = st[i];+ if (i_end > end)+ { st.splice(i, 1, end, st[i+1], i_end); }+ i += 2;+ at = Math.min(end, i_end);+ }+ if (!style) { return }+ if (overlay.opaque) {+ st.splice(start, i - start, end, "overlay " + style);+ i = start + 2;+ } else {+ for (; start < i; start += 2) {+ var cur = st[start+1];+ st[start+1] = (cur ? cur + " " : "") + "overlay " + style;+ }+ }+ }, lineClasses);+ context.state = state;+ context.baseTokens = null;+ context.baseTokenPos = 1;+ };- // Given a mode spec (anything that resolveMode accepts), find and- // initialize an actual mode object.- function getMode(options, spec) {- spec = resolveMode(spec);- var mfactory = modes[spec.name];- if (!mfactory) { return getMode(options, "text/plain") }- var modeObj = mfactory(options, spec);- if (modeExtensions.hasOwnProperty(spec.name)) {- var exts = modeExtensions[spec.name];- for (var prop in exts) {- if (!exts.hasOwnProperty(prop)) { continue }- if (modeObj.hasOwnProperty(prop)) { modeObj["_" + prop] = modeObj[prop]; }- modeObj[prop] = exts[prop];- }- }- modeObj.name = spec.name;- if (spec.helperType) { modeObj.helperType = spec.helperType; }- if (spec.modeProps) { for (var prop$1 in spec.modeProps)- { modeObj[prop$1] = spec.modeProps[prop$1]; } }+ for (var o = 0; o < cm.state.overlays.length; ++o) loop( o );- return modeObj+ return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}}- // This can be used to attach properties to mode objects from- // outside the actual mode definition.- var modeExtensions = {};- function extendMode(mode, properties) {- var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});- copyObj(properties, exts);+ function getLineStyles(cm, line, updateFrontier) {+ if (!line.styles || line.styles[0] != cm.state.modeGen) {+ var context = getContextBefore(cm, lineNo(line));+ var resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state);+ var result = highlightLine(cm, line, context);+ if (resetState) { context.state = resetState; }+ line.stateAfter = context.save(!resetState);+ line.styles = result.styles;+ if (result.classes) { line.styleClasses = result.classes; }+ else if (line.styleClasses) { line.styleClasses = null; }+ if (updateFrontier === cm.doc.highlightFrontier)+ { cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier); }+ }+ return line.styles}- function copyState(mode, state) {- if (state === true) { return state }- if (mode.copyState) { return mode.copyState(state) }- var nstate = {};- for (var n in state) {- var val = state[n];- if (val instanceof Array) { val = val.concat([]); }- nstate[n] = val;- }- return nstate+ function getContextBefore(cm, n, precise) {+ var doc = cm.doc, display = cm.display;+ if (!doc.mode.startState) { return new Context(doc, true, n) }+ var start = findStartLine(cm, n, precise);+ var saved = start > doc.first && getLine(doc, start - 1).stateAfter;+ var context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start);++ doc.iter(start, n, function (line) {+ processLine(cm, line.text, context);+ var pos = context.line;+ line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null;+ context.nextLine();+ });+ if (precise) { doc.modeFrontier = context.line; }+ return context}- // Given a mode and a state (for that mode), find the inner mode and- // state at the position that the state refers to.- function innerMode(mode, state) {- var info;- while (mode.innerMode) {- info = mode.innerMode(state);- if (!info || info.mode == mode) { break }- state = info.state;- mode = info.mode;+ // Lightweight form of highlight -- proceed over this line and+ // update state, but don't save a style array. Used for lines that+ // aren't currently visible.+ function processLine(cm, text, context, startAt) {+ var mode = cm.doc.mode;+ var stream = new StringStream(text, cm.options.tabSize, context);+ stream.start = stream.pos = startAt || 0;+ if (text == "") { callBlankLine(mode, context.state); }+ while (!stream.eol()) {+ readToken(mode, stream, context.state);+ stream.start = stream.pos;}- return info || {mode: mode, state: state}}- function startState(mode, a1, a2) {- return mode.startState ? mode.startState(a1, a2) : true+ function callBlankLine(mode, state) {+ if (mode.blankLine) { return mode.blankLine(state) }+ if (!mode.innerMode) { return }+ var inner = innerMode(mode, state);+ if (inner.mode.blankLine) { return inner.mode.blankLine(inner.state) }}- // STRING STREAM-- // Fed to the mode parsers, provides helper functions to make- // parsers more succinct.-- var StringStream = function(string, tabSize, lineOracle) {- this.pos = this.start = 0;- this.string = string;- this.tabSize = tabSize || 8;- this.lastColumnPos = this.lastColumnValue = 0;- this.lineStart = 0;- this.lineOracle = lineOracle;- };-- StringStream.prototype.eol = function () {return this.pos >= this.string.length};- StringStream.prototype.sol = function () {return this.pos == this.lineStart};- StringStream.prototype.peek = function () {return this.string.charAt(this.pos) || undefined};- StringStream.prototype.next = function () {- if (this.pos < this.string.length)- { return this.string.charAt(this.pos++) }- };- StringStream.prototype.eat = function (match) {- var ch = this.string.charAt(this.pos);- var ok;- if (typeof match == "string") { ok = ch == match; }- else { ok = ch && (match.test ? match.test(ch) : match(ch)); }- if (ok) {++this.pos; return ch}- };- StringStream.prototype.eatWhile = function (match) {- var start = this.pos;- while (this.eat(match)){}- return this.pos > start- };- StringStream.prototype.eatSpace = function () {- var this$1 = this;-- var start = this.pos;- while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { ++this$1.pos; }- return this.pos > start- };- StringStream.prototype.skipToEnd = function () {this.pos = this.string.length;};- StringStream.prototype.skipTo = function (ch) {- var found = this.string.indexOf(ch, this.pos);- if (found > -1) {this.pos = found; return true}- };- StringStream.prototype.backUp = function (n) {this.pos -= n;};- StringStream.prototype.column = function () {- if (this.lastColumnPos < this.start) {- this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);- this.lastColumnPos = this.start;- }- return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)- };- StringStream.prototype.indentation = function () {- return countColumn(this.string, null, this.tabSize) -- (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)- };- StringStream.prototype.match = function (pattern, consume, caseInsensitive) {- if (typeof pattern == "string") {- var cased = function (str) { return caseInsensitive ? str.toLowerCase() : str; };- var substr = this.string.substr(this.pos, pattern.length);- if (cased(substr) == cased(pattern)) {- if (consume !== false) { this.pos += pattern.length; }- return true- }- } else {- var match = this.string.slice(this.pos).match(pattern);- if (match && match.index > 0) { return null }- if (match && consume !== false) { this.pos += match[0].length; }- return match+ function readToken(mode, stream, state, inner) {+ for (var i = 0; i < 10; i++) {+ if (inner) { inner[0] = innerMode(mode, state).mode; }+ var style = mode.token(stream, state);+ if (stream.pos > stream.start) { return style }}- };- StringStream.prototype.current = function (){return this.string.slice(this.start, this.pos)};- StringStream.prototype.hideFirstChars = function (n, inner) {- this.lineStart += n;- try { return inner() }- finally { this.lineStart -= n; }- };- StringStream.prototype.lookAhead = function (n) {- var oracle = this.lineOracle;- return oracle && oracle.lookAhead(n)- };- StringStream.prototype.baseToken = function () {- var oracle = this.lineOracle;- return oracle && oracle.baseToken(this.pos)- };-- var SavedContext = function(state, lookAhead) {- this.state = state;- this.lookAhead = lookAhead;- };+ throw new Error("Mode " + mode.name + " failed to advance stream.")+ }- var Context = function(doc, state, line, lookAhead) {+ var Token = function(stream, type, state) {+ this.start = stream.start; this.end = stream.pos;+ this.string = stream.current();+ this.type = type || null;this.state = state;- this.doc = doc;- this.line = line;- this.maxLookAhead = lookAhead || 0;- this.baseTokens = null;- this.baseTokenPos = 1;- };-- Context.prototype.lookAhead = function (n) {- var line = this.doc.getLine(this.line + n);- if (line != null && n > this.maxLookAhead) { this.maxLookAhead = n; }- return line};- Context.prototype.baseToken = function (n) {- var this$1 = this;-- if (!this.baseTokens) { return null }- while (this.baseTokens[this.baseTokenPos] <= n)- { this$1.baseTokenPos += 2; }- var type = this.baseTokens[this.baseTokenPos + 1];- return {type: type && type.replace(/( |^)overlay .*/, ""),- size: this.baseTokens[this.baseTokenPos] - n}- };+ // Utility for getTokenAt and getLineTokens+ function takeToken(cm, pos, precise, asArray) {+ var doc = cm.doc, mode = doc.mode, style;+ pos = clipPos(doc, pos);+ var line = getLine(doc, pos.line), context = getContextBefore(cm, pos.line, precise);+ var stream = new StringStream(line.text, cm.options.tabSize, context), tokens;+ if (asArray) { tokens = []; }+ while ((asArray || stream.pos < pos.ch) && !stream.eol()) {+ stream.start = stream.pos;+ style = readToken(mode, stream, context.state);+ if (asArray) { tokens.push(new Token(stream, style, copyState(doc.mode, context.state))); }+ }+ return asArray ? tokens : new Token(stream, style, context.state)+ }- Context.prototype.nextLine = function () {- this.line++;- if (this.maxLookAhead > 0) { this.maxLookAhead--; }- };+ function extractLineClasses(type, output) {+ if (type) { for (;;) {+ var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);+ if (!lineClass) { break }+ type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);+ var prop = lineClass[1] ? "bgClass" : "textClass";+ if (output[prop] == null)+ { output[prop] = lineClass[2]; }+ else if (!(new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)")).test(output[prop]))+ { output[prop] += " " + lineClass[2]; }+ } }+ return type+ }- Context.fromSaved = function (doc, saved, line) {- if (saved instanceof SavedContext)- { return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead) }- else- { return new Context(doc, copyState(doc.mode, saved), line) }- };+ // Run the given mode's parser over a line, calling f for each token.+ function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) {+ var flattenSpans = mode.flattenSpans;+ if (flattenSpans == null) { flattenSpans = cm.options.flattenSpans; }+ var curStart = 0, curStyle = null;+ var stream = new StringStream(text, cm.options.tabSize, context), style;+ var inner = cm.options.addModeClass && [null];+ if (text == "") { extractLineClasses(callBlankLine(mode, context.state), lineClasses); }+ while (!stream.eol()) {+ if (stream.pos > cm.options.maxHighlightLength) {+ flattenSpans = false;+ if (forceToEnd) { processLine(cm, text, context, stream.pos); }+ stream.pos = text.length;+ style = null;+ } else {+ style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses);+ }+ if (inner) {+ var mName = inner[0].name;+ if (mName) { style = "m-" + (style ? mName + " " + style : mName); }+ }+ if (!flattenSpans || curStyle != style) {+ while (curStart < stream.start) {+ curStart = Math.min(stream.start, curStart + 5000);+ f(curStart, curStyle);+ }+ curStyle = style;+ }+ stream.start = stream.pos;+ }+ while (curStart < stream.pos) {+ // Webkit seems to refuse to render text nodes longer than 57444+ // characters, and returns inaccurate measurements in nodes+ // starting around 5000 chars.+ var pos = Math.min(stream.pos, curStart + 5000);+ f(pos, curStyle);+ curStart = pos;+ }+ }- Context.prototype.save = function (copy) {- var state = copy !== false ? copyState(this.doc.mode, this.state) : this.state;- return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state- };+ // Finds the line to start with when starting a parse. Tries to+ // find a line with a stateAfter, so that it can start with a+ // valid state. If that fails, it returns the line with the+ // smallest indentation, which tends to need the least context to+ // parse correctly.+ function findStartLine(cm, n, precise) {+ var minindent, minline, doc = cm.doc;+ var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);+ for (var search = n; search > lim; --search) {+ if (search <= doc.first) { return doc.first }+ var line = getLine(doc, search - 1), after = line.stateAfter;+ if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier))+ { return search }+ var indented = countColumn(line.text, null, cm.options.tabSize);+ if (minline == null || minindent > indented) {+ minline = search - 1;+ minindent = indented;+ }+ }+ return minline+ }+ function retreatFrontier(doc, n) {+ doc.modeFrontier = Math.min(doc.modeFrontier, n);+ if (doc.highlightFrontier < n - 10) { return }+ var start = doc.first;+ for (var line = n - 1; line > start; line--) {+ var saved = getLine(doc, line).stateAfter;+ // change is on 3+ // state on line 1 looked ahead 2 -- so saw 3+ // test 1 + 2 < 3 should cover this+ if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) {+ start = line + 1;+ break+ }+ }+ doc.highlightFrontier = Math.min(doc.highlightFrontier, start);+ }- // Compute a style array (an array starting with a mode generation- // -- for invalidation -- followed by pairs of end positions and- // style strings), which is used to highlight the tokens on the- // line.- function highlightLine(cm, line, context, forceToEnd) {- // A styles array always starts with a number identifying the- // mode/overlays that it is based on (for easy invalidation).- var st = [cm.state.modeGen], lineClasses = {};- // Compute the base array of styles- runMode(cm, line.text, cm.doc.mode, context, function (end, style) { return st.push(end, style); },- lineClasses, forceToEnd);- var state = context.state;+ // Optimize some code when these features are not used.+ var sawReadOnlySpans = false, sawCollapsedSpans = false;++ function seeReadOnlySpans() {+ sawReadOnlySpans = true;+ }++ function seeCollapsedSpans() {+ sawCollapsedSpans = true;+ }++ // TEXTMARKER SPANS++ function MarkedSpan(marker, from, to) {+ this.marker = marker;+ this.from = from; this.to = to;+ }++ // Search an array of spans for a span matching the given marker.+ function getMarkedSpanFor(spans, marker) {+ if (spans) { for (var i = 0; i < spans.length; ++i) {+ var span = spans[i];+ if (span.marker == marker) { return span }+ } }+ }++ // Remove a span from an array, returning undefined if no spans are+ // left (we don't store arrays for lines without spans).+ function removeMarkedSpan(spans, span) {+ var r;+ for (var i = 0; i < spans.length; ++i)+ { if (spans[i] != span) { (r || (r = [])).push(spans[i]); } }+ return r+ }++ // Add a span to a line.+ function addMarkedSpan(line, span, op) {+ var inThisOp = op && window.WeakSet && (op.markedSpans || (op.markedSpans = new WeakSet));+ if (inThisOp && line.markedSpans && inThisOp.has(line.markedSpans)) {+ line.markedSpans.push(span);+ } else {+ line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];+ if (inThisOp) { inThisOp.add(line.markedSpans); }+ }+ span.marker.attachLine(line);+ }++ // Used for the algorithm that adjusts markers for a change in the+ // document. These functions cut an array of spans at a given+ // character position, returning an array of remaining chunks (or+ // undefined if nothing remains).+ function markedSpansBefore(old, startCh, isInsert) {+ var nw;+ if (old) { for (var i = 0; i < old.length; ++i) {+ var span = old[i], marker = span.marker;+ var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);+ if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {+ var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh)+ ;(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));+ }+ } }+ return nw+ }+ function markedSpansAfter(old, endCh, isInsert) {+ var nw;+ if (old) { for (var i = 0; i < old.length; ++i) {+ var span = old[i], marker = span.marker;+ var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);+ if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {+ var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh)+ ;(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,+ span.to == null ? null : span.to - endCh));+ }+ } }+ return nw+ }++ // Given a change object, compute the new set of marker spans that+ // cover the line in which the change took place. Removes spans+ // entirely within the change, reconnects spans belonging to the+ // same marker that appear on both sides of the change, and cuts off+ // spans partially within the change. Returns an array of span+ // arrays with one element for each line in (after) the change.+ function stretchSpansOverChange(doc, change) {+ if (change.full) { return null }+ var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;+ var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;+ if (!oldFirst && !oldLast) { return null }++ var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;+ // Get the spans that 'stick out' on both sides+ var first = markedSpansBefore(oldFirst, startCh, isInsert);+ var last = markedSpansAfter(oldLast, endCh, isInsert);++ // Next, merge those two ends+ var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);+ if (first) {+ // Fix up .to properties of first+ for (var i = 0; i < first.length; ++i) {+ var span = first[i];+ if (span.to == null) {+ var found = getMarkedSpanFor(last, span.marker);+ if (!found) { span.to = startCh; }+ else if (sameLine) { span.to = found.to == null ? null : found.to + offset; }+ }+ }+ }+ if (last) {+ // Fix up .from in last (or move them into first in case of sameLine)+ for (var i$1 = 0; i$1 < last.length; ++i$1) {+ var span$1 = last[i$1];+ if (span$1.to != null) { span$1.to += offset; }+ if (span$1.from == null) {+ var found$1 = getMarkedSpanFor(first, span$1.marker);+ if (!found$1) {+ span$1.from = offset;+ if (sameLine) { (first || (first = [])).push(span$1); }+ }+ } else {+ span$1.from += offset;+ if (sameLine) { (first || (first = [])).push(span$1); }+ }+ }+ }+ // Make sure we didn't create any zero-length spans+ if (first) { first = clearEmptySpans(first); }+ if (last && last != first) { last = clearEmptySpans(last); }++ var newMarkers = [first];+ if (!sameLine) {+ // Fill gap with whole-line-spans+ var gap = change.text.length - 2, gapMarkers;+ if (gap > 0 && first)+ { for (var i$2 = 0; i$2 < first.length; ++i$2)+ { if (first[i$2].to == null)+ { (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$2].marker, null, null)); } } }+ for (var i$3 = 0; i$3 < gap; ++i$3)+ { newMarkers.push(gapMarkers); }+ newMarkers.push(last);+ }+ return newMarkers+ }++ // Remove spans that are empty and don't have a clearWhenEmpty+ // option of false.+ function clearEmptySpans(spans) {+ for (var i = 0; i < spans.length; ++i) {+ var span = spans[i];+ if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)+ { spans.splice(i--, 1); }+ }+ if (!spans.length) { return null }+ return spans+ }++ // Used to 'clip' out readOnly ranges when making a change.+ function removeReadOnlyRanges(doc, from, to) {+ var markers = null;+ doc.iter(from.line, to.line + 1, function (line) {+ if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {+ var mark = line.markedSpans[i].marker;+ if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))+ { (markers || (markers = [])).push(mark); }+ } }+ });+ if (!markers) { return null }+ var parts = [{from: from, to: to}];+ for (var i = 0; i < markers.length; ++i) {+ var mk = markers[i], m = mk.find(0);+ for (var j = 0; j < parts.length; ++j) {+ var p = parts[j];+ if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { continue }+ var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);+ if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)+ { newParts.push({from: p.from, to: m.from}); }+ if (dto > 0 || !mk.inclusiveRight && !dto)+ { newParts.push({from: m.to, to: p.to}); }+ parts.splice.apply(parts, newParts);+ j += newParts.length - 3;+ }+ }+ return parts+ }- // Run overlays, adjust style array.- var loop = function ( o ) {- context.baseTokens = st;- var overlay = cm.state.overlays[o], i = 1, at = 0;- context.state = true;- runMode(cm, line.text, overlay.mode, context, function (end, style) {- var start = i;- // Ensure there's a token end at the current position, and that i points at it- while (at < end) {- var i_end = st[i];- if (i_end > end)- { st.splice(i, 1, end, st[i+1], i_end); }- i += 2;- at = Math.min(end, i_end);- }- if (!style) { return }- if (overlay.opaque) {- st.splice(start, i - start, end, "overlay " + style);- i = start + 2;- } else {- for (; start < i; start += 2) {- var cur = st[start+1];- st[start+1] = (cur ? cur + " " : "") + "overlay " + style;- }- }- }, lineClasses);- context.state = state;- context.baseTokens = null;- context.baseTokenPos = 1;- };+ // Connect or disconnect spans from a line.+ function detachMarkedSpans(line) {+ var spans = line.markedSpans;+ if (!spans) { return }+ for (var i = 0; i < spans.length; ++i)+ { spans[i].marker.detachLine(line); }+ line.markedSpans = null;+ }+ function attachMarkedSpans(line, spans) {+ if (!spans) { return }+ for (var i = 0; i < spans.length; ++i)+ { spans[i].marker.attachLine(line); }+ line.markedSpans = spans;+ }- for (var o = 0; o < cm.state.overlays.length; ++o) loop( o );+ // Helpers used when computing which overlapping collapsed span+ // counts as the larger one.+ function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0 }+ function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 }- return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}+ // Returns a number indicating which of two overlapping collapsed+ // spans is larger (and thus includes the other). Falls back to+ // comparing ids when the spans cover exactly the same range.+ function compareCollapsedMarkers(a, b) {+ var lenDiff = a.lines.length - b.lines.length;+ if (lenDiff != 0) { return lenDiff }+ var aPos = a.find(), bPos = b.find();+ var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);+ if (fromCmp) { return -fromCmp }+ var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);+ if (toCmp) { return toCmp }+ return b.id - a.id}- function getLineStyles(cm, line, updateFrontier) {- if (!line.styles || line.styles[0] != cm.state.modeGen) {- var context = getContextBefore(cm, lineNo(line));- var resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state);- var result = highlightLine(cm, line, context);- if (resetState) { context.state = resetState; }- line.stateAfter = context.save(!resetState);- line.styles = result.styles;- if (result.classes) { line.styleClasses = result.classes; }- else if (line.styleClasses) { line.styleClasses = null; }- if (updateFrontier === cm.doc.highlightFrontier)- { cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier); }- }- return line.styles+ // Find out whether a line ends or starts in a collapsed span. If+ // so, return the marker for that span.+ function collapsedSpanAtSide(line, start) {+ var sps = sawCollapsedSpans && line.markedSpans, found;+ if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {+ sp = sps[i];+ if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&+ (!found || compareCollapsedMarkers(found, sp.marker) < 0))+ { found = sp.marker; }+ } }+ return found}+ function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }+ function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }- function getContextBefore(cm, n, precise) {- var doc = cm.doc, display = cm.display;- if (!doc.mode.startState) { return new Context(doc, true, n) }- var start = findStartLine(cm, n, precise);- var saved = start > doc.first && getLine(doc, start - 1).stateAfter;- var context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start);+ function collapsedSpanAround(line, ch) {+ var sps = sawCollapsedSpans && line.markedSpans, found;+ if (sps) { for (var i = 0; i < sps.length; ++i) {+ var sp = sps[i];+ if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) &&+ (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { found = sp.marker; }+ } }+ return found+ }- doc.iter(start, n, function (line) {- processLine(cm, line.text, context);- var pos = context.line;- line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null;- context.nextLine();- });- if (precise) { doc.modeFrontier = context.line; }- return context+ // Test whether there exists a collapsed span that partially+ // overlaps (covers the start or end, but not both) of a new span.+ // Such overlap is not allowed.+ function conflictingCollapsedRange(doc, lineNo, from, to, marker) {+ var line = getLine(doc, lineNo);+ var sps = sawCollapsedSpans && line.markedSpans;+ if (sps) { for (var i = 0; i < sps.length; ++i) {+ var sp = sps[i];+ if (!sp.marker.collapsed) { continue }+ var found = sp.marker.find(0);+ var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);+ var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);+ if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { continue }+ if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||+ fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))+ { return true }+ } }}- // Lightweight form of highlight -- proceed over this line and- // update state, but don't save a style array. Used for lines that- // aren't currently visible.- function processLine(cm, text, context, startAt) {- var mode = cm.doc.mode;- var stream = new StringStream(text, cm.options.tabSize, context);- stream.start = stream.pos = startAt || 0;- if (text == "") { callBlankLine(mode, context.state); }- while (!stream.eol()) {- readToken(mode, stream, context.state);- stream.start = stream.pos;- }+ // A visual line is a line as drawn on the screen. Folding, for+ // example, can cause multiple logical lines to appear on the same+ // visual line. This finds the start of the visual line that the+ // given line is part of (usually that is the line itself).+ function visualLine(line) {+ var merged;+ while (merged = collapsedSpanAtStart(line))+ { line = merged.find(-1, true).line; }+ return line}- function callBlankLine(mode, state) {- if (mode.blankLine) { return mode.blankLine(state) }- if (!mode.innerMode) { return }- var inner = innerMode(mode, state);- if (inner.mode.blankLine) { return inner.mode.blankLine(inner.state) }+ function visualLineEnd(line) {+ var merged;+ while (merged = collapsedSpanAtEnd(line))+ { line = merged.find(1, true).line; }+ return line}- function readToken(mode, stream, state, inner) {- for (var i = 0; i < 10; i++) {- if (inner) { inner[0] = innerMode(mode, state).mode; }- var style = mode.token(stream, state);- if (stream.pos > stream.start) { return style }+ // Returns an array of logical lines that continue the visual line+ // started by the argument, or undefined if there are no such lines.+ function visualLineContinued(line) {+ var merged, lines;+ while (merged = collapsedSpanAtEnd(line)) {+ line = merged.find(1, true).line+ ;(lines || (lines = [])).push(line);}- throw new Error("Mode " + mode.name + " failed to advance stream.")+ return lines}- var Token = function(stream, type, state) {- this.start = stream.start; this.end = stream.pos;- this.string = stream.current();- this.type = type || null;- this.state = state;- };-- // Utility for getTokenAt and getLineTokens- function takeToken(cm, pos, precise, asArray) {- var doc = cm.doc, mode = doc.mode, style;- pos = clipPos(doc, pos);- var line = getLine(doc, pos.line), context = getContextBefore(cm, pos.line, precise);- var stream = new StringStream(line.text, cm.options.tabSize, context), tokens;- if (asArray) { tokens = []; }- while ((asArray || stream.pos < pos.ch) && !stream.eol()) {- stream.start = stream.pos;- style = readToken(mode, stream, context.state);- if (asArray) { tokens.push(new Token(stream, style, copyState(doc.mode, context.state))); }- }- return asArray ? tokens : new Token(stream, style, context.state)+ // Get the line number of the start of the visual line that the+ // given line number is part of.+ function visualLineNo(doc, lineN) {+ var line = getLine(doc, lineN), vis = visualLine(line);+ if (line == vis) { return lineN }+ return lineNo(vis)}- function extractLineClasses(type, output) {- if (type) { for (;;) {- var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);- if (!lineClass) { break }- type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);- var prop = lineClass[1] ? "bgClass" : "textClass";- if (output[prop] == null)- { output[prop] = lineClass[2]; }- else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))- { output[prop] += " " + lineClass[2]; }- } }- return type+ // Get the line number of the start of the next visual line after+ // the given line.+ function visualLineEndNo(doc, lineN) {+ if (lineN > doc.lastLine()) { return lineN }+ var line = getLine(doc, lineN), merged;+ if (!lineIsHidden(doc, line)) { return lineN }+ while (merged = collapsedSpanAtEnd(line))+ { line = merged.find(1, true).line; }+ return lineNo(line) + 1}- // Run the given mode's parser over a line, calling f for each token.- function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) {- var flattenSpans = mode.flattenSpans;- if (flattenSpans == null) { flattenSpans = cm.options.flattenSpans; }- var curStart = 0, curStyle = null;- var stream = new StringStream(text, cm.options.tabSize, context), style;- var inner = cm.options.addModeClass && [null];- if (text == "") { extractLineClasses(callBlankLine(mode, context.state), lineClasses); }- while (!stream.eol()) {- if (stream.pos > cm.options.maxHighlightLength) {- flattenSpans = false;- if (forceToEnd) { processLine(cm, text, context, stream.pos); }- stream.pos = text.length;- style = null;- } else {- style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses);- }- if (inner) {- var mName = inner[0].name;- if (mName) { style = "m-" + (style ? mName + " " + style : mName); }- }- if (!flattenSpans || curStyle != style) {- while (curStart < stream.start) {- curStart = Math.min(stream.start, curStart + 5000);- f(curStart, curStyle);- }- curStyle = style;- }- stream.start = stream.pos;+ // Compute whether a line is hidden. Lines count as hidden when they+ // are part of a visual line that starts with another line, or when+ // they are entirely covered by collapsed, non-widget span.+ function lineIsHidden(doc, line) {+ var sps = sawCollapsedSpans && line.markedSpans;+ if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {+ sp = sps[i];+ if (!sp.marker.collapsed) { continue }+ if (sp.from == null) { return true }+ if (sp.marker.widgetNode) { continue }+ if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))+ { return true }+ } }+ }+ function lineIsHiddenInner(doc, line, span) {+ if (span.to == null) {+ var end = span.marker.find(1, true);+ return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker))}- while (curStart < stream.pos) {- // Webkit seems to refuse to render text nodes longer than 57444- // characters, and returns inaccurate measurements in nodes- // starting around 5000 chars.- var pos = Math.min(stream.pos, curStart + 5000);- f(pos, curStyle);- curStart = pos;+ if (span.marker.inclusiveRight && span.to == line.text.length)+ { return true }+ for (var sp = (void 0), i = 0; i < line.markedSpans.length; ++i) {+ sp = line.markedSpans[i];+ if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&+ (sp.to == null || sp.to != span.from) &&+ (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&+ lineIsHiddenInner(doc, line, sp)) { return true }}}- // Finds the line to start with when starting a parse. Tries to- // find a line with a stateAfter, so that it can start with a- // valid state. If that fails, it returns the line with the- // smallest indentation, which tends to need the least context to- // parse correctly.- function findStartLine(cm, n, precise) {- var minindent, minline, doc = cm.doc;- var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);- for (var search = n; search > lim; --search) {- if (search <= doc.first) { return doc.first }- var line = getLine(doc, search - 1), after = line.stateAfter;- if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier))- { return search }- var indented = countColumn(line.text, null, cm.options.tabSize);- if (minline == null || minindent > indented) {- minline = search - 1;- minindent = indented;+ // Find the height above the given line.+ function heightAtLine(lineObj) {+ lineObj = visualLine(lineObj);++ var h = 0, chunk = lineObj.parent;+ for (var i = 0; i < chunk.lines.length; ++i) {+ var line = chunk.lines[i];+ if (line == lineObj) { break }+ else { h += line.height; }+ }+ for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {+ for (var i$1 = 0; i$1 < p.children.length; ++i$1) {+ var cur = p.children[i$1];+ if (cur == chunk) { break }+ else { h += cur.height; }}}- return minline+ return h}- function retreatFrontier(doc, n) {- doc.modeFrontier = Math.min(doc.modeFrontier, n);- if (doc.highlightFrontier < n - 10) { return }- var start = doc.first;- for (var line = n - 1; line > start; line--) {- var saved = getLine(doc, line).stateAfter;- // change is on 3- // state on line 1 looked ahead 2 -- so saw 3- // test 1 + 2 < 3 should cover this- if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) {- start = line + 1;- break- }+ // Compute the character length of a line, taking into account+ // collapsed ranges (see markText) that might hide parts, and join+ // other lines onto it.+ function lineLength(line) {+ if (line.height == 0) { return 0 }+ var len = line.text.length, merged, cur = line;+ while (merged = collapsedSpanAtStart(cur)) {+ var found = merged.find(0, true);+ cur = found.from.line;+ len += found.from.ch - found.to.ch;}- doc.highlightFrontier = Math.min(doc.highlightFrontier, start);+ cur = line;+ while (merged = collapsedSpanAtEnd(cur)) {+ var found$1 = merged.find(0, true);+ len -= cur.text.length - found$1.from.ch;+ cur = found$1.to.line;+ len += cur.text.length - found$1.to.ch;+ }+ return len+ }++ // Find the longest line in the document.+ function findMaxLine(cm) {+ var d = cm.display, doc = cm.doc;+ d.maxLine = getLine(doc, doc.first);+ d.maxLineLength = lineLength(d.maxLine);+ d.maxLineChanged = true;+ doc.iter(function (line) {+ var len = lineLength(line);+ if (len > d.maxLineLength) {+ d.maxLineLength = len;+ d.maxLine = line;+ }+ });}// LINE DATA STRUCTURE@@ -1929,7 +1854,7 @@}}builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32;- if (style || startStyle || endStyle || mustWrap || css) {+ if (style || startStyle || endStyle || mustWrap || css || attributes) {var fullStyle = style || "";if (startStyle) { fullStyle += startStyle; }if (endStyle) { fullStyle += endStyle; }@@ -2274,6 +2199,7 @@if (cm.options.lineNumbers || markers) {var wrap$1 = ensureLineWrapped(lineView);var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"));+ gutterWrap.setAttribute("aria-hidden", "true");cm.display.input.setUneditable(gutterWrap);wrap$1.insertBefore(gutterWrap, lineView.text);if (lineView.line.gutterClass)@@ -2283,8 +2209,8 @@elt("div", lineNumberFor(cm.options, lineN),"CodeMirror-linenumber CodeMirror-gutter-elt",("left: " + (dims.gutterLeft["CodeMirror-linenumbers"]) + "px; width: " + (cm.display.lineNumInnerWidth) + "px"))); }- if (markers) { for (var k = 0; k < cm.options.gutters.length; ++k) {- var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];+ if (markers) { for (var k = 0; k < cm.display.gutterSpecs.length; ++k) {+ var id = cm.display.gutterSpecs[k].className, found = markers.hasOwnProperty(id) && markers[id];if (found){ gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt",("left: " + (dims.gutterLeft[id]) + "px; width: " + (dims.gutterWidth[id]) + "px"))); }@@ -2294,10 +2220,10 @@function updateLineWidgets(cm, lineView, dims) {if (lineView.alignable) { lineView.alignable = null; }+ var isWidget = classTest("CodeMirror-linewidget");for (var node = lineView.node.firstChild, next = (void 0); node; node = next) {next = node.nextSibling;- if (node.className == "CodeMirror-linewidget")- { lineView.node.removeChild(node); }+ if (isWidget.test(node.className)) { lineView.node.removeChild(node); }}insertLineWidgets(cm, lineView, dims);}@@ -2327,7 +2253,7 @@if (!line.widgets) { return }var wrap = ensureLineWrapped(lineView);for (var i = 0, ws = line.widgets; i < ws.length; ++i) {- var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");+ var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : ""));if (!widget.handleMouseEvents) { node.setAttribute("cm-ignore-events", "true"); }positionLineWidget(widget, node, lineView, dims);cm.display.input.setUneditable(node);@@ -2387,7 +2313,7 @@function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}function paddingH(display) {if (display.cachedPaddingH) { return display.cachedPaddingH }- var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));+ var e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like"));var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};if (!isNaN(data.left) && !isNaN(data.right)) { display.cachedPaddingH = data; }@@ -2430,12 +2356,14 @@function mapFromLineView(lineView, line, lineN) {if (lineView.line == line){ return {map: lineView.measure.map, cache: lineView.measure.cache} }- for (var i = 0; i < lineView.rest.length; i++)- { if (lineView.rest[i] == line)- { return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]} } }- for (var i$1 = 0; i$1 < lineView.rest.length; i$1++)- { if (lineNo(lineView.rest[i$1]) > lineN)- { return {map: lineView.measure.maps[i$1], cache: lineView.measure.caches[i$1], before: true} } }+ if (lineView.rest) {+ for (var i = 0; i < lineView.rest.length; i++)+ { if (lineView.rest[i] == line)+ { return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]} } }+ for (var i$1 = 0; i$1 < lineView.rest.length; i$1++)+ { if (lineNo(lineView.rest[i$1]) > lineN)+ { return {map: lineView.measure.maps[i$1], cache: lineView.measure.caches[i$1], before: true} } }+ }}// Render a line into the hidden node display.externalMeasured. Used@@ -2515,36 +2443,36 @@var nullRect = {left: 0, right: 0, top: 0, bottom: 0};- function nodeAndOffsetInLineMap(map$$1, ch, bias) {+ function nodeAndOffsetInLineMap(map, ch, bias) {var node, start, end, collapse, mStart, mEnd;// First, search the line map for the text node corresponding to,// or closest to, the target character.- for (var i = 0; i < map$$1.length; i += 3) {- mStart = map$$1[i];- mEnd = map$$1[i + 1];+ for (var i = 0; i < map.length; i += 3) {+ mStart = map[i];+ mEnd = map[i + 1];if (ch < mStart) {start = 0; end = 1;collapse = "left";} else if (ch < mEnd) {start = ch - mStart;end = start + 1;- } else if (i == map$$1.length - 3 || ch == mEnd && map$$1[i + 3] > ch) {+ } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {end = mEnd - mStart;start = end - 1;if (ch >= mEnd) { collapse = "right"; }}if (start != null) {- node = map$$1[i + 2];+ node = map[i + 2];if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right")){ collapse = bias; }if (bias == "left" && start == 0)- { while (i && map$$1[i - 2] == map$$1[i - 3] && map$$1[i - 1].insertLeft) {- node = map$$1[(i -= 3) + 2];+ { while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {+ node = map[(i -= 3) + 2];collapse = "left";} }if (bias == "right" && start == mEnd - mStart)- { while (i < map$$1.length - 3 && map$$1[i + 3] == map$$1[i + 4] && !map$$1[i + 5].insertLeft) {- node = map$$1[(i += 3) + 2];+ { while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {+ node = map[(i += 3) + 2];collapse = "right";} }break@@ -2649,22 +2577,24 @@cm.display.lineNumChars = null;}- function pageScrollX() {+ function pageScrollX(doc) {// Work around https://bugs.chromium.org/p/chromium/issues/detail?id=489206// which causes page_Offset and bounding client rects to use// different reference viewports and invalidate our calculations.- if (chrome && android) { return -(document.body.getBoundingClientRect().left - parseInt(getComputedStyle(document.body).marginLeft)) }- return window.pageXOffset || (document.documentElement || document.body).scrollLeft+ if (chrome && android) { return -(doc.body.getBoundingClientRect().left - parseInt(getComputedStyle(doc.body).marginLeft)) }+ return doc.defaultView.pageXOffset || (doc.documentElement || doc.body).scrollLeft}- function pageScrollY() {- if (chrome && android) { return -(document.body.getBoundingClientRect().top - parseInt(getComputedStyle(document.body).marginTop)) }- return window.pageYOffset || (document.documentElement || document.body).scrollTop+ function pageScrollY(doc) {+ if (chrome && android) { return -(doc.body.getBoundingClientRect().top - parseInt(getComputedStyle(doc.body).marginTop)) }+ return doc.defaultView.pageYOffset || (doc.documentElement || doc.body).scrollTop}function widgetTopHeight(lineObj) {+ var ref = visualLine(lineObj);+ var widgets = ref.widgets;var height = 0;- if (lineObj.widgets) { for (var i = 0; i < lineObj.widgets.length; ++i) { if (lineObj.widgets[i].above)- { height += widgetHeight(lineObj.widgets[i]); } } }+ if (widgets) { for (var i = 0; i < widgets.length; ++i) { if (widgets[i].above)+ { height += widgetHeight(widgets[i]); } } }return height}@@ -2684,8 +2614,8 @@else { yOff -= cm.display.viewOffset; }if (context == "page" || context == "window") {var lOff = cm.display.lineSpace.getBoundingClientRect();- yOff += lOff.top + (context == "window" ? 0 : pageScrollY());- var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());+ yOff += lOff.top + (context == "window" ? 0 : pageScrollY(doc(cm)));+ var xOff = lOff.left + (context == "window" ? 0 : pageScrollX(doc(cm)));rect.left += xOff; rect.right += xOff;}rect.top += yOff; rect.bottom += yOff;@@ -2699,8 +2629,8 @@var left = coords.left, top = coords.top;// First move into "page" coordinate systemif (context == "page") {- left -= pageScrollX();- top -= pageScrollY();+ left -= pageScrollX(doc(cm));+ top -= pageScrollY(doc(cm));} else if (context == "local" || !context) {var localBox = cm.display.sizer.getBoundingClientRect();left += localBox.left;@@ -2781,7 +2711,7 @@function PosWithInfo(line, ch, sticky, outside, xRel) {var pos = Pos(line, ch, sticky);pos.xRel = xRel;- if (outside) { pos.outside = true; }+ if (outside) { pos.outside = outside; }return pos}@@ -2790,16 +2720,16 @@function coordsChar(cm, x, y) {var doc = cm.doc;y += cm.display.viewOffset;- if (y < 0) { return PosWithInfo(doc.first, 0, null, true, -1) }+ if (y < 0) { return PosWithInfo(doc.first, 0, null, -1, -1) }var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;if (lineN > last)- { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, true, 1) }+ { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1) }if (x < 0) { x = 0; }var lineObj = getLine(doc, lineN);for (;;) {var found = coordsCharInner(cm, lineObj, lineN, x, y);- var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0));+ var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0));if (!collapsed) { return found }var rangeEnd = collapsed.find(1);if (rangeEnd.line == lineN) { return rangeEnd }@@ -2827,13 +2757,13 @@return box.bottom <= y ? false : box.top > y ? true : (left ? box.left : box.right) > x}- function coordsCharInner(cm, lineObj, lineNo$$1, x, y) {+ function coordsCharInner(cm, lineObj, lineNo, x, y) {// Move y into line-local coordinate spacey -= heightAtLine(lineObj);var preparedMeasure = prepareMeasureForLine(cm, lineObj);// When directly calling `measureCharPrepared`, we have to adjust// for the widgets at this line.- var widgetHeight$$1 = widgetTopHeight(lineObj);+ var widgetHeight = widgetTopHeight(lineObj);var begin = 0, end = lineObj.text.length, ltr = true;var order = getOrder(lineObj, cm.doc.direction);@@ -2841,7 +2771,7 @@// which bidi section the coordinates fall into.if (order) {var part = (cm.options.lineWrapping ? coordsBidiPartWrapped : coordsBidiPart)- (cm, lineObj, lineNo$$1, preparedMeasure, order, x, y);+ (cm, lineObj, lineNo, preparedMeasure, order, x, y);ltr = part.level != 1;// The awkward -1 offsets are needed because findFirst (called// on these below) will treat its first bound as inclusive,@@ -2857,7 +2787,7 @@var chAround = null, boxAround = null;var ch = findFirst(function (ch) {var box = measureCharPrepared(cm, preparedMeasure, ch);- box.top += widgetHeight$$1; box.bottom += widgetHeight$$1;+ box.top += widgetHeight; box.bottom += widgetHeight;if (!boxIsAfter(box, x, y, false)) { return false }if (box.top <= y && box.left <= x) {chAround = ch;@@ -2881,27 +2811,27 @@// left of the character and compare it's vertical position to the// coordinatessticky = ch == 0 ? "after" : ch == lineObj.text.length ? "before" :- (measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight$$1 <= y) == ltr ?+ (measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight <= y) == ltr ?"after" : "before";// Now get accurate coordinates for this place, in order to get a// base X position- var coords = cursorCoords(cm, Pos(lineNo$$1, ch, sticky), "line", lineObj, preparedMeasure);+ var coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure);baseX = coords.left;- outside = y < coords.top || y >= coords.bottom;+ outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0;}ch = skipExtendingChars(lineObj.text, ch, 1);- return PosWithInfo(lineNo$$1, ch, sticky, outside, x - baseX)+ return PosWithInfo(lineNo, ch, sticky, outside, x - baseX)}- function coordsBidiPart(cm, lineObj, lineNo$$1, preparedMeasure, order, x, y) {+ function coordsBidiPart(cm, lineObj, lineNo, preparedMeasure, order, x, y) {// Bidi parts are sorted left-to-right, and in a non-line-wrapping// situation, we can take this ordering to correspond to the visual// ordering. This finds the first part whose end is after the given// coordinates.var index = findFirst(function (i) {var part = order[i], ltr = part.level != 1;- return boxIsAfter(cursorCoords(cm, Pos(lineNo$$1, ltr ? part.to : part.from, ltr ? "before" : "after"),+ return boxIsAfter(cursorCoords(cm, Pos(lineNo, ltr ? part.to : part.from, ltr ? "before" : "after"),"line", lineObj, preparedMeasure), x, y, true)}, 0, order.length - 1);var part = order[index];@@ -2910,7 +2840,7 @@// that start, move one part back.if (index > 0) {var ltr = part.level != 1;- var start = cursorCoords(cm, Pos(lineNo$$1, ltr ? part.from : part.to, ltr ? "after" : "before"),+ var start = cursorCoords(cm, Pos(lineNo, ltr ? part.from : part.to, ltr ? "after" : "before"),"line", lineObj, preparedMeasure);if (boxIsAfter(start, x, y, true) && start.top > y){ part = order[index - 1]; }@@ -2956,7 +2886,7 @@function textHeight(display) {if (display.cachedTextHeight != null) { return display.cachedTextHeight }if (measureText == null) {- measureText = elt("pre");+ measureText = elt("pre", null, "CodeMirror-line-like");// Measure a bunch of lines, for browsers that compute// fractional heights.for (var i = 0; i < 49; ++i) {@@ -2976,7 +2906,7 @@function charWidth(display) {if (display.cachedCharWidth != null) { return display.cachedCharWidth }var anchor = elt("span", "xxxxxxxxxx");- var pre = elt("pre", [anchor]);+ var pre = elt("pre", [anchor], "CodeMirror-line-like");removeChildrenAndAdd(display.measure, pre);var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;if (width > 2) { display.cachedCharWidth = width; }@@ -2989,8 +2919,9 @@var d = cm.display, left = {}, width = {};var gutterLeft = d.gutters.clientLeft;for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {- left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;- width[cm.options.gutters[i]] = n.clientWidth;+ var id = cm.display.gutterSpecs[i].className;+ left[id] = n.offsetLeft + n.clientLeft + gutterLeft;+ width[id] = n.clientWidth;}return {fixedPos: compensateForHScroll(d),gutterTotalWidth: d.gutters.offsetWidth,@@ -3047,26 +2978,174 @@var x, y, space = display.lineSpace.getBoundingClientRect();// Fails unpredictably on IE[67] when mouse is dragged around quickly.try { x = e.clientX - space.left; y = e.clientY - space.top; }- catch (e) { return null }+ catch (e$1) { return null }var coords = coordsChar(cm, x, y), line;- if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {+ if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));}return coords}- // Find the view element corresponding to a given line. Return null- // when the line isn't visible.- function findViewIndex(cm, n) {- if (n >= cm.display.viewTo) { return null }- n -= cm.display.viewFrom;- if (n < 0) { return null }- var view = cm.display.view;+ // Find the view element corresponding to a given line. Return null+ // when the line isn't visible.+ function findViewIndex(cm, n) {+ if (n >= cm.display.viewTo) { return null }+ n -= cm.display.viewFrom;+ if (n < 0) { return null }+ var view = cm.display.view;+ for (var i = 0; i < view.length; i++) {+ n -= view[i].size;+ if (n < 0) { return i }+ }+ }++ // Updates the display.view data structure for a given change to the+ // document. From and to are in pre-change coordinates. Lendiff is+ // the amount of lines added or subtracted by the change. This is+ // used for changes that span multiple lines, or change the way+ // lines are divided into visual lines. regLineChange (below)+ // registers single-line changes.+ function regChange(cm, from, to, lendiff) {+ if (from == null) { from = cm.doc.first; }+ if (to == null) { to = cm.doc.first + cm.doc.size; }+ if (!lendiff) { lendiff = 0; }++ var display = cm.display;+ if (lendiff && to < display.viewTo &&+ (display.updateLineNumbers == null || display.updateLineNumbers > from))+ { display.updateLineNumbers = from; }++ cm.curOp.viewChanged = true;++ if (from >= display.viewTo) { // Change after+ if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)+ { resetView(cm); }+ } else if (to <= display.viewFrom) { // Change before+ if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {+ resetView(cm);+ } else {+ display.viewFrom += lendiff;+ display.viewTo += lendiff;+ }+ } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap+ resetView(cm);+ } else if (from <= display.viewFrom) { // Top overlap+ var cut = viewCuttingPoint(cm, to, to + lendiff, 1);+ if (cut) {+ display.view = display.view.slice(cut.index);+ display.viewFrom = cut.lineN;+ display.viewTo += lendiff;+ } else {+ resetView(cm);+ }+ } else if (to >= display.viewTo) { // Bottom overlap+ var cut$1 = viewCuttingPoint(cm, from, from, -1);+ if (cut$1) {+ display.view = display.view.slice(0, cut$1.index);+ display.viewTo = cut$1.lineN;+ } else {+ resetView(cm);+ }+ } else { // Gap in the middle+ var cutTop = viewCuttingPoint(cm, from, from, -1);+ var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);+ if (cutTop && cutBot) {+ display.view = display.view.slice(0, cutTop.index)+ .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))+ .concat(display.view.slice(cutBot.index));+ display.viewTo += lendiff;+ } else {+ resetView(cm);+ }+ }++ var ext = display.externalMeasured;+ if (ext) {+ if (to < ext.lineN)+ { ext.lineN += lendiff; }+ else if (from < ext.lineN + ext.size)+ { display.externalMeasured = null; }+ }+ }++ // Register a change to a single line. Type must be one of "text",+ // "gutter", "class", "widget"+ function regLineChange(cm, line, type) {+ cm.curOp.viewChanged = true;+ var display = cm.display, ext = cm.display.externalMeasured;+ if (ext && line >= ext.lineN && line < ext.lineN + ext.size)+ { display.externalMeasured = null; }++ if (line < display.viewFrom || line >= display.viewTo) { return }+ var lineView = display.view[findViewIndex(cm, line)];+ if (lineView.node == null) { return }+ var arr = lineView.changes || (lineView.changes = []);+ if (indexOf(arr, type) == -1) { arr.push(type); }+ }++ // Clear the view.+ function resetView(cm) {+ cm.display.viewFrom = cm.display.viewTo = cm.doc.first;+ cm.display.view = [];+ cm.display.viewOffset = 0;+ }++ function viewCuttingPoint(cm, oldN, newN, dir) {+ var index = findViewIndex(cm, oldN), diff, view = cm.display.view;+ if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)+ { return {index: index, lineN: newN} }+ var n = cm.display.viewFrom;+ for (var i = 0; i < index; i++)+ { n += view[i].size; }+ if (n != oldN) {+ if (dir > 0) {+ if (index == view.length - 1) { return null }+ diff = (n + view[index].size) - oldN;+ index++;+ } else {+ diff = n - oldN;+ }+ oldN += diff; newN += diff;+ }+ while (visualLineNo(cm.doc, newN) != newN) {+ if (index == (dir < 0 ? 0 : view.length - 1)) { return null }+ newN += dir * view[index - (dir < 0 ? 1 : 0)].size;+ index += dir;+ }+ return {index: index, lineN: newN}+ }++ // Force the view to cover a given range, adding empty view element+ // or clipping off existing ones as needed.+ function adjustView(cm, from, to) {+ var display = cm.display, view = display.view;+ if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {+ display.view = buildViewArray(cm, from, to);+ display.viewFrom = from;+ } else {+ if (display.viewFrom > from)+ { display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); }+ else if (display.viewFrom < from)+ { display.view = display.view.slice(findViewIndex(cm, from)); }+ display.viewFrom = from;+ if (display.viewTo < to)+ { display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); }+ else if (display.viewTo > to)+ { display.view = display.view.slice(0, findViewIndex(cm, to)); }+ }+ display.viewTo = to;+ }++ // Count the number of lines in the view whose DOM representation is+ // out of date (or nonexistent).+ function countDirtyView(cm) {+ var view = cm.display.view, dirty = 0;for (var i = 0; i < view.length; i++) {- n -= view[i].size;- if (n < 0) { return i }+ var lineView = view[i];+ if (!lineView.hidden && (!lineView.node || lineView.changes)) { ++dirty; }}+ return dirty}function updateSelection(cm) {@@ -3080,15 +3159,21 @@var curFragment = result.cursors = document.createDocumentFragment();var selFragment = result.selection = document.createDocumentFragment();+ var customCursor = cm.options.$customCursor;+ if (customCursor) { primary = true; }for (var i = 0; i < doc.sel.ranges.length; i++) {if (!primary && i == doc.sel.primIndex) { continue }- var range$$1 = doc.sel.ranges[i];- if (range$$1.from().line >= cm.display.viewTo || range$$1.to().line < cm.display.viewFrom) { continue }- var collapsed = range$$1.empty();- if (collapsed || cm.options.showCursorWhenSelecting)- { drawSelectionCursor(cm, range$$1.head, curFragment); }+ 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 (customCursor) {+ var head = customCursor(cm, range);+ if (head) { drawSelectionCursor(cm, head, curFragment); }+ } else if (collapsed || cm.options.showCursorWhenSelecting) {+ drawSelectionCursor(cm, range.head, curFragment);+ }if (!collapsed)- { drawSelectionRange(cm, range$$1, selFragment); }+ { drawSelectionRange(cm, range, selFragment); }}return result}@@ -3102,6 +3187,12 @@cursor.style.top = pos.top + "px";cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";+ if (/\bcm-fat-cursor\b/.test(cm.getWrapperElement().className)) {+ var charPos = charCoords(cm, head, "div", null, null);+ var width = charPos.right - charPos.left;+ cursor.style.width = (width > 0 ? width : cm.defaultCharWidth()) + "px";+ }+if (pos.other) {// Secondary cursor, shown when on a 'jump' in bi-directional textvar otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));@@ -3115,7 +3206,7 @@function cmpCoords(a, b) { return a.top - b.top || a.left - b.left }// Draws the given range as a highlighted selection- function drawSelectionRange(cm, range$$1, output) {+ function drawSelectionRange(cm, range, output) {var display = cm.display, doc = cm.doc;var fragment = document.createDocumentFragment();var padding = paddingH(cm.display), leftSide = padding.left;@@ -3184,7 +3275,7 @@return {start: start, end: end}}- var sFrom = range$$1.from(), sTo = range$$1.to();+ var sFrom = range.from(), sTo = range.to();if (sFrom.line == sTo.line) {drawForLine(sFrom.line, sFrom.ch, sTo.ch);} else {@@ -3215,26 +3306,31 @@var on = true;display.cursorDiv.style.visibility = "";if (cm.options.cursorBlinkRate > 0)- { display.blinker = setInterval(function () { return display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"; },- cm.options.cursorBlinkRate); }+ { display.blinker = setInterval(function () {+ if (!cm.hasFocus()) { onBlur(cm); }+ display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";+ }, cm.options.cursorBlinkRate); }else if (cm.options.cursorBlinkRate < 0){ display.cursorDiv.style.visibility = "hidden"; }}function ensureFocus(cm) {- if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }+ if (!cm.hasFocus()) {+ cm.display.input.focus();+ if (!cm.state.focused) { onFocus(cm); }+ }}function delayBlurEvent(cm) {cm.state.delayingBlurEvent = true;setTimeout(function () { if (cm.state.delayingBlurEvent) {cm.state.delayingBlurEvent = false;- onBlur(cm);+ if (cm.state.focused) { onBlur(cm); }} }, 100);}function onFocus(cm, e) {- if (cm.state.delayingBlurEvent) { cm.state.delayingBlurEvent = false; }+ if (cm.state.delayingBlurEvent && !cm.state.draggingText) { cm.state.delayingBlurEvent = false; }if (cm.options.readOnly == "nocursor") { return }if (!cm.state.focused) {@@ -3269,10 +3365,14 @@function updateHeightsInViewport(cm) {var display = cm.display;var prevBottom = display.lineDiv.offsetTop;+ var viewTop = Math.max(0, display.scroller.getBoundingClientRect().top);+ var oldHeight = display.lineDiv.getBoundingClientRect().top;+ var mustScroll = 0;for (var i = 0; i < display.view.length; i++) {var cur = display.view[i], wrapping = cm.options.lineWrapping;var height = (void 0), width = 0;if (cur.hidden) { continue }+ oldHeight += cur.line.height;if (ie && ie_version < 8) {var bot = cur.node.offsetTop + cur.node.offsetHeight;height = bot - prevBottom;@@ -3286,8 +3386,8 @@{ width = cur.text.firstChild.getBoundingClientRect().right - box.left - 1; }}var diff = cur.line.height - height;- if (height < 2) { height = textHeight(display); }if (diff > .005 || diff < -.005) {+ if (oldHeight < viewTop) { mustScroll -= diff; }updateLineHeight(cur.line, height);updateWidgetHeight(cur.line);if (cur.rest) { for (var j = 0; j < cur.rest.length; j++)@@ -3302,6 +3402,7 @@}}}+ if (Math.abs(mustScroll) > 2) { display.scroller.scrollTop += mustScroll; }}// Read and store the height of line widgets associated with the@@ -3337,49 +3438,6 @@return {from: from, to: Math.max(to, from + 1)}}- // Re-align line numbers and gutter marks to compensate for- // horizontal scrolling.- function alignHorizontally(cm) {- var display = cm.display, view = display.view;- if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return }- var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;- var gutterW = display.gutters.offsetWidth, left = comp + "px";- for (var i = 0; i < view.length; i++) { if (!view[i].hidden) {- if (cm.options.fixedGutter) {- if (view[i].gutter)- { view[i].gutter.style.left = left; }- if (view[i].gutterBackground)- { view[i].gutterBackground.style.left = left; }- }- var align = view[i].alignable;- if (align) { for (var j = 0; j < align.length; j++)- { align[j].style.left = left; } }- } }- if (cm.options.fixedGutter)- { display.gutters.style.left = (comp + gutterW) + "px"; }- }-- // Used to ensure that the line number gutter is still the right- // size for the current document size. Returns true when an update- // is needed.- function maybeUpdateLineNumberWidth(cm) {- if (!cm.options.lineNumbers) { return false }- var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;- if (last.length != display.lineNumChars) {- var test = display.measure.appendChild(elt("div", [elt("div", last)],- "CodeMirror-linenumber CodeMirror-gutter-elt"));- var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;- display.lineGutter.style.width = "";- display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;- display.lineNumWidth = display.lineNumInnerWidth + padding;- display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;- display.lineGutter.style.width = display.lineNumWidth + "px";- updateGutterSpace(cm);- return true- }- return false- }-// SCROLLING THINGS INTO VIEW// If an editor sits on the top or bottom of the window, partially@@ -3388,8 +3446,9 @@if (signalDOMEvent(cm, "scrollCursorIntoView")) { return }var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;+ var doc = display.wrapper.ownerDocument;if (rect.top + box.top < 0) { doScroll = true; }- else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { doScroll = false; }+ else if (rect.bottom + box.top > (doc.defaultView.innerHeight || doc.documentElement.clientHeight)) { doScroll = false; }if (doScroll != null && !phantom) {var scrollNode = elt("div", "\u200b", null, ("position: absolute;\n top: " + (rect.top - display.viewOffset - paddingTop(cm.display)) + "px;\n height: " + (rect.bottom - rect.top + scrollGap(cm) + display.barHeight) + "px;\n left: " + (rect.left) + "px; width: " + (Math.max(2, rect.right - rect.left)) + "px;"));cm.display.lineSpace.appendChild(scrollNode);@@ -3408,8 +3467,8 @@// Set pos and end to the cursor positions around the character pos sticks to// If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch// If pos == Pos(_, 0, "before"), pos and end are unchanged- pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos;end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos;+ pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos;}for (var limit = 0; limit < 5; limit++) {var changed = false;@@ -3460,14 +3519,15 @@if (newTop != screentop) { result.scrollTop = newTop; }}- var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;- var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);+ var gutterSpace = cm.options.fixedGutter ? 0 : display.gutters.offsetWidth;+ var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft - gutterSpace;+ var screenw = displayWidth(cm) - display.gutters.offsetWidth;var tooWide = rect.right - rect.left > screenw;if (tooWide) { rect.right = rect.left + screenw; }if (rect.left < 10){ result.scrollLeft = 0; }else if (rect.left < screenleft)- { result.scrollLeft = Math.max(0, rect.left - (tooWide ? 0 : 10)); }+ { result.scrollLeft = Math.max(0, rect.left + gutterSpace - (tooWide ? 0 : 10)); }else if (rect.right > screenw + screenleft - 3){ result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw; }return result@@ -3495,9 +3555,9 @@if (y != null) { cm.curOp.scrollTop = y; }}- function scrollToRange(cm, range$$1) {+ function scrollToRange(cm, range) {resolveScrollToPos(cm);- cm.curOp.scrollToPos = range$$1;+ cm.curOp.scrollToPos = range;}// When an operation has its scrollToPos property set, and another@@ -3505,11 +3565,11 @@// 'simulates' scrolling that position into view in a cheap way, so// that the effect of intermediate scroll commands is not ignored.function resolveScrollToPos(cm) {- var range$$1 = cm.curOp.scrollToPos;- if (range$$1) {+ var range = cm.curOp.scrollToPos;+ if (range) {cm.curOp.scrollToPos = null;- var from = estimateCoords(cm, range$$1.from), to = estimateCoords(cm, range$$1.to);- scrollToCoordsRange(cm, from, to, range$$1.margin);+ var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to);+ scrollToCoordsRange(cm, from, to, range.margin);}}@@ -3534,7 +3594,7 @@}function setScrollTop(cm, val, forceScroll) {- val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val);+ val = Math.max(0, Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val));if (cm.display.scroller.scrollTop == val && !forceScroll) { return }cm.doc.scrollTop = val;cm.display.scrollbars.setScrollTop(val);@@ -3544,7 +3604,7 @@// Sync scroller and scrollbar, ensure the gutter elements are// aligned.function setScrollLeft(cm, val, isScroller, forceScroll) {- val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);+ val = Math.max(0, Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth));if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) { return }cm.doc.scrollLeft = val;alignHorizontally(cm);@@ -3604,6 +3664,7 @@this.vert.firstChild.style.height =Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";} else {+ this.vert.scrollTop = 0;this.vert.style.display = "";this.vert.firstChild.style.height = "0";}@@ -3641,13 +3702,13 @@NativeScrollbars.prototype.zeroWidthHack = function () {var w = mac && !mac_geMountainLion ? "12px" : "18px";this.horiz.style.height = this.vert.style.width = w;- this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";+ this.horiz.style.visibility = this.vert.style.visibility = "hidden";this.disableHoriz = new Delayed;this.disableVert = new Delayed;};NativeScrollbars.prototype.enableZeroWidthBar = function (bar, delay, type) {- bar.style.pointerEvents = "auto";+ bar.style.visibility = "";function maybeDisable() {// To find out whether the scrollbar is still visible, we// check whether the element under the pixel in the bottom@@ -3656,9 +3717,9 @@// (when the bar is hidden). If it is still visible, we keep// it enabled, if it's hidden, we disable pointer events.var box = bar.getBoundingClientRect();- var elt$$1 = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2)+ var elt = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2): document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1);- if (elt$$1 != bar) { bar.style.pointerEvents = "none"; }+ if (elt != bar) { bar.style.visibility = "hidden"; }else { delay.set(1000, maybeDisable); }}delay.set(1000, maybeDisable);@@ -3749,7 +3810,7 @@viewChanged: false, // Flag that indicates that lines might need to be redrawnstartHeight: cm.doc.height, // Used to detect need to update scrollbarforceUpdate: false, // Used to force a redraw- updateInput: null, // Whether to reset the input textarea+ updateInput: 0, // Whether to reset the input textareatyping: false, // Whether this reset should be careful to leave existing text (for compositing)changeObjs: null, // Accumulated changes, for firing change eventscursorActivityHandlers: null, // Set of handlers to fire cursorActivity on@@ -3759,7 +3820,8 @@scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yetscrollToPos: null, // Used to scroll to a specific positionfocus: false,- id: ++nextOpId // Unique ID+ id: ++nextOpId, // Unique ID+ markArrays: null // Used by addMarkedSpan};pushOperation(cm.curOp);}@@ -3838,7 +3900,7 @@cm.display.maxLineChanged = false;}- var takeFocus = op.focus && op.focus == activeElt();+ var takeFocus = op.focus && op.focus == activeElt(doc(cm));if (op.preparedSelection){ cm.display.input.showSelection(op.preparedSelection, takeFocus); }if (op.updatedDisplay || op.startHeight != cm.doc.height)@@ -3927,154 +3989,6 @@}}- // Updates the display.view data structure for a given change to the- // document. From and to are in pre-change coordinates. Lendiff is- // the amount of lines added or subtracted by the change. This is- // used for changes that span multiple lines, or change the way- // lines are divided into visual lines. regLineChange (below)- // registers single-line changes.- function regChange(cm, from, to, lendiff) {- if (from == null) { from = cm.doc.first; }- if (to == null) { to = cm.doc.first + cm.doc.size; }- if (!lendiff) { lendiff = 0; }-- var display = cm.display;- if (lendiff && to < display.viewTo &&- (display.updateLineNumbers == null || display.updateLineNumbers > from))- { display.updateLineNumbers = from; }-- cm.curOp.viewChanged = true;-- if (from >= display.viewTo) { // Change after- if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)- { resetView(cm); }- } else if (to <= display.viewFrom) { // Change before- if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {- resetView(cm);- } else {- display.viewFrom += lendiff;- display.viewTo += lendiff;- }- } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap- resetView(cm);- } else if (from <= display.viewFrom) { // Top overlap- var cut = viewCuttingPoint(cm, to, to + lendiff, 1);- if (cut) {- display.view = display.view.slice(cut.index);- display.viewFrom = cut.lineN;- display.viewTo += lendiff;- } else {- resetView(cm);- }- } else if (to >= display.viewTo) { // Bottom overlap- var cut$1 = viewCuttingPoint(cm, from, from, -1);- if (cut$1) {- display.view = display.view.slice(0, cut$1.index);- display.viewTo = cut$1.lineN;- } else {- resetView(cm);- }- } else { // Gap in the middle- var cutTop = viewCuttingPoint(cm, from, from, -1);- var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);- if (cutTop && cutBot) {- display.view = display.view.slice(0, cutTop.index)- .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))- .concat(display.view.slice(cutBot.index));- display.viewTo += lendiff;- } else {- resetView(cm);- }- }-- var ext = display.externalMeasured;- if (ext) {- if (to < ext.lineN)- { ext.lineN += lendiff; }- else if (from < ext.lineN + ext.size)- { display.externalMeasured = null; }- }- }-- // Register a change to a single line. Type must be one of "text",- // "gutter", "class", "widget"- function regLineChange(cm, line, type) {- cm.curOp.viewChanged = true;- var display = cm.display, ext = cm.display.externalMeasured;- if (ext && line >= ext.lineN && line < ext.lineN + ext.size)- { display.externalMeasured = null; }-- if (line < display.viewFrom || line >= display.viewTo) { return }- var lineView = display.view[findViewIndex(cm, line)];- if (lineView.node == null) { return }- var arr = lineView.changes || (lineView.changes = []);- if (indexOf(arr, type) == -1) { arr.push(type); }- }-- // Clear the view.- function resetView(cm) {- cm.display.viewFrom = cm.display.viewTo = cm.doc.first;- cm.display.view = [];- cm.display.viewOffset = 0;- }-- function viewCuttingPoint(cm, oldN, newN, dir) {- var index = findViewIndex(cm, oldN), diff, view = cm.display.view;- if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)- { return {index: index, lineN: newN} }- var n = cm.display.viewFrom;- for (var i = 0; i < index; i++)- { n += view[i].size; }- if (n != oldN) {- if (dir > 0) {- if (index == view.length - 1) { return null }- diff = (n + view[index].size) - oldN;- index++;- } else {- diff = n - oldN;- }- oldN += diff; newN += diff;- }- while (visualLineNo(cm.doc, newN) != newN) {- if (index == (dir < 0 ? 0 : view.length - 1)) { return null }- newN += dir * view[index - (dir < 0 ? 1 : 0)].size;- index += dir;- }- return {index: index, lineN: newN}- }-- // Force the view to cover a given range, adding empty view element- // or clipping off existing ones as needed.- function adjustView(cm, from, to) {- var display = cm.display, view = display.view;- if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {- display.view = buildViewArray(cm, from, to);- display.viewFrom = from;- } else {- if (display.viewFrom > from)- { display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); }- else if (display.viewFrom < from)- { display.view = display.view.slice(findViewIndex(cm, from)); }- display.viewFrom = from;- if (display.viewTo < to)- { display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); }- else if (display.viewTo > to)- { display.view = display.view.slice(0, findViewIndex(cm, to)); }- }- display.viewTo = to;- }-- // Count the number of lines in the view whose DOM representation is- // out of date (or nonexistent).- function countDirtyView(cm) {- var view = cm.display.view, dirty = 0;- for (var i = 0; i < view.length; i++) {- var lineView = view[i];- if (!lineView.hidden && (!lineView.node || lineView.changes)) { ++dirty; }- }- return dirty- }-// HIGHLIGHT WORKERfunction startWorker(cm, time) {@@ -4146,10 +4060,8 @@{ this.events.push(arguments); }};DisplayUpdate.prototype.finish = function () {- var this$1 = this;-for (var i = 0; i < this.events.length; i++)- { signal.apply(null, this$1.events[i]); }+ { signal.apply(null, this.events[i]); }};function maybeClipScrollbars(cm) {@@ -4165,11 +4077,11 @@function selectionSnapshot(cm) {if (cm.hasFocus()) { return null }- var active = activeElt();+ var active = activeElt(doc(cm));if (!active || !contains(cm.display.lineDiv, active)) { return null }var result = {activeElt: active};if (window.getSelection) {- var sel = window.getSelection();+ var sel = win(cm).getSelection();if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) {result.anchorNode = sel.anchorNode;result.anchorOffset = sel.anchorOffset;@@ -4181,14 +4093,16 @@}function restoreSelection(snapshot) {- if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) { return }+ if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt(snapshot.activeElt.ownerDocument)) { return }snapshot.activeElt.focus();- if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {- var sel = window.getSelection(), range$$1 = document.createRange();- range$$1.setEnd(snapshot.anchorNode, snapshot.anchorOffset);- range$$1.collapse(false);+ if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&+ snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {+ var doc = snapshot.activeElt.ownerDocument;+ var sel = doc.defaultView.getSelection(), range = doc.createRange();+ range.setEnd(snapshot.anchorNode, snapshot.anchorOffset);+ range.collapse(false);sel.removeAllRanges();- sel.addRange(range$$1);+ sel.addRange(range);sel.extend(snapshot.focusNode, snapshot.focusOffset);}}@@ -4281,6 +4195,8 @@update.visible = visibleLines(cm.display, cm.doc, viewport);if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo){ break }+ } else if (first) {+ update.visible = visibleLines(cm.display, cm.doc, viewport);}if (!updateDisplayIfNeeded(cm, update)) { break }updateHeightsInViewport(cm);@@ -4353,48 +4269,215 @@}lineN += lineView.size;}- while (cur) { cur = rm(cur); }- }-- function updateGutterSpace(cm) {- var width = cm.display.gutters.offsetWidth;- cm.display.sizer.style.marginLeft = width + "px";+ while (cur) { cur = rm(cur); }+ }++ function updateGutterSpace(display) {+ var width = display.gutters.offsetWidth;+ display.sizer.style.marginLeft = width + "px";+ // Send an event to consumers responding to changes in gutter width.+ signalLater(display, "gutterChanged", display);+ }++ function setDocumentHeight(cm, measure) {+ cm.display.sizer.style.minHeight = measure.docHeight + "px";+ cm.display.heightForcer.style.top = measure.docHeight + "px";+ cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";+ }++ // Re-align line numbers and gutter marks to compensate for+ // horizontal scrolling.+ function alignHorizontally(cm) {+ var display = cm.display, view = display.view;+ if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return }+ var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;+ var gutterW = display.gutters.offsetWidth, left = comp + "px";+ for (var i = 0; i < view.length; i++) { if (!view[i].hidden) {+ if (cm.options.fixedGutter) {+ if (view[i].gutter)+ { view[i].gutter.style.left = left; }+ if (view[i].gutterBackground)+ { view[i].gutterBackground.style.left = left; }+ }+ var align = view[i].alignable;+ if (align) { for (var j = 0; j < align.length; j++)+ { align[j].style.left = left; } }+ } }+ if (cm.options.fixedGutter)+ { display.gutters.style.left = (comp + gutterW) + "px"; }+ }++ // Used to ensure that the line number gutter is still the right+ // size for the current document size. Returns true when an update+ // is needed.+ function maybeUpdateLineNumberWidth(cm) {+ if (!cm.options.lineNumbers) { return false }+ var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;+ if (last.length != display.lineNumChars) {+ var test = display.measure.appendChild(elt("div", [elt("div", last)],+ "CodeMirror-linenumber CodeMirror-gutter-elt"));+ var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;+ display.lineGutter.style.width = "";+ display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;+ display.lineNumWidth = display.lineNumInnerWidth + padding;+ display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;+ display.lineGutter.style.width = display.lineNumWidth + "px";+ updateGutterSpace(cm.display);+ return true+ }+ return false}- function setDocumentHeight(cm, measure) {- cm.display.sizer.style.minHeight = measure.docHeight + "px";- cm.display.heightForcer.style.top = measure.docHeight + "px";- cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";+ function getGutters(gutters, lineNumbers) {+ var result = [], sawLineNumbers = false;+ for (var i = 0; i < gutters.length; i++) {+ var name = gutters[i], style = null;+ if (typeof name != "string") { style = name.style; name = name.className; }+ if (name == "CodeMirror-linenumbers") {+ if (!lineNumbers) { continue }+ else { sawLineNumbers = true; }+ }+ result.push({className: name, style: style});+ }+ if (lineNumbers && !sawLineNumbers) { result.push({className: "CodeMirror-linenumbers", style: null}); }+ return result}// Rebuild the gutter elements, ensure the margin to the left of the// code matches their width.- function updateGutters(cm) {- var gutters = cm.display.gutters, specs = cm.options.gutters;+ function renderGutters(display) {+ var gutters = display.gutters, specs = display.gutterSpecs;removeChildren(gutters);- var i = 0;- for (; i < specs.length; ++i) {- var gutterClass = specs[i];- var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass));- if (gutterClass == "CodeMirror-linenumbers") {- cm.display.lineGutter = gElt;- gElt.style.width = (cm.display.lineNumWidth || 1) + "px";+ display.lineGutter = null;+ for (var i = 0; i < specs.length; ++i) {+ var ref = specs[i];+ var className = ref.className;+ var style = ref.style;+ var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + className));+ if (style) { gElt.style.cssText = style; }+ if (className == "CodeMirror-linenumbers") {+ display.lineGutter = gElt;+ gElt.style.width = (display.lineNumWidth || 1) + "px";}}- gutters.style.display = i ? "" : "none";- updateGutterSpace(cm);+ gutters.style.display = specs.length ? "" : "none";+ updateGutterSpace(display);+ }++ function updateGutters(cm) {+ renderGutters(cm.display);+ regChange(cm);+ alignHorizontally(cm);}- // Make sure the gutters options contains the element- // "CodeMirror-linenumbers" when the lineNumbers option is true.- function setGuttersForLineNumbers(options) {- var found = indexOf(options.gutters, "CodeMirror-linenumbers");- if (found == -1 && options.lineNumbers) {- options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);- } else if (found > -1 && !options.lineNumbers) {- options.gutters = options.gutters.slice(0);- options.gutters.splice(found, 1);+ // The display handles the DOM integration, both for input reading+ // and content drawing. It holds references to DOM nodes and+ // display-related state.++ function Display(place, doc, input, options) {+ var d = this;+ this.input = input;++ // Covers bottom-right square when both scrollbars are present.+ d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");+ d.scrollbarFiller.setAttribute("cm-not-content", "true");+ // Covers bottom of gutter when coverGutterNextToScrollbar is on+ // and h scrollbar is present.+ d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");+ d.gutterFiller.setAttribute("cm-not-content", "true");+ // Will contain the actual code, positioned to cover the viewport.+ d.lineDiv = eltP("div", null, "CodeMirror-code");+ // Elements are added to these to represent selection and cursors.+ d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");+ d.cursorDiv = elt("div", null, "CodeMirror-cursors");+ // A visibility: hidden element used to find the size of things.+ d.measure = elt("div", null, "CodeMirror-measure");+ // When lines outside of the viewport are measured, they are drawn in this.+ d.lineMeasure = elt("div", null, "CodeMirror-measure");+ // Wraps everything that needs to exist inside the vertically-padded coordinate system+ d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],+ null, "position: relative; outline: none");+ var lines = eltP("div", [d.lineSpace], "CodeMirror-lines");+ // Moved around its parent to cover visible view.+ d.mover = elt("div", [lines], null, "position: relative");+ // Set to the height of the document, allowing scrolling.+ d.sizer = elt("div", [d.mover], "CodeMirror-sizer");+ d.sizerWidth = null;+ // Behavior of elts with overflow: auto and padding is+ // inconsistent across browsers. This is used to ensure the+ // scrollable area is big enough.+ d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");+ // Will contain the gutters, if any.+ d.gutters = elt("div", null, "CodeMirror-gutters");+ d.lineGutter = null;+ // Actual scrollable element.+ d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");+ d.scroller.setAttribute("tabIndex", "-1");+ // The element in which the editor lives.+ d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");++ // This attribute is respected by automatic translation systems such as Google Translate,+ // and may also be respected by tools used by human translators.+ d.wrapper.setAttribute('translate', 'no');++ // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)+ if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }+ if (!webkit && !(gecko && mobile)) { d.scroller.draggable = true; }++ if (place) {+ if (place.appendChild) { place.appendChild(d.wrapper); }+ else { place(d.wrapper); }}++ // Current rendered range (may be bigger than the view window).+ d.viewFrom = d.viewTo = doc.first;+ d.reportedViewFrom = d.reportedViewTo = doc.first;+ // Information about the rendered lines.+ d.view = [];+ d.renderedView = null;+ // Holds info about a single rendered line when it was rendered+ // for measurement, while not in view.+ d.externalMeasured = null;+ // Empty space (in pixels) above the view+ d.viewOffset = 0;+ d.lastWrapHeight = d.lastWrapWidth = 0;+ d.updateLineNumbers = null;++ d.nativeBarWidth = d.barHeight = d.barWidth = 0;+ d.scrollbarsClipped = false;++ // Used to only resize the line number gutter when necessary (when+ // the amount of lines crosses a boundary that makes its width change)+ d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;+ // Set to true when a non-horizontal-scrolling line widget is+ // added. As an optimization, line widget aligning is skipped when+ // this is false.+ d.alignWidgets = false;++ d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;++ // Tracks the maximum line length so that the horizontal scrollbar+ // can be kept static when scrolling.+ d.maxLine = null;+ d.maxLineLength = 0;+ d.maxLineChanged = false;++ // Used for measuring wheel scrolling granularity+ d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;++ // True when shift is held down.+ d.shift = false;++ // Used to track whether anything happened since the context menu+ // was opened.+ d.selForContextMenu = null;++ d.activeTouch = null;++ d.gutterSpecs = getGutters(options.gutters, options.lineNumbers);+ renderGutters(d);++ input.init(d);}// Since the delta values reported on mouse wheel events are@@ -4433,7 +4516,24 @@}function onScrollWheel(cm, e) {+ // On Chrome 102, viewport updates somehow stop wheel-based+ // scrolling. Turning off pointer events during the scroll seems+ // to avoid the issue.+ if (chrome && chrome_version == 102) {+ if (cm.display.chromeScrollHack == null) { cm.display.sizer.style.pointerEvents = "none"; }+ else { clearTimeout(cm.display.chromeScrollHack); }+ cm.display.chromeScrollHack = setTimeout(function () {+ cm.display.chromeScrollHack = null;+ cm.display.sizer.style.pointerEvents = "";+ }, 100);+ }var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;+ var pixelsPerUnit = wheelPixelsPerUnit;+ if (e.deltaMode === 0) {+ dx = e.deltaX;+ dy = e.deltaY;+ pixelsPerUnit = 1;+ }var display = cm.display, scroll = display.scroller;// Quit if there's nothing to scroll here@@ -4462,10 +4562,10 @@// estimated pixels/delta value, we just handle horizontal// scrolling entirely here. It'll be slightly off from native, but// better than glitching out.- if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {+ if (dx && !gecko && !presto && pixelsPerUnit != null) {if (dy && canScrollY)- { updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * wheelPixelsPerUnit)); }- setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * wheelPixelsPerUnit));+ { updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * pixelsPerUnit)); }+ setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * pixelsPerUnit));// Only prevent default scrolling if vertical scrolling is// actually possible. Otherwise, it causes vertical scroll// jitter on OSX trackpads when deltaX is small and deltaY@@ -4478,15 +4578,15 @@// 'Project' the visible viewport to cover the area that is being// scrolled into view (if we know enough to estimate it).- if (dy && wheelPixelsPerUnit != null) {- var pixels = dy * wheelPixelsPerUnit;+ if (dy && pixelsPerUnit != null) {+ var pixels = dy * pixelsPerUnit;var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;if (pixels < 0) { top = Math.max(0, top + pixels - 50); }else { bot = Math.min(cm.doc.height, bot + pixels + 50); }updateDisplaySimple(cm, {top: top, bottom: bot});}- if (wheelSamples < 20) {+ if (wheelSamples < 20 && e.deltaMode !== 0) {if (display.wheelStartX == null) {display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;display.wheelDX = dx; display.wheelDY = dy;@@ -4520,40 +4620,32 @@Selection.prototype.primary = function () { return this.ranges[this.primIndex] };Selection.prototype.equals = function (other) {- var this$1 = this;-if (other == this) { return true }if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) { return false }for (var i = 0; i < this.ranges.length; i++) {- var here = this$1.ranges[i], there = other.ranges[i];+ var here = this.ranges[i], there = other.ranges[i];if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) { return false }}return true};Selection.prototype.deepCopy = function () {- var this$1 = this;-var out = [];for (var i = 0; i < this.ranges.length; i++)- { out[i] = new Range(copyPos(this$1.ranges[i].anchor), copyPos(this$1.ranges[i].head)); }+ { out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head)); }return new Selection(out, this.primIndex)};Selection.prototype.somethingSelected = function () {- var this$1 = this;-for (var i = 0; i < this.ranges.length; i++)- { if (!this$1.ranges[i].empty()) { return true } }+ { if (!this.ranges[i].empty()) { return true } }return false};Selection.prototype.contains = function (pos, end) {- var this$1 = this;-if (!end) { end = pos; }for (var i = 0; i < this.ranges.length; i++) {- var range = this$1.ranges[i];+ var range = this.ranges[i];if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0){ return i }}@@ -4679,16 +4771,16 @@}// Perform a change on the document data structure.- function updateDoc(doc, change, markedSpans, estimateHeight$$1) {+ function updateDoc(doc, change, markedSpans, estimateHeight) {function spansFor(n) {return markedSpans ? markedSpans[n] : null}function update(line, text, spans) {- updateLine(line, text, spans, estimateHeight$$1);+ updateLine(line, text, spans, estimateHeight);signalLater(line, "change", line, change);}function linesFor(start, end) {var result = [];for (var i = start; i < end; ++i)- { result.push(new Line(text[i], spansFor(i), estimateHeight$$1)); }+ { result.push(new Line(text[i], spansFor(i), estimateHeight)); }return result}@@ -4712,7 +4804,7 @@update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);} else {var added$1 = linesFor(1, text.length - 1);- added$1.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight$$1));+ added$1.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$1);}@@ -4753,6 +4845,7 @@estimateLineHeights(cm);loadMode(cm);setDirectionClass(cm);+ cm.options.direction = doc.direction;if (!cm.options.lineWrapping) { findMaxLine(cm); }cm.options.mode = doc.modeOption;regChange(cm);@@ -4769,19 +4862,19 @@});}- function History(startGen) {+ function History(prev) {// Arrays of change events and selections. Doing something adds an// event to done and clears undo. Undoing moves events from done// to undone, redoing moves them in the other direction.this.done = []; this.undone = [];- this.undoDepth = Infinity;+ this.undoDepth = prev ? prev.undoDepth : Infinity;// Used to track when changes can be merged into a single undo// eventthis.lastModTime = this.lastSelTime = 0;this.lastOp = this.lastSelOp = null;this.lastOrigin = this.lastSelOrigin = null;// Used by the isClean() method- this.generation = this.maxGeneration = startGen || 1;+ this.generation = this.maxGeneration = prev ? prev.maxGeneration : 1;}// Create a history change event from an updateDoc-style change@@ -5049,11 +5142,9 @@var obj = {ranges: sel.ranges,update: function(ranges) {- var this$1 = this;-this.ranges = [];for (var i = 0; i < ranges.length; i++)- { this$1.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),+ { this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),clipPos(doc, ranges[i].head)); }},origin: options && options.origin@@ -5088,7 +5179,7 @@(cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));- if (!(options && options.scroll === false) && doc.cm)+ if (!(options && options.scroll === false) && doc.cm && doc.cm.getOption("readOnly") != "nocursor"){ ensureCursorVisible(doc.cm); }}@@ -5098,7 +5189,8 @@doc.sel = sel;if (doc.cm) {- doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;+ doc.cm.curOp.updateInput = 1;+ doc.cm.curOp.selectionChanged = true;signalCursorActivity(doc.cm);}signalLater(doc, "cursorActivity", doc);@@ -5118,7 +5210,7 @@var range = sel.ranges[i];var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);- var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);+ var newHead = range.head == range.anchor ? newAnchor : skipAtomic(doc, range.head, old && old.head, bias, mayClear);if (out || newAnchor != range.anchor || newHead != range.head) {if (!out) { out = sel.ranges.slice(0, i); }out[i] = new Range(newAnchor, newHead);@@ -5131,8 +5223,15 @@var line = getLine(doc, pos.line);if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {var sp = line.markedSpans[i], m = sp.marker;- if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&- (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {++ // Determine if we should prevent the cursor being placed to the left/right of an atomic marker+ // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it+ // is with selectLeft/Right+ var preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft;+ var preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight;++ if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&+ (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) {if (mayClear) {signal(m, "beforeCursorEnter");if (m.explicitlyCleared) {@@ -5144,14 +5243,14 @@if (oldPos) {var near = m.find(dir < 0 ? 1 : -1), diff = (void 0);- if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)+ if (dir < 0 ? preventCursorRight : preventCursorLeft){ 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)+ if (dir < 0 ? preventCursorLeft : preventCursorRight){ far = movePos(doc, far, dir, far.line == pos.line ? line : null); }return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null}@@ -5210,7 +5309,10 @@signal(doc, "beforeChange", doc, obj);if (doc.cm) { signal(doc.cm, "beforeChange", doc.cm, obj); }- if (obj.canceled) { return null }+ if (obj.canceled) {+ if (doc.cm) { doc.cm.curOp.updateInput = 2; }+ return null+ }return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}}@@ -5377,6 +5479,9 @@if (doc.cm) { makeChangeSingleDocInEditor(doc.cm, change, spans); }else { updateDoc(doc, change, spans); }setSelectionNoUndo(doc, selAfter, sel_dontScroll);++ if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0)))+ { doc.cantEdit = false; }}// Handle the interaction of a change to a document with the editor@@ -5526,13 +5631,11 @@// See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.htmlfunction LeafChunk(lines) {- var this$1 = this;-this.lines = lines;this.parent = null;var height = 0;for (var i = 0; i < lines.length; ++i) {- lines[i].parent = this$1;+ lines[i].parent = this;height += lines[i].height;}this.height = height;@@ -5543,11 +5646,9 @@// Remove the n lines at offset 'at'.removeInner: function(at, n) {- var this$1 = this;-for (var i = at, e = at + n; i < e; ++i) {- var line = this$1.lines[i];- this$1.height -= line.height;+ var line = this.lines[i];+ this.height -= line.height;cleanUpLine(line);signalLater(line, "delete");}@@ -5562,31 +5663,25 @@// Insert the given array of lines at offset 'at', count them as// having the given height.insertInner: function(at, lines, height) {- var this$1 = this;-this.height += height;this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));- for (var i = 0; i < lines.length; ++i) { lines[i].parent = this$1; }+ for (var i = 0; i < lines.length; ++i) { lines[i].parent = this; }},// Used to iterate over a part of the tree.iterN: function(at, n, op) {- var this$1 = this;-for (var e = at + n; at < e; ++at)- { if (op(this$1.lines[at])) { return true } }+ { if (op(this.lines[at])) { return true } }}};function BranchChunk(children) {- var this$1 = this;-this.children = children;var size = 0, height = 0;for (var i = 0; i < children.length; ++i) {var ch = children[i];size += ch.chunkSize(); height += ch.height;- ch.parent = this$1;+ ch.parent = this;}this.size = size;this.height = height;@@ -5597,16 +5692,14 @@chunkSize: function() { return this.size },removeInner: function(at, n) {- var this$1 = this;-this.size -= n;for (var i = 0; i < this.children.length; ++i) {- var child = this$1.children[i], sz = child.chunkSize();+ var child = this.children[i], sz = child.chunkSize();if (at < sz) {var rm = Math.min(n, sz - at), oldHeight = child.height;child.removeInner(at, rm);- this$1.height -= oldHeight - child.height;- if (sz == rm) { this$1.children.splice(i--, 1); child.parent = null; }+ this.height -= oldHeight - child.height;+ if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }if ((n -= rm) == 0) { break }at = 0;} else { at -= sz; }@@ -5623,18 +5716,14 @@},collapse: function(lines) {- var this$1 = this;-- for (var i = 0; i < this.children.length; ++i) { this$1.children[i].collapse(lines); }+ for (var i = 0; i < this.children.length; ++i) { this.children[i].collapse(lines); }},insertInner: function(at, lines, height) {- var this$1 = this;-this.size += lines.length;this.height += height;for (var i = 0; i < this.children.length; ++i) {- var child = this$1.children[i], sz = child.chunkSize();+ var child = this.children[i], sz = child.chunkSize();if (at <= sz) {child.insertInner(at, lines, height);if (child.lines && child.lines.length > 50) {@@ -5644,11 +5733,11 @@for (var pos = remaining; pos < child.lines.length;) {var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));child.height -= leaf.height;- this$1.children.splice(++i, 0, leaf);- leaf.parent = this$1;+ this.children.splice(++i, 0, leaf);+ leaf.parent = this;}child.lines = child.lines.slice(0, remaining);- this$1.maybeSpill();+ this.maybeSpill();}break}@@ -5680,10 +5769,8 @@},iterN: function(at, n, op) {- var this$1 = this;-for (var i = 0; i < this.children.length; ++i) {- var child = this$1.children[i], sz = child.chunkSize();+ var child = this.children[i], sz = child.chunkSize();if (at < sz) {var used = Math.min(n, sz - at);if (child.iterN(at, used, op)) { return true }@@ -5697,20 +5784,16 @@// Line widgets are block elements displayed above or below a line.var LineWidget = function(doc, node, options) {- var this$1 = this;-if (options) { for (var opt in options) { if (options.hasOwnProperty(opt))- { this$1[opt] = options[opt]; } } }+ { this[opt] = options[opt]; } } }this.doc = doc;this.node = node;};LineWidget.prototype.clear = function () {- var this$1 = this;-var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);if (no == null || !ws) { return }- for (var i = 0; i < ws.length; ++i) { if (ws[i] == this$1) { ws.splice(i--, 1); } }+ for (var i = 0; i < ws.length; ++i) { if (ws[i] == this) { ws.splice(i--, 1); } }if (!ws.length) { line.widgets = null; }var height = widgetHeight(this);updateLineHeight(line, Math.max(0, line.height - height));@@ -5753,7 +5836,7 @@changeLine(doc, handle, "widget", function (line) {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); }+ else { widgets.splice(Math.min(widgets.length, Math.max(0, widget.insertAt)), 0, widget); }widget.line = line;if (cm && !lineIsHidden(doc, line)) {var aboveVisible = heightAtLine(line) < doc.scrollTop;@@ -5793,8 +5876,6 @@// Clear the marker.TextMarker.prototype.clear = function () {- var this$1 = this;-if (this.explicitlyCleared) { return }var cm = this.doc.cm, withOp = cm && !cm.curOp;if (withOp) { startOperation(cm); }@@ -5804,19 +5885,19 @@}var min = null, max = null;for (var i = 0; i < this.lines.length; ++i) {- var line = this$1.lines[i];- var span = getMarkedSpanFor(line.markedSpans, this$1);- if (cm && !this$1.collapsed) { regLineChange(cm, lineNo(line), "text"); }+ var line = this.lines[i];+ var span = getMarkedSpanFor(line.markedSpans, this);+ if (cm && !this.collapsed) { regLineChange(cm, lineNo(line), "text"); }else if (cm) {if (span.to != null) { max = lineNo(line); }if (span.from != null) { min = lineNo(line); }}line.markedSpans = removeMarkedSpan(line.markedSpans, span);- if (span.from == null && this$1.collapsed && !lineIsHidden(this$1.doc, line) && cm)+ if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm){ updateLineHeight(line, textHeight(cm.display)); }}if (cm && this.collapsed && !cm.options.lineWrapping) { for (var i$1 = 0; i$1 < this.lines.length; ++i$1) {- var visual = visualLine(this$1.lines[i$1]), len = lineLength(visual);+ var visual = visualLine(this.lines[i$1]), len = lineLength(visual);if (len > cm.display.maxLineLength) {cm.display.maxLine = visual;cm.display.maxLineLength = len;@@ -5842,13 +5923,11 @@// Pos objects returned contain a line object, rather than a line// number (used to prevent looking up the same line twice).TextMarker.prototype.find = function (side, lineObj) {- var this$1 = this;-if (side == null && this.type == "bookmark") { side = 1; }var from, to;for (var i = 0; i < this.lines.length; ++i) {- var line = this$1.lines[i];- var span = getMarkedSpanFor(line.markedSpans, this$1);+ var line = this.lines[i];+ var span = getMarkedSpanFor(line.markedSpans, this);if (span.from != null) {from = Pos(lineObj ? line : lineNo(line), span.from);if (side == -1) { return from }@@ -5943,7 +6022,7 @@if (marker.collapsed && curLine != from.line) { updateLineHeight(line, 0); }addMarkedSpan(line, new MarkedSpan(marker,curLine == from.line ? from.ch : null,- curLine == to.line ? to.ch : null));+ curLine == to.line ? to.ch : null), doc.cm && doc.cm.curOp);++curLine;});// lineIsHidden depends on the presence of the spans, so needs a second pass@@ -5982,21 +6061,17 @@// implemented as a meta-marker-object controlling multiple normal// markers.var SharedTextMarker = function(markers, primary) {- var this$1 = this;-this.markers = markers;this.primary = primary;for (var i = 0; i < markers.length; ++i)- { markers[i].parent = this$1; }+ { markers[i].parent = this; }};SharedTextMarker.prototype.clear = function () {- var this$1 = this;-if (this.explicitlyCleared) { return }this.explicitlyCleared = true;for (var i = 0; i < this.markers.length; ++i)- { this$1.markers[i].clear(); }+ { this.markers[i].clear(); }signalLater(this, "clear");};@@ -6119,6 +6194,7 @@getRange: function(from, to, lineSep) {var lines = getBetween(this, clipPos(this, from), clipPos(this, to));if (lineSep === false) { return lines }+ if (lineSep === '') { return lines.join('') }return lines.join(lineSep || this.lineSeparator())},@@ -6139,11 +6215,11 @@clipPos: function(pos) {return clipPos(this, pos)},getCursor: function(start) {- var range$$1 = this.sel.primary(), pos;- if (start == null || start == "head") { pos = range$$1.head; }- else if (start == "anchor") { pos = range$$1.anchor; }- else if (start == "end" || start == "to" || start === false) { pos = range$$1.to(); }- else { pos = range$$1.from(); }+ var range = this.sel.primary(), pos;+ if (start == null || start == "head") { pos = range.head; }+ else if (start == "anchor") { pos = range.anchor; }+ else if (start == "end" || start == "to" || start === false) { pos = range.to(); }+ else { pos = range.from(); }return pos},listSelections: function() { return this.sel.ranges },@@ -6166,13 +6242,11 @@extendSelections(this, clipPosArray(this, heads), options);}),setSelections: docMethodOp(function(ranges, primary, options) {- var this$1 = this;-if (!ranges.length) { return }var out = [];for (var i = 0; i < ranges.length; i++)- { out[i] = new Range(clipPos(this$1, ranges[i].anchor),- clipPos(this$1, ranges[i].head)); }+ { out[i] = new Range(clipPos(this, ranges[i].anchor),+ clipPos(this, ranges[i].head || ranges[i].anchor)); }if (primary == null) { primary = Math.min(ranges.length - 1, this.sel.primIndex); }setSelection(this, normalizeSelection(this.cm, out, primary), options);}),@@ -6183,23 +6257,19 @@}),getSelection: function(lineSep) {- var this$1 = this;-var ranges = this.sel.ranges, lines;for (var i = 0; i < ranges.length; i++) {- var sel = getBetween(this$1, ranges[i].from(), ranges[i].to());+ var sel = getBetween(this, ranges[i].from(), ranges[i].to());lines = lines ? lines.concat(sel) : sel;}if (lineSep === false) { return lines }else { return lines.join(lineSep || this.lineSeparator()) }},getSelections: function(lineSep) {- var this$1 = this;-var parts = [], ranges = this.sel.ranges;for (var i = 0; i < ranges.length; i++) {- var sel = getBetween(this$1, ranges[i].from(), ranges[i].to());- if (lineSep !== false) { sel = sel.join(lineSep || this$1.lineSeparator()); }+ var sel = getBetween(this, ranges[i].from(), ranges[i].to());+ if (lineSep !== false) { sel = sel.join(lineSep || this.lineSeparator()); }parts[i] = sel;}return parts@@ -6211,16 +6281,14 @@this.replaceSelections(dup, collapse, origin || "+input");},replaceSelections: docMethodOp(function(code, collapse, origin) {- var this$1 = this;-var changes = [], sel = this.sel;for (var i = 0; i < sel.ranges.length; i++) {- var range$$1 = sel.ranges[i];- changes[i] = {from: range$$1.from(), to: range$$1.to(), text: this$1.splitLines(code[i]), origin: origin};+ var range = sel.ranges[i];+ changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};}var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);for (var i$1 = changes.length - 1; i$1 >= 0; i$1--)- { makeChange(this$1, changes[i$1]); }+ { makeChange(this, changes[i$1]); }if (newSel) { setSelectionReplaceHistory(this, newSel); }else if (this.cm) { ensureCursorVisible(this.cm); }}),@@ -6238,7 +6306,12 @@for (var i$1 = 0; i$1 < hist.undone.length; i$1++) { if (!hist.undone[i$1].ranges) { ++undone; } }return {undo: done, redo: undone}},- clearHistory: function() {this.history = new History(this.history.maxGeneration);},+ clearHistory: function() {+ var this$1 = this;++ this.history = new History(this.history);+ linkedDocs(this, function (doc) { return doc.history = this$1.history; }, true);+ },markClean: function() {this.cleanGeneration = this.changeGeneration(true);@@ -6257,7 +6330,7 @@undone: copyHistoryArray(this.history.undone)}},setHistory: function(histData) {- var hist = this.history = new History(this.history.maxGeneration);+ var hist = this.history = new History(this.history);hist.done = copyHistoryArray(histData.done.slice(0), null, true);hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);},@@ -6359,18 +6432,18 @@},findMarks: function(from, to, filter) {from = clipPos(this, from); to = clipPos(this, to);- var found = [], lineNo$$1 = from.line;+ var found = [], lineNo = from.line;this.iter(from.line, to.line + 1, function (line) {var spans = line.markedSpans;if (spans) { for (var i = 0; i < spans.length; i++) {var span = spans[i];- if (!(span.to != null && lineNo$$1 == from.line && from.ch >= span.to ||- span.from == null && lineNo$$1 != from.line ||- span.from != null && lineNo$$1 == 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); }} }- ++lineNo$$1;+ ++lineNo;});return found},@@ -6385,14 +6458,14 @@},posFromIndex: function(off) {- var ch, lineNo$$1 = this.first, sepSize = this.lineSeparator().length;+ var ch, lineNo = this.first, sepSize = this.lineSeparator().length;this.iter(function (line) {var sz = line.text.length + sepSize;if (sz > off) { ch = off; return true }off -= sz;- ++lineNo$$1;+ ++lineNo;});- return clipPos(this, Pos(lineNo$$1, ch))+ return clipPos(this, Pos(lineNo, ch))},indexFromPos: function (coords) {coords = clipPos(this, coords);@@ -6431,15 +6504,13 @@return copy},unlinkDoc: function(other) {- var this$1 = this;-if (other instanceof CodeMirror) { other = other.doc; }if (this.linked) { for (var i = 0; i < this.linked.length; ++i) {- var link = this$1.linked[i];+ var link = this.linked[i];if (link.doc != other) { continue }- this$1.linked.splice(i, 1);- other.unlinkDoc(this$1);- detachSharedMarkers(findSharedMarkers(this$1));+ this.linked.splice(i, 1);+ other.unlinkDoc(this);+ detachSharedMarkers(findSharedMarkers(this));break} }// If the histories were shared, split them again@@ -6491,28 +6562,39 @@// and insert it.if (files && files.length && window.FileReader && window.File) {var n = files.length, text = Array(n), read = 0;- var loadFile = function (file, i) {- if (cm.options.allowDropFileTypes &&- indexOf(cm.options.allowDropFileTypes, file.type) == -1)- { return }-- var reader = new FileReader;- reader.onload = operation(cm, function () {- var content = reader.result;- if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) { content = ""; }- text[i] = content;- if (++read == n) {+ var markAsReadAndPasteIfAllFilesAreRead = function () {+ if (++read == n) {+ operation(cm, function () {pos = clipPos(cm.doc, pos);var change = {from: pos, to: pos,- text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),+ text: cm.doc.splitLines(+ text.filter(function (t) { return t != null; }).join(cm.doc.lineSeparator())),origin: "paste"};makeChange(cm.doc, change);- setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));+ setSelectionReplaceHistory(cm.doc, simpleSelection(clipPos(cm.doc, pos), clipPos(cm.doc, changeEnd(change))));+ })();+ }+ };+ var readTextFromFile = function (file, i) {+ if (cm.options.allowDropFileTypes &&+ indexOf(cm.options.allowDropFileTypes, file.type) == -1) {+ markAsReadAndPasteIfAllFilesAreRead();+ return+ }+ var reader = new FileReader;+ reader.onerror = function () { return markAsReadAndPasteIfAllFilesAreRead(); };+ reader.onload = function () {+ var content = reader.result;+ if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) {+ markAsReadAndPasteIfAllFilesAreRead();+ return}- });+ text[i] = content;+ markAsReadAndPasteIfAllFilesAreRead();+ };reader.readAsText(file);};- for (var i = 0; i < n; ++i) { loadFile(files[i], i); }+ for (var i = 0; i < files.length; i++) { readTextFromFile(files[i], i); }} else { // Normal drop// Don't do a replace if the drop happened inside of the selected text.if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {@@ -6534,7 +6616,7 @@cm.display.input.focus();}}- catch(e){}+ catch(e$1){}}}@@ -6628,9 +6710,9 @@19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",- 106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete", 145: "ScrollLock",+ 106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 145: "ScrollLock",173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",- 221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",+ 221: "]", 222: "'", 224: "Mod", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"};@@ -6667,10 +6749,9 @@// Very basic readline/emacs-style bindings, which are standard on Mac.keyMap.emacsy = {"Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",- "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",- "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",- "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",- "Ctrl-O": "openLine"+ "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd", "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp",+ "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine",+ "Ctrl-T": "transposeChars", "Ctrl-O": "openLine"};keyMap.macDefault = {"Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",@@ -6737,18 +6818,18 @@return keymap}- function lookupKey(key, map$$1, handle, context) {- map$$1 = getKeyMap(map$$1);- var found = map$$1.call ? map$$1.call(key, context) : map$$1[key];+ function lookupKey(key, map, handle, context) {+ map = getKeyMap(map);+ var found = map.call ? map.call(key, context) : map[key];if (found === false) { return "nothing" }if (found === "...") { return "multi" }if (found != null && handle(found)) { return "handled" }- if (map$$1.fallthrough) {- if (Object.prototype.toString.call(map$$1.fallthrough) != "[object Array]")- { return lookupKey(key, map$$1.fallthrough, handle, context) }- for (var i = 0; i < map$$1.fallthrough.length; i++) {- var result = lookupKey(key, map$$1.fallthrough[i], handle, context);+ if (map.fallthrough) {+ if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")+ { return lookupKey(key, map.fallthrough, handle, context) }+ for (var i = 0; i < map.fallthrough.length; i++) {+ var result = lookupKey(key, map.fallthrough[i], handle, context);if (result) { return result }}}@@ -6765,7 +6846,7 @@var base = name;if (event.altKey && base != "Alt") { name = "Alt-" + name; }if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { name = "Ctrl-" + name; }- if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") { name = "Cmd-" + name; }+ if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Mod") { name = "Cmd-" + name; }if (!noShift && event.shiftKey && base != "Shift") { name = "Shift-" + name; }return name}@@ -6822,6 +6903,7 @@function endOfLine(visually, cm, lineObj, lineNo, dir) {if (visually) {+ if (cm.doc.direction == "rtl") { dir = -dir; }var order = getOrder(lineObj, cm.doc.direction);if (order) {var part = dir < 0 ? lst(order) : order[0];@@ -6990,7 +7072,7 @@goGroupRight: function (cm) { return cm.moveH(1, "group"); },goGroupLeft: function (cm) { return cm.moveH(-1, "group"); },goWordRight: function (cm) { return cm.moveH(1, "word"); },- delCharBefore: function (cm) { return cm.deleteH(-1, "char"); },+ delCharBefore: function (cm) { return cm.deleteH(-1, "codepoint"); },delCharAfter: function (cm) { return cm.deleteH(1, "char"); },delWordBefore: function (cm) { return cm.deleteH(-1, "word"); },delWordAfter: function (cm) { return cm.deleteH(1, "word"); },@@ -7076,7 +7158,7 @@var line = getLine(cm.doc, start.line);var order = getOrder(line, cm.doc.direction);if (!order || order[0].level == 0) {- var firstNonWS = Math.max(0, line.text.search(/\S/));+ var firstNonWS = Math.max(start.ch, line.text.search(/\S/));var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)}@@ -7179,7 +7261,8 @@var lastStoppedKey = null;function onKeyDown(e) {var cm = this;- cm.curOp.focus = activeElt();+ if (e.target && e.target != cm.display.input.getField()) { return }+ cm.curOp.focus = activeElt(doc(cm));if (signalDOMEvent(cm, e)) { return }// IE does strange things with escape.if (ie && ie_version < 11 && e.keyCode == 27) { e.returnValue = false; }@@ -7192,6 +7275,8 @@if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey)){ cm.replaceSelection("", null, "cut"); }}+ if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand)+ { document.execCommand("cut"); }// Turn mouse into crosshair when Alt is held on Mac.if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))@@ -7220,6 +7305,7 @@function onKeyPress(e) {var cm = this;+ if (e.target && e.target != cm.display.input.getField()) { return }if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) { return }var keyCode = e.keyCode, charCode = e.charCode;if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}@@ -7283,7 +7369,7 @@}if (clickInGutter(cm, e)) { return }var pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single";- window.focus();+ win(cm).focus();// #3261: make sure, that we're not starting a second selectionif (button == 1 && cm.state.selectingText)@@ -7338,7 +7424,7 @@function leftButtonDown(cm, pos, repeat, event) {if (ie) { setTimeout(bind(ensureFocus, cm), 0); }- else { cm.curOp.focus = activeElt(); }+ else { cm.curOp.focus = activeElt(doc(cm)); }var behavior = configureMouse(cm, repeat, event);@@ -7359,6 +7445,10 @@var dragEnd = operation(cm, function (e) {if (webkit) { display.scroller.draggable = false; }cm.state.draggingText = false;+ if (cm.state.delayingBlurEvent) {+ if (cm.hasFocus()) { cm.state.delayingBlurEvent = false; }+ else { delayBlurEvent(cm); }+ }off(display.wrapper.ownerDocument, "mouseup", dragEnd);off(display.wrapper.ownerDocument, "mousemove", mouseMove);off(display.scroller, "dragstart", dragStart);@@ -7368,8 +7458,8 @@if (!behavior.addNew){ extendSelection(cm.doc, pos, null, null, behavior.extend); }// Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)- if (webkit || ie && ie_version == 9)- { setTimeout(function () {display.wrapper.ownerDocument.body.focus(); display.input.focus();}, 20); }+ if ((webkit && !safari) || ie && ie_version == 9)+ { setTimeout(function () {display.wrapper.ownerDocument.body.focus({preventScroll: true}); display.input.focus();}, 20); }else{ display.input.focus(); }}@@ -7382,15 +7472,15 @@if (webkit) { display.scroller.draggable = true; }cm.state.draggingText = dragEnd;dragEnd.copy = !behavior.moveOnDrag;- // IE's approach to draggable- if (display.scroller.dragDrop) { display.scroller.dragDrop(); }on(display.wrapper.ownerDocument, "mouseup", dragEnd);on(display.wrapper.ownerDocument, "mousemove", mouseMove);on(display.scroller, "dragstart", dragStart);on(display.scroller, "drop", dragEnd);- delayBlurEvent(cm);+ cm.state.delayingBlurEvent = true;setTimeout(function () { return display.input.focus(); }, 20);+ // IE's approach to draggable+ if (display.scroller.dragDrop) { display.scroller.dragDrop(); }}function rangeForUnit(cm, pos, unit) {@@ -7403,19 +7493,20 @@// Normal selection, as opposed to text dragging.function leftButtonSelect(cm, event, start, behavior) {- var display = cm.display, doc = cm.doc;+ if (ie) { delayBlurEvent(cm); }+ var display = cm.display, doc$1 = cm.doc;e_preventDefault(event);- var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;+ var ourRange, ourIndex, startSel = doc$1.sel, ranges = startSel.ranges;if (behavior.addNew && !behavior.extend) {- ourIndex = doc.sel.contains(start);+ ourIndex = doc$1.sel.contains(start);if (ourIndex > -1){ ourRange = ranges[ourIndex]; }else{ ourRange = new Range(start, start); }} else {- ourRange = doc.sel.primary();- ourIndex = doc.sel.primIndex;+ ourRange = doc$1.sel.primary();+ ourIndex = doc$1.sel.primIndex;}if (behavior.unit == "rectangle") {@@ -7423,27 +7514,27 @@start = posFromMouse(cm, event, true, true);ourIndex = -1;} else {- var range$$1 = rangeForUnit(cm, start, behavior.unit);+ var range = rangeForUnit(cm, start, behavior.unit);if (behavior.extend)- { ourRange = extendRange(ourRange, range$$1.anchor, range$$1.head, behavior.extend); }+ { ourRange = extendRange(ourRange, range.anchor, range.head, behavior.extend); }else- { ourRange = range$$1; }+ { ourRange = range; }}if (!behavior.addNew) {ourIndex = 0;- setSelection(doc, new Selection([ourRange], 0), sel_mouse);- startSel = doc.sel;+ setSelection(doc$1, new Selection([ourRange], 0), sel_mouse);+ startSel = doc$1.sel;} else if (ourIndex == -1) {ourIndex = ranges.length;- setSelection(doc, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex),+ setSelection(doc$1, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex),{scroll: false, origin: "*mouse"});} else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) {- setSelection(doc, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),+ setSelection(doc$1, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),{scroll: false, origin: "*mouse"});- startSel = doc.sel;+ startSel = doc$1.sel;} else {- replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);+ replaceOneSelection(doc$1, ourIndex, ourRange, sel_mouse);}var lastPos = start;@@ -7453,35 +7544,35 @@if (behavior.unit == "rectangle") {var ranges = [], tabSize = cm.options.tabSize;- var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);- var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);+ var startCol = countColumn(getLine(doc$1, start.line).text, start.ch, tabSize);+ var posCol = countColumn(getLine(doc$1, pos.line).text, pos.ch, tabSize);var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));line <= end; line++) {- var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);+ var text = getLine(doc$1, line).text, leftPos = findColumn(text, left, tabSize);if (left == right){ ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); }else if (text.length > leftPos){ ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); }}if (!ranges.length) { ranges.push(new Range(start, start)); }- setSelection(doc, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),+ setSelection(doc$1, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),{origin: "*mouse", scroll: false});cm.scrollIntoView(pos);} else {var oldRange = ourRange;- var range$$1 = rangeForUnit(cm, pos, behavior.unit);+ var range = rangeForUnit(cm, pos, behavior.unit);var anchor = oldRange.anchor, head;- if (cmp(range$$1.anchor, anchor) > 0) {- head = range$$1.head;- anchor = minPos(oldRange.from(), range$$1.anchor);+ if (cmp(range.anchor, anchor) > 0) {+ head = range.head;+ anchor = minPos(oldRange.from(), range.anchor);} else {- head = range$$1.anchor;- anchor = maxPos(oldRange.to(), range$$1.head);+ head = range.anchor;+ anchor = maxPos(oldRange.to(), range.head);}var ranges$1 = startSel.ranges.slice(0);- ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head));- setSelection(doc, normalizeSelection(cm, ranges$1, ourIndex), sel_mouse);+ ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc$1, anchor), head));+ setSelection(doc$1, normalizeSelection(cm, ranges$1, ourIndex), sel_mouse);}}@@ -7497,9 +7588,9 @@var cur = posFromMouse(cm, e, true, behavior.unit == "rectangle");if (!cur) { return }if (cmp(cur, lastPos) != 0) {- cm.curOp.focus = activeElt();+ cm.curOp.focus = activeElt(doc(cm));extendTo(cur);- var visible = visibleLines(display, doc);+ var visible = visibleLines(display, doc$1);if (cur.line >= visible.to || cur.line < visible.from){ setTimeout(operation(cm, function () {if (counter == curCount) { extend(e); }}), 150); }} else {@@ -7515,11 +7606,16 @@function done(e) {cm.state.selectingText = false;counter = Infinity;- e_preventDefault(e);- display.input.focus();+ // If e is null or undefined we interpret this as someone trying+ // to explicitly cancel the selection rather than the user+ // letting go of the mouse button.+ if (e) {+ e_preventDefault(e);+ display.input.focus();+ }off(display.wrapper.ownerDocument, "mousemove", move);off(display.wrapper.ownerDocument, "mouseup", up);- doc.history.lastSelOrigin = null;+ doc$1.history.lastSelOrigin = null;}var move = operation(cm, function (e) {@@ -7534,17 +7630,17 @@// Used when mouse-selecting to adjust the anchor to the proper side// of a bidi jump depending on the visual position of the head.- function bidiSimplify(cm, range$$1) {- var anchor = range$$1.anchor;- var head = range$$1.head;+ function bidiSimplify(cm, range) {+ var anchor = range.anchor;+ var head = range.head;var anchorLine = getLine(cm.doc, anchor.line);- if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) { return range$$1 }+ if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) { return range }var order = getOrder(anchorLine);- if (!order) { return range$$1 }+ if (!order) { return range }var index = getBidiPartAt(order, anchor.ch, anchor.sticky), part = order[index];- if (part.from != anchor.ch && part.to != anchor.ch) { return range$$1 }+ if (part.from != anchor.ch && part.to != anchor.ch) { return range }var boundary = index + ((part.from == anchor.ch) == (part.level != 1) ? 0 : 1);- if (boundary == 0 || boundary == order.length) { return range$$1 }+ if (boundary == 0 || boundary == order.length) { return range }// Compute the relative visual position of the head compared to the// anchor (<0 is to the left, >0 to the right)@@ -7563,7 +7659,7 @@var usePart = order[boundary + (leftSide ? -1 : 0)];var from = leftSide == (usePart.level == 1);var ch = from ? usePart.from : usePart.to, sticky = from ? "after" : "before";- return anchor.ch == ch && anchor.sticky == sticky ? range$$1 : new Range(new Pos(anchor.line, ch, sticky), head)+ return anchor.ch == ch && anchor.sticky == sticky ? range : new Range(new Pos(anchor.line, ch, sticky), head)}@@ -7576,7 +7672,7 @@mY = e.touches[0].clientY;} else {try { mX = e.clientX; mY = e.clientY; }- catch(e) { return false }+ catch(e$1) { return false }}if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) { return false }if (prevent) { e_preventDefault(e); }@@ -7587,12 +7683,12 @@if (mY > lineBox.bottom || !hasHandler(cm, type)) { return e_defaultPrevented(e) }mY -= lineBox.top - display.viewOffset;- for (var i = 0; i < cm.options.gutters.length; ++i) {+ for (var i = 0; i < cm.display.gutterSpecs.length; ++i) {var g = display.gutters.childNodes[i];if (g && g.getBoundingClientRect().right >= mX) {var line = lineAtHeight(cm.doc, mY);- var gutter = cm.options.gutters[i];- signal(cm, type, cm, line, gutter, e);+ var gutter = cm.display.gutterSpecs[i];+ signal(cm, type, cm, line, gutter.className, e);return e_defaultPrevented(e)}}@@ -7676,7 +7772,7 @@for (var i = newBreaks.length - 1; i >= 0; i--){ replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); }});- option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, function (cm, val, old) {+ option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) {cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");if (old != Init) { cm.refresh(); }});@@ -7686,12 +7782,14 @@throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME}, true);option("spellcheck", false, function (cm, val) { return cm.getInputField().spellcheck = val; }, true);+ option("autocorrect", false, function (cm, val) { return cm.getInputField().autocorrect = val; }, true);+ option("autocapitalize", false, function (cm, val) { return cm.getInputField().autocapitalize = val; }, true);option("rtlMoveVisually", !windows);option("wholeLineUpdateBefore", true);option("theme", "default", function (cm) {themeChanged(cm);- guttersChanged(cm);+ updateGutters(cm);}, true);option("keyMap", "default", function (cm, val, old) {var next = getKeyMap(val);@@ -7703,9 +7801,9 @@option("configureMouse", null);option("lineWrapping", false, wrappingChanged, true);- option("gutters", [], function (cm) {- setGuttersForLineNumbers(cm.options);- guttersChanged(cm);+ option("gutters", [], function (cm, val) {+ cm.display.gutterSpecs = getGutters(val, cm.options.lineNumbers);+ updateGutters(cm);}, true);option("fixedGutter", true, function (cm, val) {cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";@@ -7718,12 +7816,12 @@cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);}, true);- option("lineNumbers", false, function (cm) {- setGuttersForLineNumbers(cm.options);- guttersChanged(cm);+ option("lineNumbers", false, function (cm, val) {+ cm.display.gutterSpecs = getGutters(cm.options.gutters, val);+ updateGutters(cm);}, true);- option("firstLineNumber", 1, guttersChanged, true);- option("lineNumberFormatter", function (integer) { return integer; }, guttersChanged, true);+ option("firstLineNumber", 1, updateGutters, true);+ option("lineNumberFormatter", function (integer) { return integer; }, updateGutters, true);option("showCursorWhenSelecting", false, updateSelection, true);option("resetSelectionOnContextMenu", true);@@ -7738,6 +7836,12 @@}cm.display.input.readOnlyChanged(val);});++ option("screenReaderLabel", null, function (cm, val) {+ val = (val === '') ? null : val;+ cm.display.input.screenReaderLabelChanged(val);+ });+option("disableInput", false, function (cm, val) {if (!val) { cm.display.input.reset(); }}, true);option("dragDrop", true, dragDropChanged);option("allowDropFileTypes", null);@@ -7765,12 +7869,6 @@option("phrases", null);}- function guttersChanged(cm) {- updateGutters(cm);- regChange(cm);- alignHorizontally(cm);- }-function dragDropChanged(cm, value, old) {var wasOn = old && old != Init;if (!value != !wasOn) {@@ -7810,7 +7908,6 @@this.options = options = options ? copyObj(options) : {};// Determine effective options based on given values and defaults.copyObj(defaults, options, false);- setGuttersForLineNumbers(options);var doc = options.value;if (typeof doc == "string") { doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction); }@@ -7818,9 +7915,8 @@this.doc = doc;var input = new CodeMirror.inputStyles[options.inputStyle](this);- var display = this.display = new Display(place, doc, input);+ var display = this.display = new Display(place, doc, input, options);display.wrapper.CodeMirror = this;- updateGutters(this);themeChanged(this);if (options.lineWrapping){ this.display.wrapper.className += " CodeMirror-wrap"; }@@ -7834,7 +7930,7 @@delayingBlurEvent: false,focused: false,suppressEdits: false, // used to disable editing during key handlers when in readOnly mode- pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll+ pasteIncoming: -1, cutIncoming: -1, // help recognize paste/cut edits in input.pollselectingText: false,draggingText: false,highlight: new Delayed(), // stores highlight worker timeout@@ -7856,15 +7952,17 @@attachDoc(this, doc);if ((options.autofocus && !mobile) || this.hasFocus())- { setTimeout(bind(onFocus, this), 20); }+ { setTimeout(function () {+ if (this$1.hasFocus() && !this$1.state.focused) { onFocus(this$1); }+ }, 20); }else{ onBlur(this); }for (var opt in optionHandlers) { if (optionHandlers.hasOwnProperty(opt))- { optionHandlers[opt](this$1, options[opt], Init); } }+ { optionHandlers[opt](this, options[opt], Init); } }maybeUpdateLineNumberWidth(this);if (options.finishInit) { options.finishInit(this); }- for (var i = 0; i < initHooks.length; ++i) { initHooks[i](this$1); }+ for (var i = 0; i < initHooks.length; ++i) { initHooks[i](this); }endOperation(this);// Suppress optimizelegibility in Webkit, since it breaks text// measuring on line wrapping boundaries.@@ -7898,6 +7996,9 @@// which point we can't mess with it anymore. Context menu is// handled in onMouseDown for these browsers.on(d.scroller, "contextmenu", function (e) { return onContextMenu(cm, e); });+ on(d.input.getField(), "contextmenu", function (e) {+ if (!d.scroller.contains(e.target)) { onContextMenu(cm, e); }+ });// Used to suppress mouse event handling when a touch happensvar touchFinished, prevTouch = {end: 0};@@ -8067,7 +8168,8 @@cm.display.shift = false;if (!sel) { sel = doc.sel; }- var paste = cm.state.pasteIncoming || origin == "paste";+ var recent = +new Date - 200;+ var paste = origin == "paste" || cm.state.pasteIncoming > recent;var textLines = splitLinesAuto(inserted), multiPaste = null;// When pasting N lines into N selections, insert one line per selectionif (paste && sel.ranges.length > 1) {@@ -8082,22 +8184,21 @@}}- var updateInput;+ var updateInput = cm.curOp.updateInput;// Normal behavior is to insert the new text into every selectionfor (var i$1 = sel.ranges.length - 1; i$1 >= 0; i$1--) {- var range$$1 = sel.ranges[i$1];- var from = range$$1.from(), to = range$$1.to();- if (range$$1.empty()) {+ var range = sel.ranges[i$1];+ var from = range.from(), to = range.to();+ if (range.empty()) {if (deleted && deleted > 0) // Handle deletion{ from = Pos(from.line, from.ch - deleted); }else if (cm.state.overwrite && !paste) // Handle overwrite{ to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)); }- else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)+ else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == textLines.join("\n")){ from = to = Pos(from.line, 0); }}- updateInput = cm.curOp.updateInput;var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i$1 % multiPaste.length] : textLines,- origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};+ origin: origin || (paste ? "paste" : cm.state.cutIncoming > recent ? "cut" : "+input")};makeChange(cm.doc, changeEvent);signalLater(cm, "inputRead", cm, changeEvent);}@@ -8105,16 +8206,16 @@{ triggerElectric(cm, inserted); }ensureCursorVisible(cm);- cm.curOp.updateInput = updateInput;+ if (cm.curOp.updateInput < 2) { cm.curOp.updateInput = updateInput; }cm.curOp.typing = true;- cm.state.pasteIncoming = cm.state.cutIncoming = false;+ cm.state.pasteIncoming = cm.state.cutIncoming = -1;}function handlePaste(e, cm) {var pasted = e.clipboardData && e.clipboardData.getData("Text");if (pasted) {e.preventDefault();- if (!cm.isReadOnly() && !cm.options.disableInput)+ if (!cm.isReadOnly() && !cm.options.disableInput && cm.hasFocus()){ runInOp(cm, function () { return applyTextInput(cm, pasted, 0, null, "paste"); }); }return true}@@ -8126,21 +8227,21 @@var sel = cm.doc.sel;for (var i = sel.ranges.length - 1; i >= 0; i--) {- var range$$1 = sel.ranges[i];- if (range$$1.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range$$1.head.line)) { continue }- var mode = cm.getModeAt(range$$1.head);+ var range = sel.ranges[i];+ if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) { continue }+ var mode = cm.getModeAt(range.head);var indented = false;if (mode.electricChars) {for (var j = 0; j < mode.electricChars.length; j++){ if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {- indented = indentLine(cm, range$$1.head.line, "smart");+ indented = indentLine(cm, range.head.line, "smart");break} }} else if (mode.electricInput) {- if (mode.electricInput.test(getLine(cm.doc, range$$1.head.line).text.slice(0, range$$1.head.ch)))- { indented = indentLine(cm, range$$1.head.line, "smart"); }+ if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))+ { indented = indentLine(cm, range.head.line, "smart"); }}- if (indented) { signalLater(cm, "electricInput", cm, range$$1.head.line); }+ if (indented) { signalLater(cm, "electricInput", cm, range.head.line); }}}@@ -8155,14 +8256,14 @@return {text: text, ranges: ranges}}- function disableBrowserMagic(field, spellcheck) {- field.setAttribute("autocorrect", "off");- field.setAttribute("autocapitalize", "off");+ function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) {+ field.setAttribute("autocorrect", autocorrect ? "" : "off");+ field.setAttribute("autocapitalize", autocapitalize ? "" : "off");field.setAttribute("spellcheck", !!spellcheck);}function hiddenTextarea() {- var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");+ var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; min-height: 1em; outline: none");var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");// The textarea is kept positioned near the cursor to prevent the// fact that it'll be scrolled into view on input from scrolling@@ -8191,7 +8292,7 @@CodeMirror.prototype = {constructor: CodeMirror,- focus: function(){window.focus(); this.display.input.focus();},+ focus: function(){win(this).focus(); this.display.input.focus();},setOption: function(option, value) {var options = this.options, old = options[option];@@ -8205,13 +8306,13 @@getOption: function(option) {return this.options[option]},getDoc: function() {return this.doc},- addKeyMap: function(map$$1, bottom) {- this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map$$1));+ addKeyMap: function(map, bottom) {+ this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));},- removeKeyMap: function(map$$1) {+ removeKeyMap: function(map) {var maps = this.state.keyMaps;for (var i = 0; i < maps.length; ++i)- { if (maps[i] == map$$1 || maps[i].name == map$$1) {+ { if (maps[i] == map || maps[i].name == map) {maps.splice(i, 1);return true} }@@ -8228,15 +8329,13 @@regChange(this);}),removeOverlay: methodOp(function(spec) {- var this$1 = this;-var overlays = this.state.overlays;for (var i = 0; i < overlays.length; ++i) {var cur = overlays[i].modeSpec;if (cur == spec || typeof spec == "string" && cur.name == spec) {overlays.splice(i, 1);- this$1.state.modeGen++;- regChange(this$1);+ this.state.modeGen++;+ regChange(this);return}}@@ -8250,24 +8349,22 @@if (isLine(this.doc, n)) { indentLine(this, n, dir, aggressive); }}),indentSelection: methodOp(function(how) {- var this$1 = this;-var ranges = this.doc.sel.ranges, end = -1;for (var i = 0; i < ranges.length; i++) {- var range$$1 = ranges[i];- if (!range$$1.empty()) {- var from = range$$1.from(), to = range$$1.to();+ var range = ranges[i];+ if (!range.empty()) {+ var from = range.from(), to = range.to();var start = Math.max(end, from.line);- end = Math.min(this$1.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;+ end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;for (var j = start; j < end; ++j)- { indentLine(this$1, j, how); }- var newRanges = this$1.doc.sel.ranges;+ { indentLine(this, j, how); }+ var newRanges = this.doc.sel.ranges;if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)- { replaceOneSelection(this$1.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll); }- } else if (range$$1.head.line > end) {- indentLine(this$1, range$$1.head.line, how, true);- end = range$$1.head.line;- if (i == this$1.doc.sel.primIndex) { ensureCursorVisible(this$1); }+ { replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll); }+ } else if (range.head.line > end) {+ indentLine(this, range.head.line, how, true);+ end = range.head.line;+ if (i == this.doc.sel.primIndex) { ensureCursorVisible(this); }}}}),@@ -8309,8 +8406,6 @@},getHelpers: function(pos, type) {- var this$1 = this;-var found = [];if (!helpers.hasOwnProperty(type)) { return found }var help = helpers[type], mode = this.getModeAt(pos);@@ -8328,7 +8423,7 @@}for (var i$1 = 0; i$1 < help._global.length; i$1++) {var cur = help._global[i$1];- if (cur.pred(mode, this$1) && indexOf(found, cur.val) == -1)+ if (cur.pred(mode, this) && indexOf(found, cur.val) == -1){ found.push(cur.val); }}return found@@ -8341,10 +8436,10 @@},cursorCoords: function(start, mode) {- var pos, range$$1 = this.doc.sel.primary();- if (start == null) { pos = range$$1.head; }+ var pos, range = this.doc.sel.primary();+ if (start == null) { pos = range.head; }else if (typeof start == "object") { pos = clipPos(this.doc, start); }- else { pos = start ? range$$1.from() : range$$1.to(); }+ else { pos = start ? range.from() : range.to(); }return cursorCoords(this, pos, mode || "page")},@@ -8428,13 +8523,11 @@triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),findPosH: function(from, amount, unit, visually) {- var this$1 = this;-var dir = 1;if (amount < 0) { dir = -1; amount = -amount; }var cur = clipPos(this.doc, from);for (var i = 0; i < amount; ++i) {- cur = findPosH(this$1.doc, cur, dir, unit, visually);+ cur = findPosH(this.doc, cur, dir, unit, visually);if (cur.hitSide) { break }}return cur@@ -8443,11 +8536,11 @@moveH: methodOp(function(dir, unit) {var this$1 = this;- this.extendSelectionsBy(function (range$$1) {- if (this$1.display.shift || this$1.doc.extend || range$$1.empty())- { return findPosH(this$1.doc, range$$1.head, dir, unit, this$1.options.rtlMoveVisually) }+ this.extendSelectionsBy(function (range) {+ if (this$1.display.shift || this$1.doc.extend || range.empty())+ { return findPosH(this$1.doc, range.head, dir, unit, this$1.options.rtlMoveVisually) }else- { return dir < 0 ? range$$1.from() : range$$1.to() }+ { return dir < 0 ? range.from() : range.to() }}, sel_move);}),@@ -8456,23 +8549,21 @@if (sel.somethingSelected()){ doc.replaceSelection("", null, "+delete"); }else- { deleteNearSelection(this, function (range$$1) {- var other = findPosH(doc, range$$1.head, dir, unit, false);- return dir < 0 ? {from: other, to: range$$1.head} : {from: range$$1.head, to: other}+ { deleteNearSelection(this, function (range) {+ var other = findPosH(doc, range.head, dir, unit, false);+ return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other}}); }}),findPosV: function(from, amount, unit, goalColumn) {- var this$1 = this;-var dir = 1, x = goalColumn;if (amount < 0) { dir = -1; amount = -amount; }var cur = clipPos(this.doc, from);for (var i = 0; i < amount; ++i) {- var coords = cursorCoords(this$1, cur, "div");+ var coords = cursorCoords(this, cur, "div");if (x == null) { x = coords.left; }else { coords.left = x; }- cur = findPosV(this$1, coords, dir, unit);+ cur = findPosV(this, coords, dir, unit);if (cur.hitSide) { break }}return cur@@ -8483,14 +8574,14 @@var doc = this.doc, goals = [];var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected();- doc.extendSelectionsBy(function (range$$1) {+ doc.extendSelectionsBy(function (range) {if (collapse)- { return dir < 0 ? range$$1.from() : range$$1.to() }- var headPos = cursorCoords(this$1, range$$1.head, "div");- if (range$$1.goalColumn != null) { headPos.left = range$$1.goalColumn; }+ { return dir < 0 ? range.from() : range.to() }+ var headPos = cursorCoords(this$1, range.head, "div");+ if (range.goalColumn != null) { headPos.left = range.goalColumn; }goals.push(headPos.left);var pos = findPosV(this$1, headPos, dir, unit);- if (unit == "page" && range$$1 == doc.sel.primary())+ if (unit == "page" && range == doc.sel.primary()){ addToScrollTop(this$1, charCoords(this$1, pos, "div").top - headPos.top); }return pos}, sel_move);@@ -8525,7 +8616,7 @@signal(this, "overwriteToggle", this, this.state.overwrite);},- hasFocus: function() { return this.display.input.getField() == activeElt() },+ hasFocus: function() { return this.display.input.getField() == activeElt(doc(this)) },isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y); }),@@ -8537,22 +8628,22 @@clientHeight: displayHeight(this), clientWidth: displayWidth(this)}},- scrollIntoView: methodOp(function(range$$1, margin) {- if (range$$1 == null) {- range$$1 = {from: this.doc.sel.primary().head, to: null};+ scrollIntoView: methodOp(function(range, margin) {+ if (range == null) {+ range = {from: this.doc.sel.primary().head, to: null};if (margin == null) { margin = this.options.cursorScrollMargin; }- } else if (typeof range$$1 == "number") {- range$$1 = {from: Pos(range$$1, 0), to: null};- } else if (range$$1.from == null) {- range$$1 = {from: range$$1, to: null};+ } else if (typeof range == "number") {+ range = {from: Pos(range, 0), to: null};+ } else if (range.from == null) {+ range = {from: range, to: null};}- if (!range$$1.to) { range$$1.to = range$$1.from; }- range$$1.margin = margin || 0;+ if (!range.to) { range.to = range.from; }+ range.margin = margin || 0;- if (range$$1.from.line != null) {- scrollToRange(this, range$$1);+ if (range.from.line != null) {+ scrollToRange(this, range);} else {- scrollToCoordsRange(this, range$$1.from, range$$1.to, range$$1.margin);+ scrollToCoordsRange(this, range.from, range.to, range.margin);}}),@@ -8563,11 +8654,11 @@if (width != null) { this.display.wrapper.style.width = interpret(width); }if (height != null) { this.display.wrapper.style.height = interpret(height); }if (this.options.lineWrapping) { clearLineMeasurementCache(this); }- var lineNo$$1 = this.display.viewFrom;- this.doc.iter(lineNo$$1, this.display.viewTo, function (line) {+ var lineNo = this.display.viewFrom;+ this.doc.iter(lineNo, this.display.viewTo, function (line) {if (line.widgets) { for (var i = 0; i < line.widgets.length; i++)- { if (line.widgets[i].noHScroll) { regLineChange(this$1, lineNo$$1, "widget"); break } } }- ++lineNo$$1;+ { if (line.widgets[i].noHScroll) { regLineChange(this$1, lineNo, "widget"); break } } }+ ++lineNo;});this.curOp.forceUpdate = true;signal(this, "refresh", this);@@ -8583,8 +8674,8 @@this.curOp.forceUpdate = true;clearCaches(this);scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop);- updateGutterSpace(this);- if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)+ updateGutterSpace(this.display);+ if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5 || this.options.lineWrapping){ estimateLineHeights(this); }signal(this, "refresh", this);}),@@ -8592,6 +8683,8 @@swapDoc: methodOp(function(doc) {var old = this.doc;old.cm = null;+ // Cancel the current text selection if any (#5821)+ if (this.state.selectingText) { this.state.selectingText(); }attachDoc(this, doc);clearCaches(this);this.display.input.reset();@@ -8624,34 +8717,43 @@}// Used for horizontal relative motion. Dir is -1 or 1 (left or- // right), unit can be "char", "column" (like char, but doesn't- // cross line boundaries), "word" (across next word), or "group" (to- // the start of next group of word or non-word-non-whitespace- // chars). The visually param controls whether, in right-to-left- // text, direction 1 means to move towards the next index in the- // string, or towards the character to the right of the current- // position. The resulting position will have a hitSide=true- // property if it reached the end of the document.+ // right), unit can be "codepoint", "char", "column" (like char, but+ // doesn't cross line boundaries), "word" (across next word), or+ // "group" (to the start of next group of word or+ // non-word-non-whitespace chars). The visually param controls+ // whether, in right-to-left text, direction 1 means to move towards+ // the next index in the string, or towards the character to the right+ // of the current position. The resulting position will have a+ // hitSide=true property if it reached the end of the document.function findPosH(doc, pos, dir, unit, visually) {var oldPos = pos;var origDir = dir;var lineObj = getLine(doc, pos.line);+ var lineDir = visually && doc.direction == "rtl" ? -dir : dir;function findNextLine() {- var l = pos.line + dir;+ var l = pos.line + lineDir;if (l < doc.first || l >= doc.first + doc.size) { return false }pos = new Pos(l, pos.ch, pos.sticky);return lineObj = getLine(doc, l)}function moveOnce(boundToLine) {var next;- if (visually) {+ if (unit == "codepoint") {+ var ch = lineObj.text.charCodeAt(pos.ch + (dir > 0 ? 0 : -1));+ if (isNaN(ch)) {+ next = null;+ } else {+ var astral = dir > 0 ? ch >= 0xD800 && ch < 0xDC00 : ch >= 0xDC00 && ch < 0xDFFF;+ next = new Pos(pos.line, Math.max(0, Math.min(lineObj.text.length, pos.ch + dir * (astral ? 2 : 1))), -dir);+ }+ } else if (visually) {next = moveVisually(doc.cm, lineObj, pos, dir);} else {next = moveLogically(lineObj, pos, dir);}if (next == null) {if (!boundToLine && findNextLine())- { pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir); }+ { pos = endOfLine(visually, doc.cm, lineObj, pos.line, lineDir); }else{ return false }} else {@@ -8660,7 +8762,7 @@return true}- if (unit == "char") {+ if (unit == "char" || unit == "codepoint") {moveOnce();} else if (unit == "column") {moveOnce(true);@@ -8695,7 +8797,7 @@function findPosV(cm, pos, dir, unit) {var doc = cm.doc, x = pos.left, y;if (unit == "page") {- var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);+ var pageSize = Math.min(cm.display.wrapper.clientHeight, win(cm).innerHeight || doc(cm).documentElement.clientHeight);var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3);y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount;@@ -8728,10 +8830,19 @@var input = this, cm = input.cm;var div = input.div = display.lineDiv;- disableBrowserMagic(div, cm.options.spellcheck);+ div.contentEditable = true;+ disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize);++ function belongsToInput(e) {+ for (var t = e.target; t; t = t.parentNode) {+ if (t == div) { return true }+ if (/\bCodeMirror-(?:line)?widget\b/.test(t.className)) { break }+ }+ return false+ }on(div, "paste", function (e) {- if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }+ if (!belongsToInput(e) || signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }// IE doesn't fire input events, so we schedule a read for the pasted content in this wayif (ie_version <= 11) { setTimeout(operation(cm, function () { return this$1.updateFromDOM(); }), 20); }});@@ -8756,7 +8867,7 @@});function onCopyCut(e) {- if (signalDOMEvent(cm, e)) { return }+ if (!belongsToInput(e) || signalDOMEvent(cm, e)) { return }if (cm.somethingSelected()) {setLastCopied({lineWise: false, text: cm.getSelections()});if (e.type == "cut") { cm.replaceSelection("", null, "cut"); }@@ -8786,7 +8897,7 @@var kludge = hiddenTextarea(), te = kludge.firstChild;cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);te.value = lastCopied.text.join("\n");- var hadFocus = document.activeElement;+ var hadFocus = activeElt(div.ownerDocument);selectInput(te);setTimeout(function () {cm.display.lineSpace.removeChild(kludge);@@ -8798,9 +8909,18 @@on(div, "cut", onCopyCut);};+ ContentEditableInput.prototype.screenReaderLabelChanged = function (label) {+ // Label for screenreaders, accessibility+ if(label) {+ this.div.setAttribute('aria-label', label);+ } else {+ this.div.removeAttribute('aria-label');+ }+ };+ContentEditableInput.prototype.prepareSelection = function () {var result = prepareSelection(this.cm, false);- result.focus = this.cm.state.focused;+ result.focus = activeElt(this.div.ownerDocument) == this.div;return result};@@ -8836,8 +8956,8 @@var end = to.line < cm.display.viewTo && posToDOM(cm, to);if (!end) {var measure = view[view.length - 1].measure;- var map$$1 = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;- end = {node: map$$1[map$$1.length - 1], offset: map$$1[map$$1.length - 2] - map$$1[map$$1.length - 3]};+ var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;+ end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};}if (!start || !end) {@@ -8896,7 +9016,7 @@ContentEditableInput.prototype.focus = function () {if (this.cm.options.readOnly != "nocursor") {- if (!this.selectionInEditor())+ if (!this.selectionInEditor() || activeElt(this.div.ownerDocument) != this.div){ this.showSelection(this.prepareSelection(), true); }this.div.focus();}@@ -8907,9 +9027,11 @@ContentEditableInput.prototype.supportsTouch = function () { return true };ContentEditableInput.prototype.receivedFocus = function () {+ var this$1 = this;+var input = this;if (this.selectionInEditor())- { this.pollSelection(); }+ { setTimeout(function () { return this$1.pollSelection(); }, 20); }else{ runInOp(this.cm, function () { return input.cm.curOp.selectionChanged = true; }); }@@ -8937,7 +9059,7 @@// Because Android doesn't allow us to actually detect backspace// presses in a sane way, this code checks for when that happens// and simulates a backspace press in this case.- if (android && chrome && this.cm.options.gutters.length && isInGutter(sel.anchorNode)) {+ if (android && chrome && this.cm.display.gutterSpecs.length && isInGutter(sel.anchorNode)) {this.cm.triggerOnKeyDown({type: "keydown", keyCode: 8, preventDefault: Math.abs});this.blur();this.focus();@@ -9126,11 +9248,11 @@addText(cmText);return}- var markerID = node.getAttribute("cm-marker"), range$$1;+ var markerID = node.getAttribute("cm-marker"), range;if (markerID) {var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));- if (found.length && (range$$1 = found[0].find(0)))- { addText(getBetween(cm.doc, range$$1.from, range$$1.to).join(lineSep)); }+ if (found.length && (range = found[0].find(0)))+ { addText(getBetween(cm.doc, range.from, range.to).join(lineSep)); }return}if (node.getAttribute("contenteditable") == "false") { return }@@ -9198,13 +9320,13 @@function find(textNode, topNode, offset) {for (var i = -1; i < (maps ? maps.length : 0); i++) {- var map$$1 = i < 0 ? measure.map : maps[i];- for (var j = 0; j < map$$1.length; j += 3) {- var curNode = map$$1[j + 2];+ var map = i < 0 ? measure.map : maps[i];+ for (var j = 0; j < map.length; j += 3) {+ var curNode = map[j + 2];if (curNode == textNode || curNode == topNode) {var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);- var ch = map$$1[j] + offset;- if (offset < 0 || curNode != textNode) { ch = map$$1[j + (offset ? 1 : 0)]; }+ var ch = map[j] + offset;+ if (offset < 0 || curNode != textNode) { ch = map[j + (offset ? 1 : 0)]; }return Pos(line, ch)}}@@ -9268,7 +9390,7 @@on(te, "paste", function (e) {if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }- cm.state.pasteIncoming = true;+ cm.state.pasteIncoming = +new Date;input.fastPoll();});@@ -9289,15 +9411,23 @@selectInput(te);}}- if (e.type == "cut") { cm.state.cutIncoming = true; }+ if (e.type == "cut") { cm.state.cutIncoming = +new Date; }}on(te, "cut", prepareCopyCut);on(te, "copy", prepareCopyCut);on(display.scroller, "paste", function (e) {if (eventInWidget(display, e) || signalDOMEvent(cm, e)) { return }- cm.state.pasteIncoming = true;- input.focus();+ if (!te.dispatchEvent) {+ cm.state.pasteIncoming = +new Date;+ input.focus();+ return+ }++ // Pass the `paste` event to the textarea so it's handled by its event listener.+ var event = new Event("paste");+ event.clipboardData = e.clipboardData;+ te.dispatchEvent(event);});// Prevent normal selection in the editor (we handle our own)@@ -9330,6 +9460,15 @@this.textarea = this.wrapper.firstChild;};+ TextareaInput.prototype.screenReaderLabelChanged = function (label) {+ // Label for screenreaders, accessibility+ if(label) {+ this.textarea.setAttribute('aria-label', label);+ } else {+ this.textarea.removeAttribute('aria-label');+ }+ };+TextareaInput.prototype.prepareSelection = function () {// Redraw the selection and/or cursorvar cm = this.cm, display = cm.display, doc = cm.doc;@@ -9380,7 +9519,7 @@TextareaInput.prototype.supportsTouch = function () { return false };TextareaInput.prototype.focus = function () {- if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {+ if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt(this.textarea.ownerDocument) != this.textarea)) {try { this.textarea.focus(); }catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM}@@ -9488,6 +9627,7 @@TextareaInput.prototype.onContextMenu = function (e) {var input = this, cm = input.cm, display = cm.display, te = input.textarea;+ if (input.contextMenuPending) { input.contextMenuPending(); }var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;if (!pos || presto) { return } // Opera is difficult.@@ -9498,17 +9638,17 @@{ operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll); }var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;- input.wrapper.style.cssText = "position: absolute";- var wrapperBox = input.wrapper.getBoundingClientRect();+ var wrapperBox = input.wrapper.offsetParent.getBoundingClientRect();+ input.wrapper.style.cssText = "position: static";te.style.cssText = "position: absolute; width: 30px; height: 30px;\n top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px;\n z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + ";\n outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";var oldScrollY;- if (webkit) { oldScrollY = window.scrollY; } // Work around Chrome issue (#2712)+ if (webkit) { oldScrollY = te.ownerDocument.defaultView.scrollY; } // Work around Chrome issue (#2712)display.input.focus();- if (webkit) { window.scrollTo(null, oldScrollY); }+ if (webkit) { te.ownerDocument.defaultView.scrollTo(null, oldScrollY); }display.input.reset();// Adds "Select all" to context menu in FFif (!cm.somethingSelected()) { te.value = input.prevInput = " "; }- input.contextMenuPending = true;+ input.contextMenuPending = rehide;display.selForContextMenu = cm.doc.sel;clearTimeout(display.detectingSelectAll);@@ -9529,6 +9669,7 @@}}function rehide() {+ if (input.contextMenuPending != rehide) { return }input.contextMenuPending = false;input.wrapper.style.cssText = oldWrapperCSS;te.style.cssText = oldCSS;@@ -9568,6 +9709,7 @@TextareaInput.prototype.readOnlyChanged = function (val) {if (!val) { this.reset(); }this.textarea.disabled = val == "nocursor";+ this.textarea.readOnly = !!val;};TextareaInput.prototype.setUneditable = function () {};@@ -9584,7 +9726,7 @@// Set autofocus to true if this textarea is focused, or if it has// autofocus and no other element is focused.if (options.autofocus == null) {- var hasFocus = activeElt();+ var hasFocus = activeElt(textarea.ownerDocument);options.autofocus = hasFocus == textarea ||textarea.getAttribute("autofocus") != null && hasFocus == document.body;}@@ -9619,7 +9761,7 @@textarea.style.display = "";if (textarea.form) {off(textarea.form, "submit", save);- if (typeof textarea.form.submit == "function")+ if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function"){ textarea.form.submit = realSubmit; }}};@@ -9718,7 +9860,7 @@addLegacyProps(CodeMirror);- CodeMirror.version = "5.42.0";+ CodeMirror.version = "5.65.7";return CodeMirror;diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/closebrackets.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/closebrackets.jsindex 4415c3938..badbbd85a 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/closebrackets.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/closebrackets.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -87,7 +87,7 @@cm.operation(function() {var linesep = cm.lineSeparator() || "\n";cm.replaceSelection(linesep + linesep, null);- cm.execCommand("goCharLeft");+ moveSel(cm, -1)ranges = cm.listSelections();for (var i = 0; i < ranges.length; i++) {var line = ranges[i].head.line;@@ -97,6 +97,17 @@});}+ function moveSel(cm, dir) {+ var newRanges = [], ranges = cm.listSelections(), primary = 0+ for (var i = 0; i < ranges.length; i++) {+ var range = ranges[i]+ if (range.head == cm.getCursor()) primary = i+ var pos = range.head.ch || dir > 0 ? {line: range.head.line, ch: range.head.ch + dir} : {line: range.head.line - 1}+ newRanges.push({anchor: pos, head: pos})+ }+ cm.setSelections(newRanges, primary)+ }+function contractSelection(sel) {var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),@@ -153,10 +164,9 @@var right = pos % 2 ? ch : pairs.charAt(pos + 1);cm.operation(function() {if (type == "skip") {- cm.execCommand("goCharRight");+ moveSel(cm, 1)} else if (type == "skipThree") {- for (var i = 0; i < 3; i++)- cm.execCommand("goCharRight");+ moveSel(cm, 3)} else if (type == "surround") {var sels = cm.getSelections();for (var i = 0; i < sels.length; i++)@@ -169,10 +179,10 @@} else if (type == "both") {cm.replaceSelection(left + right, null);cm.triggerElectric(left + right);- cm.execCommand("goCharLeft");+ moveSel(cm, -1)} else if (type == "addFour") {cm.replaceSelection(left + left + left + left, "before");- cm.execCommand("goCharRight");+ moveSel(cm, 1)}});}diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/closetag.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/closetag.jsindex b8cbf9508..62c057844 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/closetag.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/closetag.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE/*** Tag-closer extension for CodeMirror.@@ -40,9 +40,9 @@cm.removeKeyMap("autoCloseTags");if (!val) return;var map = {name: "autoCloseTags"};- if (typeof val != "object" || val.whenClosing)+ if (typeof val != "object" || val.whenClosing !== false)map["'/'"] = function(cm) { return autoCloseSlash(cm); };- if (typeof val != "object" || val.whenOpening)+ if (typeof val != "object" || val.whenOpening !== false)map["'>'"] = function(cm) { return autoCloseGT(cm); };cm.addKeyMap(map);});@@ -128,9 +128,10 @@replacement = head + "style";} else {var context = inner.mode.xmlCurrentContext && inner.mode.xmlCurrentContext(state)- if (!context || (context.length && closingTagExists(cm, context, context[context.length - 1], pos)))+ var top = context.length ? context[context.length - 1] : ""+ if (!context || (context.length && closingTagExists(cm, context, top, pos)))return CodeMirror.Pass;- replacement = head + context[context.length - 1]+ replacement = head + top}if (cm.getLine(pos.line).charAt(tok.end) != ">") replacement += ">";replacements[i] = replacement;diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/continuelist.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/continuelist.jsindex 2e5625adc..915d813f4 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/continuelist.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/continuelist.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -24,7 +24,7 @@// If we're not in Markdown mode, fall back to normal newlineAndIndentvar eolState = cm.getStateAfter(pos.line);var inner = CodeMirror.innerMode(cm.getMode(), eolState);- if (inner.mode.name !== "markdown") {+ if (inner.mode.name !== "markdown" && inner.mode.helperType !== "markdown") {cm.execCommand("newlineAndIndent");return;} else {@@ -90,7 +90,7 @@});} else {if (startIndent.length > nextIndent.length) return;- // This doesn't run if the next line immediatley indents, as it is+ // This doesn't run if the next line immediately indents, as it is// not clear of the users intention (new indented item or same level)if ((startIndent.length < nextIndent.length) && (lookAhead === 1)) return;skipCount += 1;diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/matchbrackets.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/matchbrackets.jsindex 2a147282c..c342910ed 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/matchbrackets.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/matchbrackets.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -38,7 +38,7 @@if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));- var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);+ var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style, config);if (found == null) return null;return {from: Pos(where.line, pos), to: found && found.pos,match: found && found.ch == match.charAt(0), forward: dir > 0};@@ -67,7 +67,8 @@if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0);for (; pos != end; pos += dir) {var ch = line.charAt(pos);- if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) {+ if (re.test(ch) && (style === undefined ||+ (cm.getTokenTypeAt(Pos(lineNo, pos + 1)) || "") == (style || ""))) {var match = matching[ch];if (match && (match.charAt(1) == ">") == (dir > 0)) stack.push(ch);else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch};@@ -80,11 +81,12 @@function matchBrackets(cm, autoclear, config) {// Disable brace matching in long lines, since it'll cause hugely slow updates- var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;+ var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000,+ highlightNonMatching = config && config.highlightNonMatching;var marks = [], ranges = cm.listSelections();for (var i = 0; i < ranges.length; i++) {var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);- if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {+ if (match && (match.match || highlightNonMatching !== false) && cm.getLine(match.from.line).length <= maxHighlightLen) {var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)@@ -94,7 +96,7 @@if (marks.length) {// Kludge to work around the IE bug from issue #1193, where text- // input stops going to the textare whever this fires.+ // input stops going to the textarea whenever this fires.if (ie_lt8 && cm.state.focused) cm.focus();var clear = function() {@@ -117,17 +119,25 @@});}+ function clearHighlighted(cm) {+ if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {+ cm.state.matchBrackets.currentlyHighlighted();+ cm.state.matchBrackets.currentlyHighlighted = null;+ }+ }+CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {if (old && old != CodeMirror.Init) {cm.off("cursorActivity", doMatchBrackets);- if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {- cm.state.matchBrackets.currentlyHighlighted();- cm.state.matchBrackets.currentlyHighlighted = null;- }+ cm.off("focus", doMatchBrackets)+ cm.off("blur", clearHighlighted)+ clearHighlighted(cm);}if (val) {cm.state.matchBrackets = typeof val == "object" ? val : {};cm.on("cursorActivity", doMatchBrackets);+ cm.on("focus", doMatchBrackets)+ cm.on("blur", clearHighlighted)}});diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/matchtags.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/matchtags.jsindex 2203d9390..afa6105f8 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/matchtags.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/matchtags.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJSdiff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/trailingspace.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/trailingspace.jsindex c39c310a9..8d01c20ca 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/trailingspace.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/edit/trailingspace.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJSdiff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/anyword-hint.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/anyword-hint.jsindex d27a9ec01..b20d9f6ff 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/anyword-hint.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/anyword-hint.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJSdiff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/css-hint.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/css-hint.jsindex 980d1197e..5b36e8224 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/css-hint.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/css-hint.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJSdiff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/html-hint.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/html-hint.jsindex d0cca4f6a..168f49c2f 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/html-hint.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/html-hint.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -98,6 +98,7 @@dfn: s,dir: s,div: s,+ dialog: { attrs: { open: null } },dl: s,dt: s,em: s,diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/javascript-hint.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/javascript-hint.jsindex 182224d5d..95639798d 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/javascript-hint.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/javascript-hint.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -69,7 +69,7 @@function getCoffeeScriptToken(editor, cur) {// This getToken, it is for coffeescript, imitates the behavior of// getTokenAt method in javascript.js, that is, returning "property"- // type and treat "." as indepenent token.+ // type and treat "." as independent token.var token = editor.getTokenAt(cur);if (cur.ch == token.start + 1 && token.string.charAt(0) == '.') {token.end = token.start;@@ -144,12 +144,15 @@base = base[context.pop().string];if (base != null) gatherCompletions(base);} else {- // If not, just look in the global object and any local scope+ // If not, just look in the global object, any local scope, and optional additional-context// (reading into JS mode internals to get at the local and global variables)for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);for (var c = token.state.context; c; c = c.prev)for (var v = c.vars; v; v = v.next) maybeAdd(v.name)for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);+ if (options && options.additionalContext != null)+ for (var key in options.additionalContext)+ maybeAdd(key);if (!options || options.useGlobalScope !== false)gatherCompletions(global);forEach(keywords, maybeAdd);diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/show-hint.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/show-hint.jsindex 374cddfe9..be729c3ef 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/show-hint.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/show-hint.js@@ -1,5 +1,7 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE++// declare global: DOMRect(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -59,8 +61,10 @@this.startPos = this.cm.getCursor("start");this.startLen = this.cm.getLine(this.startPos.line).length - this.cm.getSelection().length;- var self = this;- cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });+ if (this.options.updateOnCursorActivity) {+ var self = this;+ cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });+ }}var requestAnimationFrame = window.requestAnimationFrame || function(fn) {@@ -73,7 +77,9 @@if (!this.active()) return;this.cm.state.completionActive = null;this.tick = null;- this.cm.off("cursorActivity", this.activityFunc);+ if (this.options.updateOnCursorActivity) {+ this.cm.off("cursorActivity", this.activityFunc);+ }if (this.widget && this.data) CodeMirror.signal(this.data, "close");if (this.widget) this.widget.close();@@ -85,12 +91,19 @@},pick: function(data, i) {- var completion = data.list[i];- if (completion.hint) completion.hint(this.cm, data, completion);- else this.cm.replaceRange(getText(completion), completion.from || data.from,- completion.to || data.to, "complete");- CodeMirror.signal(data, "pick", completion);- this.close();+ var completion = data.list[i], self = this;+ this.cm.operation(function() {+ if (completion.hint)+ completion.hint(self.cm, data, completion);+ else+ self.cm.replaceRange(getText(completion), completion.from || data.from,+ completion.to || data.to, "complete");+ CodeMirror.signal(data, "pick", completion);+ self.cm.scrollIntoView();+ });+ if (this.options.closeOnPick) {+ this.close();+ }},cursorActivity: function() {@@ -99,9 +112,14 @@this.debounce = 0;}+ var identStart = this.startPos;+ if(this.data) {+ identStart = this.data.from;+ }+var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||- pos.ch < this.startPos.ch || this.cm.somethingSelected() ||+ pos.ch < identStart.ch || this.cm.somethingSelected() ||(!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {this.close();} else {@@ -206,6 +224,7 @@}function Widget(completion, data) {+ this.id = "cm-complete-" + Math.floor(Math.random(1e6))this.completion = completion;this.data = data;this.picked = false;@@ -214,6 +233,9 @@var parentWindow = ownerDocument.defaultView || ownerDocument.parentWindow;var hints = this.hints = ownerDocument.createElement("ul");+ hints.setAttribute("role", "listbox")+ hints.setAttribute("aria-expanded", "true")+ hints.id = this.idvar theme = completion.cm.options.theme;hints.className = "CodeMirror-hints " + theme;this.selectedHint = data.selectedHint || 0;@@ -224,6 +246,9 @@var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);if (cur.className != null) className = cur.className + " " + className;elt.className = className;+ if (i == this.selectedHint) elt.setAttribute("aria-selected", "true")+ elt.id = this.id + "-" + i+ elt.setAttribute("role", "option")if (cur.render) cur.render(elt, data, cur);else elt.appendChild(ownerDocument.createTextNode(cur.displayText || getText(cur)));elt.hintId = i;@@ -249,10 +274,18 @@var winW = parentWindow.innerWidth || Math.max(ownerDocument.body.offsetWidth, ownerDocument.documentElement.offsetWidth);var winH = parentWindow.innerHeight || Math.max(ownerDocument.body.offsetHeight, ownerDocument.documentElement.offsetHeight);container.appendChild(hints);- var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;- var scrolls = hints.scrollHeight > hints.clientHeight + 1- var startScroll = cm.getScrollInfo();+ cm.getInputField().setAttribute("aria-autocomplete", "list")+ cm.getInputField().setAttribute("aria-owns", this.id)+ cm.getInputField().setAttribute("aria-activedescendant", this.id + "-" + this.selectedHint)+ var box = completion.options.moveOnOverlap ? hints.getBoundingClientRect() : new DOMRect();+ var scrolls = completion.options.paddingForScrollbar ? hints.scrollHeight > hints.clientHeight + 1 : false;++ // Compute in the timeout to avoid reflow on init+ var startScroll;+ setTimeout(function() { startScroll = cm.getScrollInfo(); });++ var overlapY = box.bottom - winH;if (overlapY > 0) {var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);if (curTop - height > 0) { // Fits above cursor@@ -270,12 +303,13 @@}}var overlapX = box.right - winW;+ if (scrolls) overlapX += cm.display.nativeBarWidth;if (overlapX > 0) {if (box.right - box.left > winW) {hints.style.width = (winW - 5) + "px";overlapX -= (box.right - box.left) - winW;}- hints.style.left = (left = pos.left - overlapX - offsetLeft) + "px";+ hints.style.left = (left = Math.max(pos.left - overlapX - offsetLeft, 0)) + "px";}if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling)node.style.paddingRight = cm.display.nativeBarWidth + "px"@@ -298,6 +332,7 @@cm.on("scroll", this.onScroll = function() {var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();+ if (!startScroll) startScroll = cm.getScrollInfo();var newTop = top + startScroll.top - curScroll.top;var point = newTop - (parentWindow.pageYOffset || (ownerDocument.documentElement || ownerDocument.body).scrollTop);if (!below) point += hints.offsetHeight;@@ -322,7 +357,12 @@CodeMirror.on(hints, "mousedown", function() {setTimeout(function(){cm.focus();}, 20);});- this.scrollToActive()++ // The first hint doesn't need to be scrolled to on init+ var selectedHintRange = this.getSelectedHintRange();+ if (selectedHintRange.from !== 0 || selectedHintRange.to !== 0) {+ this.scrollToActive();+ }CodeMirror.signal(data, "select", completions[this.selectedHint], hints.childNodes[this.selectedHint]);return true;@@ -332,8 +372,11 @@close: function() {if (this.completion.widget != this) return;this.completion.widget = null;- this.hints.parentNode.removeChild(this.hints);+ if (this.hints.parentNode) this.hints.parentNode.removeChild(this.hints);this.completion.cm.removeKeyMap(this.keyMap);+ var input = this.completion.cm.getInputField()+ input.removeAttribute("aria-activedescendant")+ input.removeAttribute("aria-owns")var cm = this.completion.cm;if (this.completion.options.closeOnUnfocus) {@@ -361,23 +404,39 @@i = avoidWrap ? 0 : this.data.list.length - 1;if (this.selectedHint == i) return;var node = this.hints.childNodes[this.selectedHint];- if (node) node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");+ if (node) {+ node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");+ node.removeAttribute("aria-selected")+ }node = this.hints.childNodes[this.selectedHint = i];node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;+ node.setAttribute("aria-selected", "true")+ this.completion.cm.getInputField().setAttribute("aria-activedescendant", node.id)this.scrollToActive()CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);},scrollToActive: function() {- var node = this.hints.childNodes[this.selectedHint]- if (node.offsetTop < this.hints.scrollTop)- this.hints.scrollTop = node.offsetTop - 3;- else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)- this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;+ var selectedHintRange = this.getSelectedHintRange();+ var node1 = this.hints.childNodes[selectedHintRange.from];+ var node2 = this.hints.childNodes[selectedHintRange.to];+ var firstNode = this.hints.firstChild;+ if (node1.offsetTop < this.hints.scrollTop)+ this.hints.scrollTop = node1.offsetTop - firstNode.offsetTop;+ else if (node2.offsetTop + node2.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)+ this.hints.scrollTop = node2.offsetTop + node2.offsetHeight - this.hints.clientHeight + firstNode.offsetTop;},screenAmount: function() {return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;+ },++ getSelectedHintRange: function() {+ var margin = this.completion.options.scrollMargin || 0;+ return {+ from: Math.max(0, this.selectedHint - margin),+ to: Math.min(this.data.list.length - 1, this.selectedHint + margin),+ };}};@@ -455,11 +514,15 @@completeSingle: true,alignWithWord: true,closeCharacters: /[\s()\[\]{};:>,]/,+ closeOnPick: true,closeOnUnfocus: true,+ updateOnCursorActivity: true,completeOnSingleClick: true,container: null,customKeys: null,- extraKeys: null+ extraKeys: null,+ paddingForScrollbar: true,+ moveOnOverlap: true,};CodeMirror.defineOption("hintOptions", null);diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/sql-hint.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/sql-hint.jsindex 444eba8b1..57c3b64f2 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/sql-hint.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/sql-hint.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -97,7 +97,7 @@if (name.charAt(0) == ".") {name = name.substr(1);}- // replace doublicated identifierQuotes with single identifierQuotes+ // replace duplicated identifierQuotes with single identifierQuotes// and remove single identifierQuotesvar nameParts = name.split(identifierQuote+identifierQuote);for (var i = 0; i < nameParts.length; i++)@@ -109,7 +109,7 @@var nameParts = getText(name).split(".");for (var i = 0; i < nameParts.length; i++)nameParts[i] = identifierQuote +- // doublicate identifierQuotes+ // duplicate identifierQuotesnameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +identifierQuote;var escaped = nameParts.join(".");@@ -187,7 +187,7 @@function eachWord(lineText, f) {var words = lineText.split(/\s+/)for (var i = 0; i < words.length; i++)- if (words[i]) f(words[i].replace(/[,;]/g, ''))+ if (words[i]) f(words[i].replace(/[`,;]/g, ''))}function findTableByAlias(alias, editor) {@@ -264,7 +264,7 @@token.string = token.string.slice(0, cur.ch - token.start);}- if (token.string.match(/^[.`"\w@]\w*$/)) {+ if (token.string.match(/^[.`"'\w@][\w$#]*$/g)) {search = token.string;start = token.start;end = token.end;diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/xml-hint.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/xml-hint.jsindex 7575b3707..1fc639443 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/xml-hint.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/hint/xml-hint.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -101,8 +101,14 @@}replaceToken = true;}- for (var i = 0; i < atValues.length; ++i) if (!prefix || matches(atValues[i], prefix, matchInMiddle))- result.push(quote + atValues[i] + quote);+ var returnHintsFromAtValues = function(atValues) {+ if (atValues)+ for (var i = 0; i < atValues.length; ++i) if (!prefix || matches(atValues[i], prefix, matchInMiddle))+ result.push(quote + atValues[i] + quote);+ return returnHints();+ };+ if (atValues && atValues.then) return atValues.then(returnHintsFromAtValues);+ return returnHintsFromAtValues(atValues);} else { // An attribute nameif (token.type == "attribute") {prefix = token.string;@@ -112,11 +118,14 @@result.push(attr);}}- return {- list: result,- from: replaceToken ? Pos(cur.line, tagStart == null ? token.start : tagStart) : cur,- to: replaceToken ? Pos(cur.line, token.end) : cur- };+ function returnHints() {+ return {+ list: result,+ from: replaceToken ? Pos(cur.line, tagStart == null ? token.start : tagStart) : cur,+ to: replaceToken ? Pos(cur.line, token.end) : cur+ };+ }+ return returnHints();}CodeMirror.registerHelper("hint", "xml", getHints);diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/css.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/css.jsindex 441ba4abf..b0721b419 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/css.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/css.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -29,7 +29,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {valueKeywords = parserConfig.valueKeywords || {},allowNested = parserConfig.allowNested,lineComment = parserConfig.lineComment,- supportsAtComponent = parserConfig.supportsAtComponent === true;+ supportsAtComponent = parserConfig.supportsAtComponent === true,+ highlightNonStandardPropertyKeywords = config.highlightNonStandardPropertyKeywords !== false;var type, override;function ret(style, tp) { type = tp; return style; }@@ -77,8 +78,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {return ret("qualifier", "qualifier");} else if (/[:;{}\[\]\(\)]/.test(ch)) {return ret(null, ch);- } else if (stream.match(/[\w-.]+(?=\()/)) {- if (/^(url(-prefix)?|domain|regexp)$/.test(stream.current().toLowerCase())) {+ } else if (stream.match(/^[\w-.]+(?=\()/)) {+ if (/^(url(-prefix)?|domain|regexp)$/i.test(stream.current())) {state.tokenize = tokenParenthesized;}return ret("variable callee", "variable");@@ -107,7 +108,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {function tokenParenthesized(stream, state) {stream.next(); // Must be '('- if (!stream.match(/\s*[\"\')]/, false))+ if (!stream.match(/^\s*[\"\')]/, false))state.tokenize = tokenString(")");elsestate.tokenize = null;@@ -197,7 +198,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {override = "property";return "maybeprop";} else if (nonStandardPropertyKeywords.hasOwnProperty(word)) {- override = "string-2";+ override = highlightNonStandardPropertyKeywords ? "string-2" : "property";return "maybeprop";} else if (allowNested) {override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag";@@ -227,7 +228,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {if (type == "}" || type == "{") return popAndPass(type, stream, state);if (type == "(") return pushContext(state, stream, "parens");- if (type == "hash" && !/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(stream.current())) {+ if (type == "hash" && !/^#([0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/.test(stream.current())) {override += " error";} else if (type == "word") {wordAsValue(stream);@@ -291,7 +292,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {else if (propertyKeywords.hasOwnProperty(word))override = "property";else if (nonStandardPropertyKeywords.hasOwnProperty(word))- override = "string-2";+ override = highlightNonStandardPropertyKeywords ? "string-2" : "property";else if (valueKeywords.hasOwnProperty(word))override = "atom";else if (colorKeywords.hasOwnProperty(word))@@ -442,17 +443,20 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"monochrome", "min-monochrome", "max-monochrome", "resolution","min-resolution", "max-resolution", "scan", "grid", "orientation","device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",- "pointer", "any-pointer", "hover", "any-hover"+ "pointer", "any-pointer", "hover", "any-hover", "prefers-color-scheme",+ "dynamic-range", "video-dynamic-range"], mediaFeatures = keySet(mediaFeatures_);var mediaValueKeywords_ = ["landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",- "interlace", "progressive"+ "interlace", "progressive",+ "dark", "light",+ "standard", "high"], mediaValueKeywords = keySet(mediaValueKeywords_);var propertyKeywords_ = ["align-content", "align-items", "align-self", "alignment-adjust",- "alignment-baseline", "anchor-point", "animation", "animation-delay",+ "alignment-baseline", "all", "anchor-point", "animation", "animation-delay","animation-direction", "animation-duration", "animation-fill-mode","animation-iteration-count", "animation-name", "animation-play-state","animation-timing-function", "appearance", "azimuth", "backdrop-filter",@@ -480,7 +484,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"cue-before", "cursor", "direction", "display", "dominant-baseline","drop-initial-after-adjust", "drop-initial-after-align","drop-initial-before-adjust", "drop-initial-before-align", "drop-initial-size",- "drop-initial-value", "elevation", "empty-cells", "fit", "fit-position",+ "drop-initial-value", "elevation", "empty-cells", "fit", "fit-content", "fit-position","flex", "flex-basis", "flex-direction", "flex-flow", "flex-grow","flex-shrink", "flex-wrap", "float", "float-offset", "flow-from", "flow-into","font", "font-family", "font-feature-settings", "font-kerning",@@ -503,7 +507,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"list-style-image", "list-style-position", "list-style-type", "margin","margin-bottom", "margin-left", "margin-right", "margin-top", "marks","marquee-direction", "marquee-loop", "marquee-play-count", "marquee-speed",- "marquee-style", "max-block-size", "max-height", "max-inline-size",+ "marquee-style", "mask-clip", "mask-composite", "mask-image", "mask-mode",+ "mask-origin", "mask-position", "mask-repeat", "mask-size","mask-type",+ "max-block-size", "max-height", "max-inline-size","max-width", "min-block-size", "min-height", "min-inline-size", "min-width","mix-blend-mode", "move-to", "nav-down", "nav-index", "nav-left", "nav-right","nav-up", "object-fit", "object-position", "offset", "offset-anchor",@@ -540,7 +546,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"text-height", "text-indent", "text-justify", "text-orientation","text-outline", "text-overflow", "text-rendering", "text-shadow","text-size-adjust", "text-space-collapse", "text-transform",- "text-underline-position", "text-wrap", "top", "transform", "transform-origin",+ "text-underline-position", "text-wrap", "top", "touch-action", "transform", "transform-origin","transform-style", "transition", "transition-delay", "transition-duration","transition-property", "transition-timing-function", "translate","unicode-bidi", "user-select", "vertical-align", "visibility", "voice-balance",@@ -552,15 +558,15 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events","color-interpolation", "color-interpolation-filters","color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",- "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke",+ "marker", "marker-end", "marker-mid", "marker-start", "paint-order", "shape-rendering", "stroke","stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin","stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering","baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",- "glyph-orientation-vertical", "text-anchor", "writing-mode"+ "glyph-orientation-vertical", "text-anchor", "writing-mode",], propertyKeywords = keySet(propertyKeywords_);var nonStandardPropertyKeywords_ = [- "border-block", "border-block-color", "border-block-end",+ "accent-color", "aspect-ratio", "border-block", "border-block-color", "border-block-end","border-block-end-color", "border-block-end-style", "border-block-end-width","border-block-start", "border-block-start-color", "border-block-start-style","border-block-start-width", "border-block-style", "border-block-width",@@ -568,9 +574,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"border-inline-end-color", "border-inline-end-style","border-inline-end-width", "border-inline-start", "border-inline-start-color","border-inline-start-style", "border-inline-start-width",- "border-inline-style", "border-inline-width", "margin-block",+ "border-inline-style", "border-inline-width", "content-visibility", "margin-block","margin-block-end", "margin-block-start", "margin-inline", "margin-inline-end",- "margin-inline-start", "padding-block", "padding-block-end",+ "margin-inline-start", "overflow-anchor", "overscroll-behavior", "padding-block", "padding-block-end","padding-block-start", "padding-inline", "padding-inline-end","padding-inline-start", "scroll-snap-stop", "scrollbar-3d-light-color","scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",@@ -594,16 +600,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown","burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue","cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod",- "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen",+ "darkgray", "darkgreen", "darkgrey", "darkkhaki", "darkmagenta", "darkolivegreen","darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen",- "darkslateblue", "darkslategray", "darkturquoise", "darkviolet",- "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick",+ "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise", "darkviolet",+ "deeppink", "deepskyblue", "dimgray", "dimgrey", "dodgerblue", "firebrick","floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite","gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew","hotpink", "indianred", "indigo", "ivory", "khaki", "lavender","lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",- "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink",- "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray",+ "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightgrey", "lightpink",+ "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightslategrey","lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta","maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple","mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise",@@ -613,7 +619,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue","purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown","salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",- "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",+ "slateblue", "slategray", "slategrey", "snow", "springgreen", "steelblue", "tan","teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white","whitesmoke", "yellow", "yellowgreen"], colorKeywords = keySet(colorKeywords_);@@ -623,22 +629,22 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate","always", "amharic", "amharic-abegede", "antialiased", "appworkspace","arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",- "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",- "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",- "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",+ "avoid-region", "axis-pan", "background", "backwards", "baseline", "below", "bidi-override", "binary",+ "bengali", "blink", "block", "block-axis", "blur", "bold", "bolder", "border", "border-box",+ "both", "bottom", "break", "break-all", "break-word", "brightness", "bullets", "button","buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian","capitalize", "caps-lock-indicator", "caption", "captiontext", "caret","cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch","cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote","col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",- "compact", "condensed", "contain", "content", "contents",- "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",- "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",+ "compact", "condensed", "conic-gradient", "contain", "content", "contents",+ "content-box", "context-menu", "continuous", "contrast", "copy", "counter", "counters", "cover", "crop",+ "cross", "crosshair", "cubic-bezier", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal","decimal-leading-zero", "default", "default-button", "dense", "destination-atop","destination-in", "destination-out", "destination-over", "devanagari", "difference","disc", "discard", "disclosure-closed", "disclosure-open", "document","dot-dash", "dot-dot-dash",- "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",+ "dotted", "double", "down", "drop-shadow", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out","element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede","ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er","ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",@@ -647,11 +653,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"ethiopic-halehame-sid-et", "ethiopic-halehame-so-et","ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig","ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",- "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",- "forwards", "from", "geometricPrecision", "georgian", "graytext", "grid", "groove",+ "extra-expanded", "fantasy", "fast", "fill", "fill-box", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",+ "forwards", "from", "geometricPrecision", "georgian", "grayscale", "graytext", "grid", "groove","gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew","help", "hidden", "hide", "higher", "highlight", "highlighttext",- "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore",+ "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "hue-rotate", "icon", "ignore","inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite","infobackground", "infotext", "inherit", "initial", "inline", "inline-axis","inline-block", "inline-flex", "inline-grid", "inline-table", "inset", "inside", "intrinsic", "invert",@@ -662,41 +668,37 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem","local", "logical", "loud", "lower", "lower-alpha", "lower-armenian","lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",- "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d",- "media-controls-background", "media-current-time-display",- "media-fullscreen-button", "media-mute-button", "media-play-button",- "media-return-to-realtime-button", "media-rewind-button",- "media-seek-back-button", "media-seek-forward-button", "media-slider",- "media-sliderthumb", "media-time-remaining-display", "media-volume-slider",- "media-volume-slider-container", "media-volume-sliderthumb", "medium",- "menu", "menulist", "menulist-button", "menulist-text",- "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",- "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",+ "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "manipulation", "match", "matrix", "matrix3d",+ "media-play-button", "media-slider", "media-sliderthumb",+ "media-volume-slider", "media-volume-sliderthumb", "medium",+ "menu", "menulist", "menulist-button",+ "menutext", "message-box", "middle", "min-intrinsic",+ "mix", "mongolian", "monospace", "move", "multiple", "multiple_mask_images", "multiply", "myanmar", "n-resize","narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop","no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap","ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "opacity", "open-quote","optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset","outside", "outside-shape", "overlay", "overline", "padding", "padding-box",- "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",+ "painted", "page", "paused", "persian", "perspective", "pinch-zoom", "plus-darker", "plus-lighter","pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d","progress", "push-button", "radial-gradient", "radio", "read-only","read-write", "read-write-plaintext-only", "rectangle", "region",- "relative", "repeat", "repeating-linear-gradient",- "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",+ "relative", "repeat", "repeating-linear-gradient", "repeating-radial-gradient",+ "repeating-conic-gradient", "repeat-x", "repeat-y", "reset", "reverse","rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY","rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",- "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",+ "s-resize", "sans-serif", "saturate", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen","scroll", "scrollbar", "scroll-position", "se-resize", "searchfield","searchfield-cancel-button", "searchfield-decoration","searchfield-results-button", "searchfield-results-decoration", "self-start", "self-end",- "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",+ "semi-condensed", "semi-expanded", "separate", "sepia", "serif", "show", "sidama","simp-chinese-formal", "simp-chinese-informal", "single","skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal","slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow","small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali","source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",- "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",- "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",+ "square-button", "start", "static", "status-bar", "stretch", "stroke", "stroke-box", "sub",+ "subpixel-antialiased", "svg_masks", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table","table-caption", "table-cell", "table-column", "table-column-group","table-footer-group", "table-header-group", "table-row", "table-row-group","tamil",@@ -706,10 +708,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {"tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top","trad-chinese-formal", "trad-chinese-informal", "transform","translate", "translate3d", "translateX", "translateY", "translateZ",- "transparent", "ultra-condensed", "ultra-expanded", "underline", "unset", "up",+ "transparent", "ultra-condensed", "ultra-expanded", "underline", "unidirectional-pan", "unset", "up","upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal","upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",- "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",+ "var", "vertical", "vertical-text", "view-box", "visible", "visibleFill", "visiblePainted","visibleStroke", "visual", "w-resize", "wait", "wave", "wider","window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor","xx-large", "xx-small"@@ -777,7 +779,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {}},":": function(stream) {- if (stream.match(/\s*\{/, false))+ if (stream.match(/^\s*\{/, false))return [null, null]return false;},diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/gss.html b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/gss.htmlnew file mode 100644index 000000000..aa12bfb68--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/gss.html@@ -0,0 +1,104 @@+<!doctype html>++<title>CodeMirror: Closure Stylesheets (GSS) mode</title>+<meta charset="utf-8"/>+<link rel=stylesheet href="../../doc/docs.css">++<link rel="stylesheet" href="../../lib/codemirror.css">+<link rel="stylesheet" href="../../addon/hint/show-hint.css">+<script src="../../lib/codemirror.js"></script>+<script src="css.js"></script>+<script src="../../addon/edit/matchbrackets.js"></script>+<script src="../../addon/hint/show-hint.js"></script>+<script src="../../addon/hint/css-hint.js"></script>+<style>.CodeMirror {background: #f8f8f8;}</style>+<div id=nav>+ <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>++ <ul>+ <li><a href="../../index.html">Home</a>+ <li><a href="../../doc/manual.html">Manual</a>+ <li><a href="https://github.com/codemirror/codemirror5">Code</a>+ </ul>+ <ul>+ <li><a href="../index.html">Language modes</a>+ <li><a class=active href="#">Closure Stylesheets (GSS)</a>+ </ul>+</div>++<article>+<h2>Closure Stylesheets (GSS) mode</h2>+<form><textarea id="code" name="code">+/* Some example Closure Stylesheets */++@provide 'some.styles';++@require 'other.styles';++@component {++@def FONT_FAMILY "Times New Roman", Georgia, Serif;+@def FONT_SIZE_NORMAL 15px;+@def FONT_NORMAL normal FONT_SIZE_NORMAL FONT_FAMILY;++@def BG_COLOR rgb(235, 239, 249);++@def DIALOG_BORDER_COLOR rgb(107, 144, 218);+@def DIALOG_BG_COLOR BG_COLOR;++@def LEFT_HAND_NAV_WIDTH 180px;+@def LEFT_HAND_NAV_PADDING 3px;++@defmixin size(WIDTH, HEIGHT) {+ width: WIDTH;+ height: HEIGHT;+}++body {+ background-color: BG_COLOR;+ margin: 0;+ padding: 3em 6em;+ font: FONT_NORMAL;+ color: #000;+}++#navigation a {+ font-weight: bold;+ text-decoration: none !important;+}++.dialog {+ background-color: DIALOG_BG_COLOR;+ border: 1px solid DIALOG_BORDER_COLOR;+}++.content {+ position: absolute;+ margin-left: add(LEFT_HAND_NAV_PADDING, /* padding left */+ LEFT_HAND_NAV_WIDTH,+ LEFT_HAND_NAV_PADDING); /* padding right */++}++.logo {+ @mixin size(150px, 55px);+ background-image: url('http://www.google.com/images/logo_sm.gif');+}++}+</textarea></form>+ <script>+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {+ extraKeys: {"Ctrl-Space": "autocomplete"},+ lineNumbers: true,+ matchBrackets: true,+ mode: "text/x-gss"+ });+ </script>++ <p>A mode for <a href="https://github.com/google/closure-stylesheets">Closure Stylesheets</a> (GSS).</p>+ <p><strong>MIME type defined:</strong> <code>text/x-gss</code>.</p>++ <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#gss_*">normal</a>, <a href="../../test/index.html#verbose,gss_*">verbose</a>.</p>++ </article>diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/gss_test.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/gss_test.jsnew file mode 100644index 000000000..0901563c3--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/gss_test.js@@ -0,0 +1,17 @@+// CodeMirror, copyright (c) by Marijn Haverbeke and others+// Distributed under an MIT license: https://codemirror.net/5/LICENSE++(function() {+ "use strict";++ var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-gss");+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "gss"); }++ MT("atComponent",+ "[def @component] {",+ "[tag foo] {",+ " [property color]: [keyword black];",+ "}",+ "}");++})();diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/index.html b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/index.htmlnew file mode 100644index 000000000..233d19b98--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/index.html@@ -0,0 +1,81 @@+<!doctype html>++<title>CodeMirror: CSS mode</title>+<meta charset="utf-8"/>+<link rel=stylesheet href="../../doc/docs.css">++<link rel="stylesheet" href="../../lib/codemirror.css">+<link rel="stylesheet" href="../../addon/hint/show-hint.css">+<script src="../../lib/codemirror.js"></script>+<script src="css.js"></script>+<script src="../../addon/hint/show-hint.js"></script>+<script src="../../addon/hint/css-hint.js"></script>+<style>.CodeMirror {background: #f8f8f8;}</style>+<div id=nav>+ <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>++ <ul>+ <li><a href="../../index.html">Home</a>+ <li><a href="../../doc/manual.html">Manual</a>+ <li><a href="https://github.com/codemirror/codemirror5">Code</a>+ </ul>+ <ul>+ <li><a href="../index.html">Language modes</a>+ <li><a class=active href="#">CSS</a>+ </ul>+</div>++<article>+<h2>CSS mode</h2>+<form><textarea id="code" name="code">+/* Some example CSS */++@import url("something.css");++body {+ margin: 0;+ padding: 3em 6em;+ font-family: tahoma, arial, sans-serif;+ color: #000;+}++#navigation a {+ font-weight: bold;+ text-decoration: none !important;+}++h1 {+ font-size: 2.5em;+}++h2 {+ font-size: 1.7em;+}++h1:before, h2:before {+ content: "::";+}++code {+ font-family: courier, monospace;+ font-size: 80%;+ color: #418A8A;+}+</textarea></form>+ <script>+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {+ extraKeys: {"Ctrl-Space": "autocomplete"}+ });+ </script>++ <p>CSS mode supports this option:</p>+ <d1>+ <dt><code><strong>highlightNonStandardPropertyKeywords</strong>: boolean</code></dt>+ <dd>Whether to highlight non-standard CSS property keywords such as <code>margin-inline</code> or <code>zoom</code> (default: <code>true</code>).</dd>+ </d1>++ <p><strong>MIME types defined:</strong> <code>text/css</code>, <code>text/x-scss</code> (<a href="scss.html">demo</a>), <code>text/x-less</code> (<a href="less.html">demo</a>).</p>++ <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#css_*">normal</a>, <a href="../../test/index.html#verbose,css_*">verbose</a>.</p>++ </article>diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/less.html b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/less.htmlnew file mode 100644index 000000000..ea7db0059--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/less.html@@ -0,0 +1,152 @@+<!doctype html>++<title>CodeMirror: LESS mode</title>+<meta charset="utf-8"/>+<link rel=stylesheet href="../../doc/docs.css">++<link rel="stylesheet" href="../../lib/codemirror.css">+<script src="../../lib/codemirror.js"></script>+<script src="../../addon/edit/matchbrackets.js"></script>+<script src="css.js"></script>+<style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>+<div id=nav>+ <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>++ <ul>+ <li><a href="../../index.html">Home</a>+ <li><a href="../../doc/manual.html">Manual</a>+ <li><a href="https://github.com/codemirror/codemirror5">Code</a>+ </ul>+ <ul>+ <li><a href="../index.html">Language modes</a>+ <li><a class=active href="#">LESS</a>+ </ul>+</div>++<article>+<h2>LESS mode</h2>+<form><textarea id="code" name="code">@media screen and (device-aspect-ratio: 16/9) { … }+@media screen and (device-aspect-ratio: 1280/720) { … }+@media screen and (device-aspect-ratio: 2560/1440) { … }++html:lang(fr-be)++tr:nth-child(2n+1) /* represents every odd row of an HTML table */++img:nth-of-type(2n+1) { float: right; }+img:nth-of-type(2n) { float: left; }++body > h2:not(:first-of-type):not(:last-of-type)++html|*:not(:link):not(:visited)+*|*:not(:hover)+p::first-line { text-transform: uppercase }++@namespace foo url(http://www.example.com);+foo|h1 { color: blue } /* first rule */++span[hello="Ocean"][goodbye="Land"]++E[foo]{+ padding:65px;+}++input[type="search"]::-webkit-search-decoration,+input[type="search"]::-webkit-search-cancel-button {+ -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5+}+button::-moz-focus-inner,+input::-moz-focus-inner { // Inner padding and border oddities in FF3/4+ padding: 0;+ border: 0;+}+.btn {+ // reset here as of 2.0.3 due to Recess property order+ border-color: #ccc;+ border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);+}+fieldset span button, fieldset span input[type="file"] {+ font-size:12px;+ font-family:Arial, Helvetica, sans-serif;+}++.rounded-corners (@radius: 5px) {+ border-radius: @radius;+ -webkit-border-radius: @radius;+ -moz-border-radius: @radius;+}++@import url("something.css");++@light-blue: hsl(190, 50%, 65%);++#menu {+ position: absolute;+ width: 100%;+ z-index: 3;+ clear: both;+ display: block;+ background-color: @blue;+ height: 42px;+ border-top: 2px solid lighten(@alpha-blue, 20%);+ border-bottom: 2px solid darken(@alpha-blue, 25%);+ .box-shadow(0, 1px, 8px, 0.6);+ -moz-box-shadow: 0 0 0 #000; // Because firefox sucks.++ &.docked {+ background-color: hsla(210, 60%, 40%, 0.4);+ }+ &:hover {+ background-color: @blue;+ }++ #dropdown {+ margin: 0 0 0 117px;+ padding: 0;+ padding-top: 5px;+ display: none;+ width: 190px;+ border-top: 2px solid @medium;+ color: @highlight;+ border: 2px solid darken(@medium, 25%);+ border-left-color: darken(@medium, 15%);+ border-right-color: darken(@medium, 15%);+ border-top-width: 0;+ background-color: darken(@medium, 10%);+ ul {+ padding: 0px;+ }+ li {+ font-size: 14px;+ display: block;+ text-align: left;+ padding: 0;+ border: 0;+ a {+ display: block;+ padding: 0px 15px;+ text-decoration: none;+ color: white;+ &:hover {+ background-color: darken(@medium, 15%);+ text-decoration: none;+ }+ }+ }+ .border-radius(5px, bottom);+ .box-shadow(0, 6px, 8px, 0.5);+ }+}+</textarea></form>+ <script>+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {+ lineNumbers: true,+ matchBrackets: true,+ mode: "text/x-less"+ });+ </script>++ <p>The LESS mode is a sub-mode of the <a href="index.html">CSS mode</a> (defined in <code>css.js</code>).</p>++ <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#less_*">normal</a>, <a href="../../test/index.html#verbose,less_*">verbose</a>.</p>+ </article>diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/less_test.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/less_test.jsnew file mode 100644index 000000000..cf367eaf1--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/less_test.js@@ -0,0 +1,54 @@+// CodeMirror, copyright (c) by Marijn Haverbeke and others+// Distributed under an MIT license: https://codemirror.net/5/LICENSE++(function() {+ "use strict";++ var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-less");+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "less"); }++ MT("variable",+ "[variable-2 @base]: [atom #f04615];",+ "[qualifier .class] {",+ " [property width]: [variable&callee percentage]([number 0.5]); [comment // returns `50%`]",+ " [property color]: [variable&callee saturate]([variable-2 @base], [number 5%]);",+ "}");++ MT("amp",+ "[qualifier .child], [qualifier .sibling] {",+ " [qualifier .parent] [atom &] {",+ " [property color]: [keyword black];",+ " }",+ " [atom &] + [atom &] {",+ " [property color]: [keyword red];",+ " }",+ "}");++ MT("mixin",+ "[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",+ " [property color]: [variable&callee darken]([variable-2 @color], [number 10%]);",+ "}",+ "[qualifier .mixin] ([variable light]; [variable-2 @color]) {",+ " [property color]: [variable&callee lighten]([variable-2 @color], [number 10%]);",+ "}",+ "[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",+ " [property display]: [atom block];",+ "}",+ "[variable-2 @switch]: [variable light];",+ "[qualifier .class] {",+ " [qualifier .mixin]([variable-2 @switch]; [atom #888]);",+ "}");++ MT("nest",+ "[qualifier .one] {",+ " [def @media] ([property width]: [number 400px]) {",+ " [property font-size]: [number 1.2em];",+ " [def @media] [attribute print] [keyword and] [property color] {",+ " [property color]: [keyword blue];",+ " }",+ " }",+ "}");+++ MT("interpolation", ".@{[variable foo]} { [property font-weight]: [atom bold]; }");+})();diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/scss.html b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/scss.htmlnew file mode 100644index 000000000..75ef4f925--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/scss.html@@ -0,0 +1,158 @@+<!doctype html>++<title>CodeMirror: SCSS mode</title>+<meta charset="utf-8"/>+<link rel=stylesheet href="../../doc/docs.css">++<link rel="stylesheet" href="../../lib/codemirror.css">+<script src="../../lib/codemirror.js"></script>+<script src="../../addon/edit/matchbrackets.js"></script>+<script src="css.js"></script>+<style>.CodeMirror {background: #f8f8f8;}</style>+<div id=nav>+ <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>++ <ul>+ <li><a href="../../index.html">Home</a>+ <li><a href="../../doc/manual.html">Manual</a>+ <li><a href="https://github.com/codemirror/codemirror5">Code</a>+ </ul>+ <ul>+ <li><a href="../index.html">Language modes</a>+ <li><a class=active href="#">SCSS</a>+ </ul>+</div>++<article>+<h2>SCSS mode</h2>+<form><textarea id="code" name="code">+/* Some example SCSS */++@import "compass/css3";+$variable: #333;++$blue: #3bbfce;+$margin: 16px;++.content-navigation {+ #nested {+ background-color: black;+ }+ border-color: $blue;+ color:+ darken($blue, 9%);+}++.border {+ padding: $margin / 2;+ margin: $margin / 2;+ border-color: $blue;+}++@mixin table-base {+ th {+ text-align: center;+ font-weight: bold;+ }+ td, th {padding: 2px}+}++table.hl {+ margin: 2em 0;+ td.ln {+ text-align: right;+ }+}++li {+ font: {+ family: serif;+ weight: bold;+ size: 1.2em;+ }+}++@mixin left($dist) {+ float: left;+ margin-left: $dist;+}++#data {+ @include left(10px);+ @include table-base;+}++.source {+ @include flow-into(target);+ border: 10px solid green;+ margin: 20px;+ width: 200px; }++.new-container {+ @include flow-from(target);+ border: 10px solid red;+ margin: 20px;+ width: 200px; }++body {+ margin: 0;+ padding: 3em 6em;+ font-family: tahoma, arial, sans-serif;+ color: #000;+}++@mixin yellow() {+ background: yellow;+}++.big {+ font-size: 14px;+}++.nested {+ @include border-radius(3px);+ @extend .big;+ p {+ background: whitesmoke;+ a {+ color: red;+ }+ }+}++#navigation a {+ font-weight: bold;+ text-decoration: none !important;+}++h1 {+ font-size: 2.5em;+}++h2 {+ font-size: 1.7em;+}++h1:before, h2:before {+ content: "::";+}++code {+ font-family: courier, monospace;+ font-size: 80%;+ color: #418A8A;+}+</textarea></form>+ <script>+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {+ lineNumbers: true,+ matchBrackets: true,+ mode: "text/x-scss"+ });+ </script>++ <p>The SCSS mode is a sub-mode of the <a href="index.html">CSS mode</a> (defined in <code>css.js</code>).</p>++ <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#scss_*">normal</a>, <a href="../../test/index.html#verbose,scss_*">verbose</a>.</p>++ </article>diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/scss_test.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/scss_test.jsnew file mode 100644index 000000000..14c1d1350--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/scss_test.js@@ -0,0 +1,110 @@+// CodeMirror, copyright (c) by Marijn Haverbeke and others+// Distributed under an MIT license: https://codemirror.net/5/LICENSE++(function() {+ var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }++ MT('url_with_quotation',+ "[tag foo] { [property background]:[variable&callee url]([string test.jpg]) }");++ MT('url_with_double_quotes',+ "[tag foo] { [property background]:[variable&callee url]([string \"test.jpg\"]) }");++ MT('url_with_single_quotes',+ "[tag foo] { [property background]:[variable&callee url]([string \'test.jpg\']) }");++ MT('string',+ "[def @import] [string \"compass/css3\"]");++ MT('important_keyword',+ "[tag foo] { [property background]:[variable&callee url]([string \'test.jpg\']) [keyword !important] }");++ MT('variable',+ "[variable-2 $blue]:[atom #333]");++ MT('variable_as_attribute',+ "[tag foo] { [property color]:[variable-2 $blue] }");++ MT('numbers',+ "[tag foo] { [property padding]:[number 10px] [number 10] [number 10em] [number 8in] }");++ MT('number_percentage',+ "[tag foo] { [property width]:[number 80%] }");++ MT('selector',+ "[builtin #hello][qualifier .world]{}");++ MT('singleline_comment',+ "[comment // this is a comment]");++ MT('multiline_comment',+ "[comment /*foobar*/]");++ MT('attribute_with_hyphen',+ "[tag foo] { [property font-size]:[number 10px] }");++ MT('string_after_attribute',+ "[tag foo] { [property content]:[string \"::\"] }");++ MT('directives',+ "[def @include] [qualifier .mixin]");++ MT('basic_structure',+ "[tag p] { [property background]:[keyword red]; }");++ MT('nested_structure',+ "[tag p] { [tag a] { [property color]:[keyword red]; } }");++ MT('mixin',+ "[def @mixin] [tag table-base] {}");++ MT('number_without_semicolon',+ "[tag p] {[property width]:[number 12]}",+ "[tag a] {[property color]:[keyword red];}");++ MT('atom_in_nested_block',+ "[tag p] { [tag a] { [property color]:[atom #000]; } }");++ MT('interpolation_in_property',+ "[tag foo] { #{[variable-2 $hello]}:[number 2]; }");++ MT('interpolation_in_selector',+ "[tag foo]#{[variable-2 $hello]} { [property color]:[atom #000]; }");++ MT('interpolation_error',+ "[tag foo]#{[variable foo]} { [property color]:[atom #000]; }");++ MT("divide_operator",+ "[tag foo] { [property width]:[number 4] [operator /] [number 2] }");++ MT('nested_structure_with_id_selector',+ "[tag p] { [builtin #hello] { [property color]:[keyword red]; } }");++ MT('indent_mixin',+ "[def @mixin] [tag container] (",+ " [variable-2 $a]: [number 10],",+ " [variable-2 $b]: [number 10])",+ "{}");++ MT('indent_nested',+ "[tag foo] {",+ " [tag bar] {",+ " }",+ "}");++ MT('indent_parentheses',+ "[tag foo] {",+ " [property color]: [variable&callee darken]([variable-2 $blue],",+ " [number 9%]);",+ "}");++ MT('indent_vardef',+ "[variable-2 $name]:",+ " [string 'val'];",+ "[tag tag] {",+ " [tag inner] {",+ " [property margin]: [number 3px];",+ " }",+ "}");+})();diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/test.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/test.jsnew file mode 100644index 000000000..573207e83--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/css/test.js@@ -0,0 +1,217 @@+// CodeMirror, copyright (c) by Marijn Haverbeke and others+// Distributed under an MIT license: https://codemirror.net/5/LICENSE++(function() {+ var mode = CodeMirror.getMode({indentUnit: 2}, "css");+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }++ // Error, because "foobarhello" is neither a known type or property, but+ // property was expected (after "and"), and it should be in parentheses.+ MT("atMediaUnknownType",+ "[def @media] [attribute screen] [keyword and] [error foobarhello] { }");++ // Soft error, because "foobarhello" is not a known property or type.+ MT("atMediaUnknownProperty",+ "[def @media] [attribute screen] [keyword and] ([error foobarhello]) { }");++ // Make sure nesting works with media queries+ MT("atMediaMaxWidthNested",+ "[def @media] [attribute screen] [keyword and] ([property max-width]: [number 25px]) { [tag foo] { } }");++ MT("atMediaFeatureValueKeyword",+ "[def @media] ([property orientation]: [keyword landscape]) { }");++ MT("atMediaUnknownFeatureValueKeyword",+ "[def @media] ([property orientation]: [error upsidedown]) { }");++ MT("atMediaUppercase",+ "[def @MEDIA] ([property orienTAtion]: [keyword landScape]) { }");++ MT("tagSelector",+ "[tag foo] { }");++ MT("classSelector",+ "[qualifier .foo-bar_hello] { }");++ MT("idSelector",+ "[builtin #foo] { [error #foo] }");++ MT("tagSelectorUnclosed",+ "[tag foo] { [property margin]: [number 0] } [tag bar] { }");++ MT("tagStringNoQuotes",+ "[tag foo] { [property font-family]: [variable hello] [variable world]; }");++ MT("tagStringDouble",+ "[tag foo] { [property font-family]: [string \"hello world\"]; }");++ MT("tagStringSingle",+ "[tag foo] { [property font-family]: [string 'hello world']; }");++ MT("tagColorKeyword",+ "[tag foo] {",+ " [property color]: [keyword black];",+ " [property color]: [keyword navy];",+ " [property color]: [keyword yellow];",+ "}");++ MT("tagColorHex3",+ "[tag foo] { [property background]: [atom #fff]; }");++ MT("tagColorHex4",+ "[tag foo] { [property background]: [atom #ffff]; }");++ MT("tagColorHex6",+ "[tag foo] { [property background]: [atom #ffffff]; }");++ MT("tagColorHex8",+ "[tag foo] { [property background]: [atom #ffffffff]; }");++ MT("tagColorHex5Invalid",+ "[tag foo] { [property background]: [atom&error #fffff]; }");++ MT("tagColorHexInvalid",+ "[tag foo] { [property background]: [atom&error #ffg]; }");++ MT("tagNegativeNumber",+ "[tag foo] { [property margin]: [number -5px]; }");++ MT("tagPositiveNumber",+ "[tag foo] { [property padding]: [number 5px]; }");++ MT("tagVendor",+ "[tag foo] { [meta -foo-][property box-sizing]: [meta -foo-][atom border-box]; }");++ MT("tagBogusProperty",+ "[tag foo] { [property&error barhelloworld]: [number 0]; }");++ MT("tagTwoProperties",+ "[tag foo] { [property margin]: [number 0]; [property padding]: [number 0]; }");++ MT("tagTwoPropertiesURL",+ "[tag foo] { [property background]: [variable&callee url]([string //example.com/foo.png]); [property padding]: [number 0]; }");++ MT("indent_tagSelector",+ "[tag strong], [tag em] {",+ " [property background]: [variable&callee rgba](",+ " [number 255], [number 255], [number 0], [number .2]",+ " );",+ "}");++ MT("indent_atMedia",+ "[def @media] {",+ " [tag foo] {",+ " [property color]:",+ " [keyword yellow];",+ " }",+ "}");++ MT("indent_comma",+ "[tag foo] {",+ " [property font-family]: [variable verdana],",+ " [atom sans-serif];",+ "}");++ MT("indent_parentheses",+ "[tag foo]:[variable-3 before] {",+ " [property background]: [variable&callee url](",+ "[string blahblah]",+ "[string etc]",+ "[string ]) [keyword !important];",+ "}");++ MT("font_face",+ "[def @font-face] {",+ " [property font-family]: [string 'myfont'];",+ " [error nonsense]: [string 'abc'];",+ " [property src]: [variable&callee url]([string http://blah]),",+ " [variable&callee url]([string http://foo]);",+ "}");++ MT("empty_url",+ "[def @import] [variable&callee url]() [attribute screen];");++ MT("parens",+ "[qualifier .foo] {",+ " [property background-image]: [variable&callee fade]([atom #000], [number 20%]);",+ " [property border-image]: [variable&callee linear-gradient](",+ " [atom to] [atom bottom],",+ " [variable&callee fade]([atom #000], [number 20%]) [number 0%],",+ " [variable&callee fade]([atom #000], [number 20%]) [number 100%]",+ " );",+ "}");++ MT("css_variable",+ ":[variable-3 root] {",+ " [variable-2 --main-color]: [atom #06c];",+ "}",+ "[tag h1][builtin #foo] {",+ " [property color]: [variable&callee var]([variable-2 --main-color]);",+ "}");++ MT("blank_css_variable",+ ":[variable-3 root] {",+ " [variable-2 --]: [atom #06c];",+ "}",+ "[tag h1][builtin #foo] {",+ " [property color]: [variable&callee var]([variable-2 --]);",+ "}");++ MT("supports",+ "[def @supports] ([keyword not] (([property text-align-last]: [atom justify]) [keyword or] ([meta -moz-][property text-align-last]: [atom justify])) {",+ " [property text-align-last]: [atom justify];",+ "}");++ MT("document",+ "[def @document] [variable&callee url]([string http://blah]),",+ " [variable&callee url-prefix]([string https://]),",+ " [variable&callee domain]([string blah.com]),",+ " [variable&callee regexp]([string \".*blah.+\"]) {",+ " [builtin #id] {",+ " [property background-color]: [keyword white];",+ " }",+ " [tag foo] {",+ " [property font-family]: [variable Verdana], [atom sans-serif];",+ " }",+ "}");++ MT("document_url",+ "[def @document] [variable&callee url]([string http://blah]) { [qualifier .class] { } }");++ MT("document_urlPrefix",+ "[def @document] [variable&callee url-prefix]([string https://]) { [builtin #id] { } }");++ MT("document_domain",+ "[def @document] [variable&callee domain]([string blah.com]) { [tag foo] { } }");++ MT("document_regexp",+ "[def @document] [variable&callee regexp]([string \".*blah.+\"]) { [builtin #id] { } }");++ MT("counter-style",+ "[def @counter-style] [variable binary] {",+ " [property system]: [atom numeric];",+ " [property symbols]: [number 0] [number 1];",+ " [property suffix]: [string \".\"];",+ " [property range]: [atom infinite];",+ " [property speak-as]: [atom numeric];",+ "}");++ MT("counter-style-additive-symbols",+ "[def @counter-style] [variable simple-roman] {",+ " [property system]: [atom additive];",+ " [property additive-symbols]: [number 10] [variable X], [number 5] [variable V], [number 1] [variable I];",+ " [property range]: [number 1] [number 49];",+ "}");++ MT("counter-style-use",+ "[tag ol][qualifier .roman] { [property list-style]: [variable simple-roman]; }");++ MT("counter-style-symbols",+ "[tag ol] { [property list-style]: [variable&callee symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");++ MT("comment-does-not-disrupt",+ "[def @font-face] [comment /* foo */] {",+ " [property src]: [variable&callee url]([string x]);",+ " [property font-family]: [variable One];",+ "}")+})();diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/index.html b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/index.htmlnew file mode 100644index 000000000..f4be5ead2--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/index.html@@ -0,0 +1,118 @@+<!doctype html>++<title>CodeMirror: JavaScript mode</title>+<meta charset="utf-8"/>+<link rel=stylesheet href="../../doc/docs.css">++<link rel="stylesheet" href="../../lib/codemirror.css">+<script src="../../lib/codemirror.js"></script>+<script src="../../addon/edit/matchbrackets.js"></script>+<script src="../../addon/comment/continuecomment.js"></script>+<script src="../../addon/comment/comment.js"></script>+<script src="javascript.js"></script>+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>+<div id=nav>+ <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>++ <ul>+ <li><a href="../../index.html">Home</a>+ <li><a href="../../doc/manual.html">Manual</a>+ <li><a href="https://github.com/codemirror/codemirror5">Code</a>+ </ul>+ <ul>+ <li><a href="../index.html">Language modes</a>+ <li><a class=active href="#">JavaScript</a>+ </ul>+</div>++<article>+<h2>JavaScript mode</h2>+++<div><textarea id="code" name="code">+// Demo code (the actual new parser character stream implementation)++function StringStream(string) {+ this.pos = 0;+ this.string = string;+}++StringStream.prototype = {+ done: function() {return this.pos >= this.string.length;},+ peek: function() {return this.string.charAt(this.pos);},+ next: function() {+ if (this.pos < this.string.length)+ return this.string.charAt(this.pos++);+ },+ eat: function(match) {+ var ch = this.string.charAt(this.pos);+ if (typeof match == "string") var ok = ch == match;+ else var ok = ch && match.test ? match.test(ch) : match(ch);+ if (ok) {this.pos++; return ch;}+ },+ eatWhile: function(match) {+ var start = this.pos;+ while (this.eat(match));+ if (this.pos > start) return this.string.slice(start, this.pos);+ },+ backUp: function(n) {this.pos -= n;},+ column: function() {return this.pos;},+ eatSpace: function() {+ var start = this.pos;+ while (/\s/.test(this.string.charAt(this.pos))) this.pos++;+ return this.pos - start;+ },+ match: function(pattern, consume, caseInsensitive) {+ if (typeof pattern == "string") {+ function cased(str) {return caseInsensitive ? str.toLowerCase() : str;}+ if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) {+ if (consume !== false) this.pos += str.length;+ return true;+ }+ }+ else {+ var match = this.string.slice(this.pos).match(pattern);+ if (match && consume !== false) this.pos += match[0].length;+ return match;+ }+ }+};+</textarea></div>++ <script>+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {+ lineNumbers: true,+ matchBrackets: true,+ continueComments: "Enter",+ extraKeys: {"Ctrl-Q": "toggleComment"}+ });+ </script>++ <p>+ JavaScript mode supports several configuration options:+ <ul>+ <li><code>json</code> which will set the mode to expect JSON+ data rather than a JavaScript program.</li>+ <li><code>jsonld</code> which will set the mode to expect+ <a href="http://json-ld.org">JSON-LD</a> linked data rather+ than a JavaScript program (<a href="json-ld.html">demo</a>).</li>+ <li><code>typescript</code> which will activate additional+ syntax highlighting and some other things for TypeScript code+ (<a href="typescript.html">demo</a>).</li>+ <li><code>trackScope</code> can be set to false to turn off+ tracking of local variables. This will prevent locals from+ getting the <code>"variable-2"</code> token type, and will+ break completion of locals with javascript-hint.</li>+ <li><code>statementIndent</code> which (given a number) will+ determine the amount of indentation to use for statements+ continued on a new line.</li>+ <li><code>wordCharacters</code>, a regexp that indicates which+ characters should be considered part of an identifier.+ Defaults to <code>/[\w$]/</code>, which does not handle+ non-ASCII identifiers. Can be set to something more elaborate+ to improve Unicode support.</li>+ </ul>+ </p>++ <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/javascript</code>, <code>application/x-javascript</code>, <code>text/ecmascript</code>, <code>application/ecmascript</code>, <code>application/json</code>, <code>application/x-json</code>, <code>application/manifest+json</code>, <code>application/ld+json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>+ </article>diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/javascript.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/javascript.jsindex 43848260b..48a46d65d 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/javascript.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/javascript.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -16,6 +16,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {var statementIndent = parserConfig.statementIndent;var jsonldMode = parserConfig.jsonld;var jsonMode = parserConfig.json || jsonldMode;+ var trackScope = parserConfig.trackScope !== falsevar isTS = parserConfig.typescript;var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;@@ -98,21 +99,25 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {} else if (ch == "`") {state.tokenize = tokenQuasi;return tokenQuasi(stream, state);- } else if (ch == "#") {+ } else if (ch == "#" && stream.peek() == "!") {stream.skipToEnd();- return ret("error", "error");- } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) {+ return ret("meta", "meta");+ } else if (ch == "#" && stream.eatWhile(wordRE)) {+ return ret("variable", "property")+ } else if (ch == "<" && stream.match("!--") ||+ (ch == "-" && stream.match("->") && !/\S/.test(stream.string.slice(0, stream.start)))) {stream.skipToEnd()return ret("comment", "comment")} else if (isOperatorChar.test(ch)) {if (ch != ">" || !state.lexical || state.lexical.type != ">") {if (stream.eat("=")) {if (ch == "!" || ch == "=") stream.eat("=")- } else if (/[<>*+\-]/.test(ch)) {+ } else if (/[<>*+\-|&?]/.test(ch)) {stream.eat(ch)if (ch == ">") stream.eat(ch)}}+ if (ch == "?" && stream.eat(".")) return ret(".")return ret("operator", "operator", stream.current());} else if (wordRE.test(ch)) {stream.eatWhile(wordRE);@@ -122,7 +127,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {var kw = keywords[word]return ret(kw.type, kw.style, word)}- if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))+ if (word == "async" && stream.match(/^(\s|\/\*([^*]|\*(?!\/))*?\*\/)*[\[\(\w]/, false))return ret("async", "keyword", word)}return ret("variable", "variable", word)@@ -214,7 +219,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {// Parser- var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true};+ var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true,+ "regexp": true, "this": true, "import": true, "jsonld-keyword": true};function JSLexical(indented, column, type, align, prev, info) {this.indented = indented;@@ -226,6 +232,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {}function inScope(state, varname) {+ if (!trackScope) return falsefor (var v = state.localVars; v; v = v.next)if (v.name == varname) return true;for (var cx = state.context; cx; cx = cx.prev) {@@ -272,6 +279,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {function register(varname) {var state = cx.state;cx.marked = "def";+ if (!trackScope) returnif (state.context) {if (state.lexical.info == "var" && state.context && state.context.block) {// FIXME function decls are also not block scoped@@ -322,6 +330,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {cx.state.context = new Context(cx.state.context, cx.state.localVars, true)cx.state.localVars = null}+ pushcontext.lex = pushblockcontext.lex = truefunction popcontext() {cx.state.localVars = cx.state.context.varscx.state.context = cx.state.context.prev@@ -371,7 +380,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse);}if (type == "function") return cont(functiondef);- if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);+ if (type == "for") return cont(pushlex("form"), pushblockcontext, forspec, statement, popcontext, poplex);if (type == "class" || (isTS && value == "interface")) {cx.marked = "keyword"return cont(pushlex("form", type == "class" ? type : value), className, poplex)@@ -437,7 +446,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {if (type == "{") return contCommasep(objprop, "}", null, maybeop);if (type == "quasi") return pass(quasi, maybeop);if (type == "new") return cont(maybeTarget(noComma));- if (type == "import") return cont(expression);return cont();}function maybeexpression(type) {@@ -455,7 +463,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);if (type == "operator") {if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);- if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))+ if (isTS && value == "<" && cx.stream.match(/^([^<>]|<[^<>]*>)*>\s*\(/, false))return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me);if (value == "?") return cont(expression, expect(":"), expr);return cont(expr);@@ -475,7 +483,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {function quasi(type, value) {if (type != "quasi") return pass();if (value.slice(value.length - 2) != "${") return cont(quasi);- return cont(expression, continueQuasi);+ return cont(maybeexpression, continueQuasi);}function continueQuasi(type) {if (type == "}") {@@ -601,7 +609,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {}}function typeexpr(type, value) {- if (value == "keyof" || value == "typeof" || value == "infer") {+ if (value == "keyof" || value == "typeof" || value == "infer" || value == "readonly") {cx.marked = "keyword"return cont(value == "typeof" ? expressionNoComma : typeexpr)}@@ -612,13 +620,19 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {if (value == "|" || value == "&") return cont(typeexpr)if (type == "string" || type == "number" || type == "atom") return cont(afterType);if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)- if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)+ if (type == "{") return cont(pushlex("}"), typeprops, poplex, afterType)if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType, afterType)if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr)+ if (type == "quasi") { return pass(quasiType, afterType); }}function maybeReturnType(type) {if (type == "=>") return cont(typeexpr)}+ function typeprops(type) {+ if (type.match(/[\}\)\]]/)) return cont()+ if (type == "," || type == ";") return cont(typeprops)+ return pass(typeprop, typeprops)+ }function typeprop(type, value) {if (type == "variable" || cx.style == "keyword") {cx.marked = "property"@@ -631,6 +645,20 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop)} else if (type == "(") {return pass(functiondecl, typeprop)+ } else if (!type.match(/[;\}\)\],]/)) {+ return cont()+ }+ }+ function quasiType(type, value) {+ if (type != "quasi") return pass();+ if (value.slice(value.length - 2) != "${") return cont(quasiType);+ return cont(typeexpr, continueQuasiType);+ }+ function continueQuasiType(type) {+ if (type == "}") {+ cx.marked = "string-2";+ cx.state.tokenize = tokenQuasi;+ return cont(quasiType);}}function typearg(type, value) {@@ -757,11 +785,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {}if (type == "variable" || cx.style == "keyword") {cx.marked = "property";- return cont(isTS ? classfield : functiondef, classBody);+ return cont(classfield, classBody);}- if (type == "number" || type == "string") return cont(isTS ? classfield : functiondef, classBody);+ if (type == "number" || type == "string") return cont(classfield, classBody);if (type == "[")- return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)+ return cont(expression, maybetype, expect("]"), classfield, classBody)if (value == "*") {cx.marked = "keyword";return cont(classBody);@@ -772,6 +800,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {if (value == "@") return cont(expression, classBody)}function classfield(type, value) {+ if (value == "!") return cont(classfield)if (value == "?") return cont(classfield)if (type == ":") return cont(typeexpr, maybeAssign)if (value == "=") return cont(expressionNoComma)@@ -791,6 +820,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {function afterImport(type) {if (type == "string") return cont();if (type == "(") return pass(expression);+ if (type == ".") return pass(maybeoperatorComma);return pass(importSpec, maybeMoreImports, maybeFrom);}function importSpec(type, value) {@@ -864,14 +894,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {},indent: function(state, textAfter) {- if (state.tokenize == tokenComment) return CodeMirror.Pass;+ if (state.tokenize == tokenComment || state.tokenize == tokenQuasi) return CodeMirror.Pass;if (state.tokenize != tokenBase) return 0;var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, top// Kludge to prevent 'maybelse' from blocking lexical scope popsif (!/^\s*else\b/.test(textAfter)) 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) break;+ else if (c != maybeelse && c != popcontext) break;}while ((lexical.type == "stat" || lexical.type == "form") &&(firstChar == "}" || ((top = state.cc[state.cc.length - 1]) &&@@ -908,8 +938,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {expressionAllowed: expressionAllowed,skipExpression: function(state) {- var top = state.cc[state.cc.length - 1]- if (top == expression || top == expressionNoComma) state.cc.pop()+ parseJS(state, "atom", "atom", "true", new CodeMirror.StringStream("", 2, null))}};});@@ -921,9 +950,10 @@ CodeMirror.defineMIME("text/ecmascript", "javascript");CodeMirror.defineMIME("application/javascript", "javascript");CodeMirror.defineMIME("application/x-javascript", "javascript");CodeMirror.defineMIME("application/ecmascript", "javascript");-CodeMirror.defineMIME("application/json", {name: "javascript", json: true});-CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});-CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true});+CodeMirror.defineMIME("application/json", { name: "javascript", json: true });+CodeMirror.defineMIME("application/x-json", { name: "javascript", json: true });+CodeMirror.defineMIME("application/manifest+json", { name: "javascript", json: true })+CodeMirror.defineMIME("application/ld+json", { name: "javascript", jsonld: true });CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/json-ld.html b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/json-ld.htmlnew file mode 100644index 000000000..d3dff2e29--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/json-ld.html@@ -0,0 +1,72 @@+<!doctype html>++<title>CodeMirror: JSON-LD mode</title>+<meta charset="utf-8"/>+<link rel=stylesheet href="../../doc/docs.css">++<link rel="stylesheet" href="../../lib/codemirror.css">+<script src="../../lib/codemirror.js"></script>+<script src="../../addon/edit/matchbrackets.js"></script>+<script src="../../addon/comment/continuecomment.js"></script>+<script src="../../addon/comment/comment.js"></script>+<script src="javascript.js"></script>+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>+<div id="nav">+ <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"/></a>++ <ul>+ <li><a href="../../index.html">Home</a>+ <li><a href="../../doc/manual.html">Manual</a>+ <li><a href="https://github.com/codemirror/codemirror5">Code</a>+ </ul>+ <ul>+ <li><a href="../index.html">Language modes</a>+ <li><a class=active href="#">JSON-LD</a>+ </ul>+</div>++<article>+<h2>JSON-LD mode</h2>+++<div><textarea id="code" name="code">+{+ "@context": {+ "name": "http://schema.org/name",+ "description": "http://schema.org/description",+ "image": {+ "@id": "http://schema.org/image",+ "@type": "@id"+ },+ "geo": "http://schema.org/geo",+ "latitude": {+ "@id": "http://schema.org/latitude",+ "@type": "xsd:float"+ },+ "longitude": {+ "@id": "http://schema.org/longitude",+ "@type": "xsd:float"+ },+ "xsd": "http://www.w3.org/2001/XMLSchema#"+ },+ "name": "The Empire State Building",+ "description": "The Empire State Building is a 102-story landmark in New York City.",+ "image": "http://www.civil.usherbrooke.ca/cours/gci215a/empire-state-building.jpg",+ "geo": {+ "latitude": "40.75",+ "longitude": "73.98"+ }+}+</textarea></div>++ <script>+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {+ matchBrackets: true,+ autoCloseBrackets: true,+ mode: "application/ld+json",+ lineWrapping: true+ });+ </script>++ <p>This is a specialization of the <a href="index.html">JavaScript mode</a>.</p>+ </article>diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/test.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/test.jsnew file mode 100644index 000000000..a1bcf1f2d--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/test.js@@ -0,0 +1,521 @@+// CodeMirror, copyright (c) by Marijn Haverbeke and others+// Distributed under an MIT license: https://codemirror.net/5/LICENSE++(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] [def foo]([def a], [def b]) { [keyword var] [def c] [operator =] [number 10]; [keyword return] [variable-2 a] [operator +] [variable-2 c] [operator +] [variable d]; }");++ MT("comma-and-binop",+ "[keyword function](){ [keyword var] [def x] [operator =] [number 1] [operator +] [number 2], [def y]; }");++ MT("destructuring",+ "([keyword function]([def a], [[[def b], [def c] ]]) {",+ " [keyword let] {[def d], [property foo]: [def c][operator =][number 10], [def x]} [operator =] [variable foo]([variable-2 a]);",+ " [[[variable-2 c], [variable y] ]] [operator =] [variable-2 c];",+ "})();");++ MT("destructure_trailing_comma",+ "[keyword let] {[def a], [def b],} [operator =] [variable foo];",+ "[keyword let] [def c];"); // Parser still in good state?++ MT("class_body",+ "[keyword class] [def Foo] {",+ " [property constructor]() {}",+ " [property sayName]() {",+ " [keyword return] [string-2 `foo${][variable foo][string-2 }oo`];",+ " }",+ "}");++ MT("class",+ "[keyword class] [def Point] [keyword extends] [variable SuperThing] {",+ " [keyword get] [property prop]() { [keyword return] [number 24]; }",+ " [property constructor]([def x], [def y]) {",+ " [keyword super]([string 'something']);",+ " [keyword this].[property x] [operator =] [variable-2 x];",+ " }",+ "}");++ MT("anonymous_class_expression",+ "[keyword const] [def Adder] [operator =] [keyword class] [keyword extends] [variable Arithmetic] {",+ " [property add]([def a], [def b]) {}",+ "};");++ MT("named_class_expression",+ "[keyword const] [def Subber] [operator =] [keyword class] [def Subtract] {",+ " [property sub]([def a], [def b]) {}",+ "};");++ MT("class_async_method",+ "[keyword class] [def Foo] {",+ " [property sayName1]() {}",+ " [keyword async] [property sayName2]() {}",+ "}");++ MT("import",+ "[keyword function] [def foo]() {",+ " [keyword import] [def $] [keyword from] [string 'jquery'];",+ " [keyword import] { [def encrypt], [def decrypt] } [keyword from] [string 'crypto'];",+ "}");++ MT("import_trailing_comma",+ "[keyword import] {[def foo], [def bar],} [keyword from] [string 'baz']")++ MT("import_dynamic",+ "[keyword import]([string 'baz']).[property then]")++ MT("import_dynamic",+ "[keyword const] [def t] [operator =] [keyword import]([string 'baz']).[property then]")++ MT("const",+ "[keyword function] [def f]() {",+ " [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",+ "}");++ MT("for/of",+ "[keyword for]([keyword let] [def of] [keyword of] [variable something]) {}");++ MT("for await",+ "[keyword for] [keyword await]([keyword let] [def of] [keyword of] [variable something]) {}");++ MT("generator",+ "[keyword function*] [def repeat]([def n]) {",+ " [keyword for]([keyword var] [def i] [operator =] [number 0]; [variable-2 i] [operator <] [variable-2 n]; [operator ++][variable-2 i])",+ " [keyword yield] [variable-2 i];",+ "}");++ MT("let_scoping",+ "[keyword function] [def scoped]([def n]) {",+ " { [keyword var] [def i]; } [variable-2 i];",+ " { [keyword let] [def j]; [variable-2 j]; } [variable j];",+ " [keyword if] ([atom true]) { [keyword const] [def k]; [variable-2 k]; } [variable k];",+ "}");++ MT("switch_scoping",+ "[keyword switch] ([variable x]) {",+ " [keyword default]:",+ " [keyword let] [def j];",+ " [keyword return] [variable-2 j]",+ "}",+ "[variable j];")++ MT("leaving_scope",+ "[keyword function] [def a]() {",+ " {",+ " [keyword const] [def x] [operator =] [number 1]",+ " [keyword if] ([atom true]) {",+ " [keyword let] [def y] [operator =] [number 2]",+ " [keyword var] [def z] [operator =] [number 3]",+ " [variable console].[property log]([variable-2 x], [variable-2 y], [variable-2 z])",+ " }",+ " [variable console].[property log]([variable-2 x], [variable y], [variable-2 z])",+ " }",+ " [variable console].[property log]([variable x], [variable y], [variable-2 z])",+ "}")++ MT("quotedStringAddition",+ "[keyword let] [def f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");++ MT("quotedFatArrow",+ "[keyword let] [def f] [operator =] [variable a] [operator +] [string '=>'] [operator +] [variable c];");++ MT("fatArrow",+ "[variable array].[property filter]([def a] [operator =>] [variable-2 a] [operator +] [number 1]);",+ "[variable a];", // No longer in scope+ "[keyword let] [def f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",+ "[variable c];");++ MT("fatArrow_stringDefault",+ "([def a], [def b] [operator =] [string 'x\\'y']) [operator =>] [variable-2 a] [operator +] [variable-2 b]")++ MT("spread",+ "[keyword function] [def f]([def a], [meta ...][def b]) {",+ " [variable something]([variable-2 a], [meta ...][variable-2 b]);",+ "}");++ MT("quasi",+ "[variable re][string-2 `fofdlakj${][variable x] [operator +] ([variable re][string-2 `foo`]) [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");++ MT("quasi_no_function",+ "[variable x] [operator =] [string-2 `fofdlakj${][variable x] [operator +] [string-2 `foo`] [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");++ MT("indent_statement",+ "[keyword var] [def x] [operator =] [number 10]",+ "[variable x] [operator +=] [variable y] [operator +]",+ " [atom Infinity]",+ "[keyword debugger];");++ MT("indent_if",+ "[keyword if] ([number 1])",+ " [keyword break];",+ "[keyword else] [keyword if] ([number 2])",+ " [keyword continue];",+ "[keyword else]",+ " [number 10];",+ "[keyword if] ([number 1]) {",+ " [keyword break];",+ "} [keyword else] [keyword if] ([number 2]) {",+ " [keyword continue];",+ "} [keyword else] {",+ " [number 10];",+ "}");++ MT("indent_for",+ "[keyword for] ([keyword var] [def i] [operator =] [number 0];",+ " [variable-2 i] [operator <] [number 100];",+ " [variable-2 i][operator ++])",+ " [variable doSomething]([variable-2 i]);",+ "[keyword debugger];");++ MT("indent_c_style",+ "[keyword function] [def foo]()",+ "{",+ " [keyword debugger];",+ "}");++ MT("indent_else",+ "[keyword for] (;;)",+ " [keyword if] ([variable foo])",+ " [keyword if] ([variable bar])",+ " [number 1];",+ " [keyword else]",+ " [number 2];",+ " [keyword else]",+ " [number 3];");++ MT("indent_funarg",+ "[variable foo]([number 10000],",+ " [keyword function]([def a]) {",+ " [keyword debugger];",+ "};");++ MT("indent_below_if",+ "[keyword for] (;;)",+ " [keyword if] ([variable foo])",+ " [number 1];",+ "[number 2];");++ MT("indent_semicolonless_if",+ "[keyword function] [def foo]() {",+ " [keyword if] ([variable x])",+ " [variable foo]()",+ "}")++ MT("indent_semicolonless_if_with_statement",+ "[keyword function] [def foo]() {",+ " [keyword if] ([variable x])",+ " [variable foo]()",+ " [variable bar]()",+ "}")++ MT("multilinestring",+ "[keyword var] [def x] [operator =] [string 'foo\\]",+ "[string bar'];");++ MT("scary_regexp",+ "[string-2 /foo[[/]]bar/];");++ MT("indent_strange_array",+ "[keyword var] [def x] [operator =] [[",+ " [number 1],,",+ " [number 2],",+ "]];",+ "[number 10];");++ MT("param_default",+ "[keyword function] [def foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",+ " [keyword return] [variable-2 x];",+ "}");++ MT(+ "param_destructuring",+ "[keyword function] [def foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",+ " [keyword return] [variable-2 x];",+ "}");++ MT("new_target",+ "[keyword function] [def F]([def target]) {",+ " [keyword if] ([variable-2 target] [operator &&] [keyword new].[keyword target].[property name]) {",+ " [keyword return] [keyword new]",+ " .[keyword target];",+ " }",+ "}");++ MT("async",+ "[keyword async] [keyword function] [def foo]([def args]) { [keyword return] [atom true]; }");++ MT("async_assignment",+ "[keyword const] [def foo] [operator =] [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; };");++ MT("async_object",+ "[keyword let] [def obj] [operator =] { [property async]: [atom false] };");++ // async be highlighted as keyword and foo as def, but it requires potentially expensive look-ahead. See #4173+ MT("async_object_function",+ "[keyword let] [def obj] [operator =] { [property async] [property foo]([def args]) { [keyword return] [atom true]; } };");++ MT("async_object_properties",+ "[keyword let] [def obj] [operator =] {",+ " [property prop1]: [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; },",+ " [property prop2]: [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; },",+ " [property prop3]: [keyword async] [keyword function] [def prop3]([def args]) { [keyword return] [atom true]; },",+ "};");++ MT("async_arrow",+ "[keyword const] [def foo] [operator =] [keyword async] ([def args]) [operator =>] { [keyword return] [atom true]; };");++ MT("async_jquery",+ "[variable $].[property ajax]({",+ " [property url]: [variable url],",+ " [property async]: [atom true],",+ " [property method]: [string 'GET']",+ "});");++ MT("async_variable",+ "[keyword const] [def async] [operator =] {[property a]: [number 1]};",+ "[keyword const] [def foo] [operator =] [string-2 `bar ${][variable async].[property a][string-2 }`];")++ MT("bigint", "[number 1n] [operator +] [number 0x1afn] [operator +] [number 0o064n] [operator +] [number 0b100n];")++ MT("async_comment",+ "[keyword async] [comment /**/] [keyword function] [def foo]([def args]) { [keyword return] [atom true]; }");++ MT("indent_switch",+ "[keyword switch] ([variable x]) {",+ " [keyword default]:",+ " [keyword return] [number 2]",+ "}")++ MT("regexp_corner_case",+ "[operator +]{} [operator /] [atom undefined];",+ "[[[meta ...][string-2 /\\//] ]];",+ "[keyword void] [string-2 /\\//];",+ "[keyword do] [string-2 /\\//]; [keyword while] ([number 0]);",+ "[keyword if] ([number 0]) {} [keyword else] [string-2 /\\//];",+ "[string-2 `${][variable async][operator ++][string-2 }//`];",+ "[string-2 `${]{} [operator /] [string-2 /\\//}`];")++ MT("return_eol",+ "[keyword return]",+ "{} [string-2 /5/]")++ MT("numeric separator",+ "[number 123_456];",+ "[number 0xdead_c0de];",+ "[number 0o123_456];",+ "[number 0b1101_1101];",+ "[number .123_456e0_1];",+ "[number 1E+123_456];",+ "[number 12_34_56n];")++ MT("underscore property",+ "[variable something].[property _property];",+ "[variable something].[property _123];",+ "[variable something].[property _for];",+ "[variable _for];",+ "[variable _123];")++ MT("private properties",+ "[keyword class] [def C] {",+ " [property #x] [operator =] [number 2];",+ " [property #read]() {",+ " [keyword return] [keyword this].[property #x]",+ " }",+ "}")++ var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")+ function TS(name) {+ test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))+ }++ TS("typescript_extend_type",+ "[keyword class] [def Foo] [keyword extends] [type Some][operator <][type Type][operator >] {}")++ TS("typescript_arrow_type",+ "[keyword let] [def x]: ([variable arg]: [type Type]) [operator =>] [type ReturnType]")++ TS("typescript_class",+ "[keyword class] [def Foo] {",+ " [keyword public] [keyword static] [property main]() {}",+ " [keyword private] [property _foo]: [type string];",+ "}")++ TS("typescript_literal_types",+ "[keyword import] [keyword *] [keyword as] [def Sequelize] [keyword from] [string 'sequelize'];",+ "[keyword interface] [def MyAttributes] {",+ " [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",+ " [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",+ "}",+ "[keyword interface] [def MyInstance] [keyword extends] [type Sequelize].[type Instance] [operator <] [type MyAttributes] [operator >] {",+ " [property rawAttributes]: [type MyAttributes];",+ " [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",+ " [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",+ "}")++ TS("typescript_extend_operators",+ "[keyword export] [keyword interface] [def UserModel] [keyword extends]",+ " [type Sequelize].[type Model] [operator <] [type UserInstance], [type UserAttributes] [operator >] {",+ " [property findById]: (",+ " [variable userId]: [type number]",+ " ) [operator =>] [type Promise] [operator <] [type Array] [operator <] { [property id], [property name] } [operator >>];",+ " [property updateById]: (",+ " [variable userId]: [type number],",+ " [variable isActive]: [type boolean]",+ " ) [operator =>] [type Promise] [operator <] [type AccountHolderNotificationPreferenceInstance] [operator >];",+ " }")++ TS("typescript_interface_with_const",+ "[keyword const] [def hello]: {",+ " [property prop1][operator ?]: [type string];",+ " [property prop2][operator ?]: [type string];",+ "} [operator =] {};")++ TS("typescript_double_extend",+ "[keyword export] [keyword interface] [def UserAttributes] {",+ " [property id][operator ?]: [type number];",+ " [property createdAt][operator ?]: [type Date];",+ "}",+ "[keyword export] [keyword interface] [def UserInstance] [keyword extends] [type Sequelize].[type Instance][operator <][type UserAttributes][operator >], [type UserAttributes] {",+ " [property id]: [type number];",+ " [property createdAt]: [type Date];",+ "}");++ TS("typescript_index_signature",+ "[keyword interface] [def A] {",+ " [[ [variable prop]: [type string] ]]: [type any];",+ " [property prop1]: [type any];",+ "}");++ TS("typescript_generic_class",+ "[keyword class] [def Foo][operator <][type T][operator >] {",+ " [property bar]() {}",+ " [property foo](): [type Foo] {}",+ "}")++ TS("typescript_type_when_keyword",+ "[keyword export] [keyword type] [type AB] [operator =] [type A] [operator |] [type B];",+ "[keyword type] [type Flags] [operator =] {",+ " [property p1]: [type string];",+ " [property p2]: [type boolean];",+ "};")++ TS("typescript_type_when_not_keyword",+ "[keyword class] [def HasType] {",+ " [property type]: [type string];",+ " [property constructor]([def type]: [type string]) {",+ " [keyword this].[property type] [operator =] [variable-2 type];",+ " }",+ " [property setType]({ [def type] }: { [property type]: [type string]; }) {",+ " [keyword this].[property type] [operator =] [variable-2 type];",+ " }",+ "}")++ TS("typescript_function_generics",+ "[keyword function] [def a]() {}",+ "[keyword function] [def b][operator <][type IA] [keyword extends] [type object], [type IB] [keyword extends] [type object][operator >]() {}",+ "[keyword function] [def c]() {}")++ TS("typescript_complex_return_type",+ "[keyword function] [def A]() {",+ " [keyword return] [keyword this].[property property];",+ "}",+ "[keyword function] [def B](): [type Promise][operator <]{ [[ [variable key]: [type string] ]]: [type any] } [operator |] [atom null][operator >] {",+ " [keyword return] [keyword this].[property property];",+ "}")++ TS("typescript_complex_type_casting",+ "[keyword const] [def giftpay] [operator =] [variable config].[property get]([string 'giftpay']) [keyword as] { [[ [variable platformUuid]: [type string] ]]: { [property version]: [type number]; [property apiCode]: [type string]; } };")++ TS("typescript_keyof",+ "[keyword function] [def x][operator <][type T] [keyword extends] [keyword keyof] [type X][operator >]([def a]: [type T]) {",+ " [keyword return]")++ TS("typescript_new_typeargs",+ "[keyword let] [def x] [operator =] [keyword new] [variable Map][operator <][type string], [type Date][operator >]([string-2 `foo${][variable bar][string-2 }`])")++ TS("modifiers",+ "[keyword class] [def Foo] {",+ " [keyword public] [keyword abstract] [property bar]() {}",+ " [property constructor]([keyword readonly] [keyword private] [def x]) {}",+ "}")++ TS("arrow prop",+ "({[property a]: [def p] [operator =>] [variable-2 p]})")++ TS("generic in function call",+ "[keyword this].[property a][operator <][type Type][operator >]([variable foo]);",+ "[keyword this].[property a][operator <][variable Type][operator >][variable foo];")++ TS("type guard",+ "[keyword class] [def Appler] {",+ " [keyword static] [property assertApple]([def fruit]: [type Fruit]): [variable-2 fruit] [keyword is] [type Apple] {",+ " [keyword if] ([operator !]([variable-2 fruit] [keyword instanceof] [variable Apple]))",+ " [keyword throw] [keyword new] [variable Error]();",+ " }",+ "}")++ TS("type as variable",+ "[variable type] [operator =] [variable x] [keyword as] [type Bar];");++ TS("enum body",+ "[keyword export] [keyword const] [keyword enum] [def CodeInspectionResultType] {",+ " [def ERROR] [operator =] [string 'problem_type_error'],",+ " [def WARNING] [operator =] [string 'problem_type_warning'],",+ " [def META],",+ "}")++ TS("parenthesized type",+ "[keyword class] [def Foo] {",+ " [property x] [operator =] [keyword new] [variable A][operator <][type B], [type string][operator |](() [operator =>] [type void])[operator >]();",+ " [keyword private] [property bar]();",+ "}")++ TS("abstract class",+ "[keyword export] [keyword abstract] [keyword class] [def Foo] {}")++ TS("interface without semicolons",+ "[keyword interface] [def Foo] {",+ " [property greet]([def x]: [type int]): [type blah]",+ " [property bar]: [type void]",+ "}")++ var jsonld_mode = CodeMirror.getMode(+ {indentUnit: 2},+ {name: "javascript", jsonld: true}+ );+ function LD(name) {+ test.mode(name, jsonld_mode, Array.prototype.slice.call(arguments, 1));+ }++ LD("json_ld_keywords",+ '{',+ ' [meta "@context"]: {',+ ' [meta "@base"]: [string "http://example.com"],',+ ' [meta "@vocab"]: [string "http://xmlns.com/foaf/0.1/"],',+ ' [property "likesFlavor"]: {',+ ' [meta "@container"]: [meta "@list"]',+ ' [meta "@reverse"]: [string "@beFavoriteOf"]',+ ' },',+ ' [property "nick"]: { [meta "@container"]: [meta "@set"] },',+ ' [property "nick"]: { [meta "@container"]: [meta "@index"] }',+ ' },',+ ' [meta "@graph"]: [[ {',+ ' [meta "@id"]: [string "http://dbpedia.org/resource/John_Lennon"],',+ ' [property "name"]: [string "John Lennon"],',+ ' [property "modified"]: {',+ ' [meta "@value"]: [string "2010-05-29T14:17:39+02:00"],',+ ' [meta "@type"]: [string "http://www.w3.org/2001/XMLSchema#dateTime"]',+ ' }',+ ' } ]]',+ '}');++ LD("json_ld_fake",+ '{',+ ' [property "@fake"]: [string "@fake"],',+ ' [property "@contextual"]: [string "@identifier"],',+ ' [property "[email protected]"]: [string "@graphical"],',+ ' [property "@ID"]: [string "@@ID"]',+ '}');+})();diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/typescript.html b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/typescript.htmlnew file mode 100644index 000000000..d0bc3aeee--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/javascript/typescript.html@@ -0,0 +1,62 @@+<!doctype html>++<title>CodeMirror: TypeScript mode</title>+<meta charset="utf-8"/>+<link rel=stylesheet href="../../doc/docs.css">++<link rel="stylesheet" href="../../lib/codemirror.css">+<script src="../../lib/codemirror.js"></script>+<script src="../../addon/edit/matchbrackets.js"></script>+<script src="javascript.js"></script>+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>+<div id=nav>+ <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>++ <ul>+ <li><a href="../../index.html">Home</a>+ <li><a href="../../doc/manual.html">Manual</a>+ <li><a href="https://github.com/codemirror/codemirror5">Code</a>+ </ul>+ <ul>+ <li><a href="../index.html">Language modes</a>+ <li><a class=active href="#">TypeScript</a>+ </ul>+</div>++<article>+<h2>TypeScript mode</h2>+++<div><textarea id="code" name="code">+class Greeter {+ greeting: string;+ constructor (message: string) {+ this.greeting = message;+ }+ greet() {+ return "Hello, " + this.greeting;+ }+}++var greeter = new Greeter("world");++var button = document.createElement('button')+button.innerText = "Say Hello"+button.onclick = function() {+ alert(greeter.greet())+}++document.body.appendChild(button)++</textarea></div>++ <script>+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {+ lineNumbers: true,+ matchBrackets: true,+ mode: "text/typescript"+ });+ </script>++ <p>This is a specialization of the <a href="index.html">JavaScript mode</a>.</p>+ </article>diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/index.html b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/index.htmlnew file mode 100644index 000000000..c0f5e84a9--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/index.html@@ -0,0 +1,61 @@+<!doctype html>++<title>CodeMirror: XML mode</title>+<meta charset="utf-8"/>+<link rel=stylesheet href="../../doc/docs.css">++<link rel="stylesheet" href="../../lib/codemirror.css">+<script src="../../lib/codemirror.js"></script>+<script src="xml.js"></script>+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>+<div id=nav>+ <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>++ <ul>+ <li><a href="../../index.html">Home</a>+ <li><a href="../../doc/manual.html">Manual</a>+ <li><a href="https://github.com/codemirror/codemirror5">Code</a>+ </ul>+ <ul>+ <li><a href="../index.html">Language modes</a>+ <li><a class=active href="#">XML</a>+ </ul>+</div>++<article>+<h2>XML mode</h2>+<form><textarea id="code" name="code">+<html style="color: green">+ <!-- this is a comment -->+ <head>+ <title>HTML Example</title>+ </head>+ <body>+ The indentation tries to be <em>somewhat &quot;do what+ I mean&quot;</em>... but might not match your style.+ </body>+</html>+</textarea></form>+ <script>+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {+ mode: "text/html",+ lineNumbers: true+ });+ </script>+ <p>The XML mode supports these configuration parameters:</p>+ <dl>+ <dt><code>htmlMode (boolean)</code></dt>+ <dd>This switches the mode to parse HTML instead of XML. This+ means attributes do not have to be quoted, and some elements+ (such as <code>br</code>) do not require a closing tag.</dd>+ <dt><code>matchClosing (boolean)</code></dt>+ <dd>Controls whether the mode checks that close tags match the+ corresponding opening tag, and highlights mismatches as errors.+ Defaults to true.</dd>+ <dt><code>alignCDATA (boolean)</code></dt>+ <dd>Setting this to true will force the opening tag of CDATA+ blocks to not be indented.</dd>+ </dl>++ <p><strong>MIME types defined:</strong> <code>application/xml</code>, <code>text/html</code>.</p>+ </article>diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/test.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/test.jsnew file mode 100644index 000000000..ab376116f--- /dev/null+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/test.js@@ -0,0 +1,51 @@+// CodeMirror, copyright (c) by Marijn Haverbeke and others+// Distributed under an MIT license: https://codemirror.net/5/LICENSE++(function() {+ var mode = CodeMirror.getMode({indentUnit: 2}, "xml"), mname = "xml";+ function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), mname); }++ MT("matching",+ "[tag&bracket <][tag top][tag&bracket >]",+ " text",+ " [tag&bracket <][tag inner][tag&bracket />]",+ "[tag&bracket </][tag top][tag&bracket >]");++ MT("nonmatching",+ "[tag&bracket <][tag top][tag&bracket >]",+ " [tag&bracket <][tag inner][tag&bracket />]",+ " [tag&bracket </][tag&error tip][tag&bracket&error >]");++ MT("doctype",+ "[meta <!doctype foobar>]",+ "[tag&bracket <][tag top][tag&bracket />]");++ MT("cdata",+ "[tag&bracket <][tag top][tag&bracket >]",+ " [atom <![CDATA[foo]",+ "[atom barbazguh]]]]>]",+ "[tag&bracket </][tag top][tag&bracket >]");++ // HTML tests+ mode = CodeMirror.getMode({indentUnit: 2}, "text/html");++ MT("selfclose",+ "[tag&bracket <][tag html][tag&bracket >]",+ " [tag&bracket <][tag link] [attribute rel]=[string stylesheet] [attribute href]=[string \"/foobar\"][tag&bracket >]",+ "[tag&bracket </][tag html][tag&bracket >]");++ MT("list",+ "[tag&bracket <][tag ol][tag&bracket >]",+ " [tag&bracket <][tag li][tag&bracket >]one",+ " [tag&bracket <][tag li][tag&bracket >]two",+ "[tag&bracket </][tag ol][tag&bracket >]");++ MT("valueless",+ "[tag&bracket <][tag input] [attribute type]=[string checkbox] [attribute checked][tag&bracket />]");++ MT("pThenArticle",+ "[tag&bracket <][tag p][tag&bracket >]",+ " foo",+ "[tag&bracket <][tag article][tag&bracket >]bar");++})();diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/xml.js b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/xml.jsindex b67bf850b..701e151ab 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/xml.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/codemirror/mode/xml/xml.js@@ -1,5 +1,5 @@// CodeMirror, copyright (c) by Marijn Haverbeke and others-// Distributed under an MIT license: https://codemirror.net/LICENSE+// Distributed under an MIT license: https://codemirror.net/5/LICENSE(function(mod) {if (typeof exports == "object" && typeof module == "object") // CommonJS@@ -187,9 +187,13 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {};}+ function lower(tagName) {+ return tagName && tagName.toLowerCase();+ }+function Context(state, tagName, startOfLine) {this.prev = state.context;- this.tagName = tagName;+ this.tagName = tagName || "";this.indent = state.indented;this.startOfLine = startOfLine;if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))@@ -205,8 +209,8 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {return;}parentTagName = state.context.tagName;- if (!config.contextGrabbers.hasOwnProperty(parentTagName) ||- !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {+ if (!config.contextGrabbers.hasOwnProperty(lower(parentTagName)) ||+ !config.contextGrabbers[lower(parentTagName)].hasOwnProperty(lower(nextTagName))) {return;}popContext(state);@@ -240,7 +244,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {if (type == "word") {var tagName = stream.current();if (state.context && state.context.tagName != tagName &&- config.implicitlyClosed.hasOwnProperty(state.context.tagName))+ config.implicitlyClosed.hasOwnProperty(lower(state.context.tagName)))popContext(state);if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) {setStyle = "tag";@@ -279,7 +283,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {var tagName = state.tagName, tagStart = state.tagStart;state.tagName = state.tagStart = null;if (type == "selfcloseTag" ||- config.autoSelfClosers.hasOwnProperty(tagName)) {+ config.autoSelfClosers.hasOwnProperty(lower(tagName))) {maybePopContext(state, tagName);} else {maybePopContext(state, tagName);@@ -359,7 +363,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {if (context.tagName == tagAfter[2]) {context = context.prev;break;- } else if (config.implicitlyClosed.hasOwnProperty(context.tagName)) {+ } else if (config.implicitlyClosed.hasOwnProperty(lower(context.tagName))) {context = context.prev;} else {break;@@ -367,8 +371,8 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {}} else if (tagAfter) { // Opening tag spottedwhile (context) {- var grabbers = config.contextGrabbers[context.tagName];- if (grabbers && grabbers.hasOwnProperty(tagAfter[2]))+ var grabbers = config.contextGrabbers[lower(context.tagName)];+ if (grabbers && grabbers.hasOwnProperty(lower(tagAfter[2])))context = context.prev;elsebreak;@@ -390,6 +394,17 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {skipAttribute: function(state) {if (state.state == attrValueState)state.state = attrState+ },++ xmlCurrentTag: function(state) {+ return state.tagName ? {name: state.tagName, close: state.type == "closeTag"} : null+ },++ xmlCurrentContext: function(state) {+ var context = []+ for (var cx = state.context; cx; cx = cx.prev)+ context.push(cx.tagName)+ return context.reverse()}};});