@hpcc-js/codemirror 2.50.0 → 2.54.0

package/dist/index.js

@@ -5,8 +5,8 @@
 }(this, (function (exports, common) { 'use strict';
 
     var PKG_NAME = "@hpcc-js/codemirror";
-    var PKG_VERSION = "2.50.0";
-    var BUILD_VERSION = "2.87.0";
+    var PKG_VERSION = "2.54.0";
+    var BUILD_VERSION = "2.95.0";
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -98,7 +98,7 @@
       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);
@@ -270,7 +270,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'.
@@ -551,14 +551,15 @@
               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;
+              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)); }
+                  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; }
               }
@@ -1266,7 +1267,7 @@
           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]))
+          else if (!(new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)")).test(output[prop]))
             { output[prop] += " " + lineClass[2]; }
         } }
         return type
@@ -1376,6 +1377,7 @@
           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) {
@@ -1384,9 +1386,16 @@
           { if (spans[i] != span) { (r || (r = [])).push(spans[i]); } }
         return r
       }
+
       // Add a span to a line.
-      function addMarkedSpan(line, span) {
-        line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
+      function addMarkedSpan(line, span, op) {
+        var inThisOp = op && window.WeakSet && (op.markedSpans || (op.markedSpans = new WeakSet));
+        if (inThisOp && 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);
       }
 
@@ -1906,7 +1915,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; }
@@ -2251,6 +2260,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)
@@ -2407,12 +2417,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
@@ -3025,7 +3037,7 @@
         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 > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
           var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
@@ -3206,13 +3218,19 @@
         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 = doc.sel.ranges[i];
           if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) { continue }
           var collapsed = range.empty();
-          if (collapsed || cm.options.showCursorWhenSelecting)
-            { drawSelectionCursor(cm, range.head, curFragment); }
+          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, selFragment); }
         }
@@ -3228,6 +3246,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 text
           var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
@@ -3341,26 +3365,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) {
@@ -3395,10 +3424,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;
@@ -3413,6 +3446,7 @@
           }
           var diff = cur.line.height - height;
           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++)
@@ -3427,6 +3461,7 @@
             }
           }
         }
+        if (Math.abs(mustScroll) > 2) { display.scroller.scrollTop += mustScroll; }
       }
 
       // Read and store the height of line widgets associated with the
@@ -3490,8 +3525,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;
@@ -3542,14 +3577,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
@@ -3616,7 +3652,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);
@@ -3626,7 +3662,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);
@@ -3686,6 +3722,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";
         }
@@ -3841,7 +3878,8 @@
           scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
           scrollToPos: null,       // Used to scroll to a specific position
           focus: false,
-          id: ++nextOpId           // Unique ID
+          id: ++nextOpId,          // Unique ID
+          markArrays: null         // Used by addMarkedSpan
         };
         pushOperation(cm.curOp);
       }
@@ -4115,7 +4153,8 @@
       function restoreSelection(snapshot) {
         if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) { return }
         snapshot.activeElt.focus();
-        if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+        if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
+            snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
           var sel = window.getSelection(), range = document.createRange();
           range.setEnd(snapshot.anchorNode, snapshot.anchorOffset);
           range.collapse(false);
@@ -4213,6 +4252,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);
@@ -4291,6 +4332,8 @@
       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) {
@@ -4430,6 +4473,10 @@
         // 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; }
@@ -4527,6 +4574,12 @@
 
       function onScrollWheel(cm, e) {
         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
@@ -4555,10 +4608,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
@@ -4571,15 +4624,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;
@@ -4838,6 +4891,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);
@@ -4854,19 +4908,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
         // event
         this.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
@@ -5171,7 +5225,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); }
       }
 
@@ -5828,7 +5882,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;
@@ -6014,7 +6068,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
@@ -6186,6 +6240,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())
         },
 
@@ -6237,7 +6292,7 @@
           var out = [];
           for (var i = 0; i < ranges.length; i++)
             { out[i] = new Range(clipPos(this, ranges[i].anchor),
-                               clipPos(this, ranges[i].head)); }
+                               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);
         }),
@@ -6297,7 +6352,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);
@@ -6316,7 +6376,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);
         },
@@ -6548,28 +6608,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) {
@@ -6591,7 +6662,7 @@
               cm.display.input.focus();
             }
           }
-          catch(e){}
+          catch(e$1){}
         }
       }
 
@@ -6687,7 +6758,7 @@
         46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
         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"
       };
 
@@ -6724,10 +6795,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",
@@ -6822,7 +6892,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
       }
@@ -6879,6 +6949,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];
@@ -7047,7 +7118,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"); },
@@ -7133,7 +7204,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)
         }
@@ -7236,6 +7307,7 @@
       var lastStoppedKey = null;
       function onKeyDown(e) {
         var cm = this;
+        if (e.target && e.target != cm.display.input.getField()) { return }
         cm.curOp.focus = activeElt();
         if (signalDOMEvent(cm, e)) { return }
         // IE does strange things with escape.
@@ -7279,6 +7351,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}
@@ -7418,6 +7491,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);
@@ -7427,8 +7504,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(); }
           }
@@ -7441,15 +7518,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) {
@@ -7462,6 +7539,7 @@
 
       // Normal selection, as opposed to text dragging.
       function leftButtonSelect(cm, event, start, behavior) {
+        if (ie) { delayBlurEvent(cm); }
         var display = cm.display, doc = cm.doc;
         e_preventDefault(event);
 
@@ -7640,7 +7718,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); }
@@ -7740,7 +7818,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\ufff9-\ufffc]/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(); }
         });
@@ -7804,6 +7882,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);
@@ -7914,7 +7998,9 @@
         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); }
 
@@ -7956,6 +8042,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 happens
         var touchFinished, prevTouch = {end: 0};
@@ -8151,7 +8240,7 @@
               { 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); }
           }
           var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i$1 % multiPaste.length] : textLines,
@@ -8220,7 +8309,7 @@
       }
 
       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
@@ -8632,7 +8721,7 @@
             clearCaches(this);
             scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop);
             updateGutterSpace(this.display);
-            if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
+            if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5 || this.options.lineWrapping)
               { estimateLineHeights(this); }
             signal(this, "refresh", this);
           }),
@@ -8674,34 +8763,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 {
@@ -8710,7 +8808,7 @@
           return true
         }
 
-        if (unit == "char") {
+        if (unit == "char" || unit == "codepoint") {
           moveOnce();
         } else if (unit == "column") {
           moveOnce(true);
@@ -8778,10 +8876,19 @@
 
         var input = this, cm = input.cm;
         var div = input.div = display.lineDiv;
+        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 way
           if (ie_version <= 11) { setTimeout(operation(cm, function () { return this$1.updateFromDOM(); }), 20); }
         });
@@ -8806,7 +8913,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"); }
@@ -8836,7 +8943,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();
           selectInput(te);
           setTimeout(function () {
             cm.display.lineSpace.removeChild(kludge);
@@ -8848,9 +8955,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;
         return result
       };
 
@@ -8946,7 +9062,7 @@
 
       ContentEditableInput.prototype.focus = function () {
         if (this.cm.options.readOnly != "nocursor") {
-          if (!this.selectionInEditor())
+          if (!this.selectionInEditor() || activeElt() != this.div)
             { this.showSelection(this.prepareSelection(), true); }
           this.div.focus();
         }
@@ -8957,9 +9073,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; }); }
 
@@ -9388,6 +9506,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 cursor
         var cm = this.cm, display = cm.display, doc = cm.doc;
@@ -9628,6 +9755,7 @@
       TextareaInput.prototype.readOnlyChanged = function (val) {
         if (!val) { this.reset(); }
         this.textarea.disabled = val == "nocursor";
+        this.textarea.readOnly = !!val;
       };
 
       TextareaInput.prototype.setUneditable = function () {};
@@ -9778,7 +9906,7 @@
 
       addLegacyProps(CodeMirror);
 
-      CodeMirror.version = "5.50.2";
+      CodeMirror.version = "5.65.0";
 
       return CodeMirror;
 
@@ -9811,7 +9939,8 @@
           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; }
@@ -9859,8 +9988,8 @@
           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");
@@ -9889,7 +10018,7 @@
 
       function tokenParenthesized(stream, state) {
         stream.next(); // Must be '('
-        if (!stream.match(/\s*[\"\')]/, false))
+        if (!stream.match(/^\s*[\"\')]/, false))
           state.tokenize = tokenString(")");
         else
           state.tokenize = null;
@@ -9979,7 +10108,7 @@
             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";
@@ -10073,7 +10202,7 @@
           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))
@@ -10224,117 +10353,151 @@
         "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", "backface-visibility",
-        "background", "background-attachment", "background-blend-mode", "background-clip",
-        "background-color", "background-image", "background-origin", "background-position",
-        "background-repeat", "background-size", "baseline-shift", "binding",
-        "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
-        "bookmark-target", "border", "border-bottom", "border-bottom-color",
-        "border-bottom-left-radius", "border-bottom-right-radius",
-        "border-bottom-style", "border-bottom-width", "border-collapse",
-        "border-color", "border-image", "border-image-outset",
+        "animation-timing-function", "appearance", "azimuth", "backdrop-filter",
+        "backface-visibility", "background", "background-attachment",
+        "background-blend-mode", "background-clip", "background-color",
+        "background-image", "background-origin", "background-position",
+        "background-position-x", "background-position-y", "background-repeat",
+        "background-size", "baseline-shift", "binding", "bleed", "block-size",
+        "bookmark-label", "bookmark-level", "bookmark-state", "bookmark-target",
+        "border", "border-bottom", "border-bottom-color", "border-bottom-left-radius",
+        "border-bottom-right-radius", "border-bottom-style", "border-bottom-width",
+        "border-collapse", "border-color", "border-image", "border-image-outset",
         "border-image-repeat", "border-image-slice", "border-image-source",
-        "border-image-width", "border-left", "border-left-color",
-        "border-left-style", "border-left-width", "border-radius", "border-right",
-        "border-right-color", "border-right-style", "border-right-width",
-        "border-spacing", "border-style", "border-top", "border-top-color",
-        "border-top-left-radius", "border-top-right-radius", "border-top-style",
-        "border-top-width", "border-width", "bottom", "box-decoration-break",
-        "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
-        "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count",
-        "column-fill", "column-gap", "column-rule", "column-rule-color",
-        "column-rule-style", "column-rule-width", "column-span", "column-width",
-        "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
-        "cue-after", "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", "flex", "flex-basis",
-        "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-        "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
-        "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust",
-        "font-stretch", "font-style", "font-synthesis", "font-variant",
-        "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
-        "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
-        "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow",
-        "grid-auto-rows", "grid-column", "grid-column-end", "grid-column-gap",
-        "grid-column-start", "grid-gap", "grid-row", "grid-row-end", "grid-row-gap",
-        "grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
-        "grid-template-rows", "hanging-punctuation", "height", "hyphens",
-        "icon", "image-orientation", "image-rendering", "image-resolution",
-        "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing",
-        "line-break", "line-height", "line-stacking", "line-stacking-ruby",
+        "border-image-width", "border-left", "border-left-color", "border-left-style",
+        "border-left-width", "border-radius", "border-right", "border-right-color",
+        "border-right-style", "border-right-width", "border-spacing", "border-style",
+        "border-top", "border-top-color", "border-top-left-radius",
+        "border-top-right-radius", "border-top-style", "border-top-width",
+        "border-width", "bottom", "box-decoration-break", "box-shadow", "box-sizing",
+        "break-after", "break-before", "break-inside", "caption-side", "caret-color",
+        "clear", "clip", "color", "color-profile", "column-count", "column-fill",
+        "column-gap", "column-rule", "column-rule-color", "column-rule-style",
+        "column-rule-width", "column-span", "column-width", "columns", "contain",
+        "content", "counter-increment", "counter-reset", "crop", "cue", "cue-after",
+        "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-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",
+        "font-language-override", "font-optical-sizing", "font-size",
+        "font-size-adjust", "font-stretch", "font-style", "font-synthesis",
+        "font-variant", "font-variant-alternates", "font-variant-caps",
+        "font-variant-east-asian", "font-variant-ligatures", "font-variant-numeric",
+        "font-variant-position", "font-variation-settings", "font-weight", "gap",
+        "grid", "grid-area", "grid-auto-columns", "grid-auto-flow", "grid-auto-rows",
+        "grid-column", "grid-column-end", "grid-column-gap", "grid-column-start",
+        "grid-gap", "grid-row", "grid-row-end", "grid-row-gap", "grid-row-start",
+        "grid-template", "grid-template-areas", "grid-template-columns",
+        "grid-template-rows", "hanging-punctuation", "height", "hyphens", "icon",
+        "image-orientation", "image-rendering", "image-resolution", "inline-box-align",
+        "inset", "inset-block", "inset-block-end", "inset-block-start", "inset-inline",
+        "inset-inline-end", "inset-inline-start", "isolation", "justify-content",
+        "justify-items", "justify-self", "left", "letter-spacing", "line-break",
+        "line-height", "line-height-step", "line-stacking", "line-stacking-ruby",
         "line-stacking-shift", "line-stacking-strategy", "list-style",
         "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-height",
-        "max-width", "min-height", "min-width", "mix-blend-mode", "move-to", "nav-down", "nav-index",
-        "nav-left", "nav-right", "nav-up", "object-fit", "object-position",
-        "opacity", "order", "orphans", "outline",
-        "outline-color", "outline-offset", "outline-style", "outline-width",
-        "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
-        "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
-        "page", "page-break-after", "page-break-before", "page-break-inside",
-        "page-policy", "pause", "pause-after", "pause-before", "perspective",
-        "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position",
-        "presentation-level", "punctuation-trim", "quotes", "region-break-after",
-        "region-break-before", "region-break-inside", "region-fragment",
-        "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
-        "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
-        "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin",
-        "shape-outside", "size", "speak", "speak-as", "speak-header",
-        "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
-        "tab-size", "table-layout", "target", "target-name", "target-new",
-        "target-position", "text-align", "text-align-last", "text-decoration",
+        "margin-bottom", "margin-left", "margin-right", "margin-top", "marks",
+        "marquee-direction", "marquee-loop", "marquee-play-count", "marquee-speed",
+        "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",
+        "offset-distance", "offset-path", "offset-position", "offset-rotate",
+        "opacity", "order", "orphans", "outline", "outline-color", "outline-offset",
+        "outline-style", "outline-width", "overflow", "overflow-style",
+        "overflow-wrap", "overflow-x", "overflow-y", "padding", "padding-bottom",
+        "padding-left", "padding-right", "padding-top", "page", "page-break-after",
+        "page-break-before", "page-break-inside", "page-policy", "pause",
+        "pause-after", "pause-before", "perspective", "perspective-origin", "pitch",
+        "pitch-range", "place-content", "place-items", "place-self", "play-during",
+        "position", "presentation-level", "punctuation-trim", "quotes",
+        "region-break-after", "region-break-before", "region-break-inside",
+        "region-fragment", "rendering-intent", "resize", "rest", "rest-after",
+        "rest-before", "richness", "right", "rotate", "rotation", "rotation-point",
+        "row-gap", "ruby-align", "ruby-overhang", "ruby-position", "ruby-span",
+        "scale", "scroll-behavior", "scroll-margin", "scroll-margin-block",
+        "scroll-margin-block-end", "scroll-margin-block-start", "scroll-margin-bottom",
+        "scroll-margin-inline", "scroll-margin-inline-end",
+        "scroll-margin-inline-start", "scroll-margin-left", "scroll-margin-right",
+        "scroll-margin-top", "scroll-padding", "scroll-padding-block",
+        "scroll-padding-block-end", "scroll-padding-block-start",
+        "scroll-padding-bottom", "scroll-padding-inline", "scroll-padding-inline-end",
+        "scroll-padding-inline-start", "scroll-padding-left", "scroll-padding-right",
+        "scroll-padding-top", "scroll-snap-align", "scroll-snap-type",
+        "shape-image-threshold", "shape-inside", "shape-margin", "shape-outside",
+        "size", "speak", "speak-as", "speak-header", "speak-numeral",
+        "speak-punctuation", "speech-rate", "stress", "string-set", "tab-size",
+        "table-layout", "target", "target-name", "target-new", "target-position",
+        "text-align", "text-align-last", "text-combine-upright", "text-decoration",
         "text-decoration-color", "text-decoration-line", "text-decoration-skip",
-        "text-decoration-style", "text-emphasis", "text-emphasis-color",
-        "text-emphasis-position", "text-emphasis-style", "text-height",
-        "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
-        "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
-        "text-wrap", "top", "transform", "transform-origin", "transform-style",
-        "transition", "transition-delay", "transition-duration",
-        "transition-property", "transition-timing-function", "unicode-bidi",
-        "user-select", "vertical-align", "visibility", "voice-balance", "voice-duration",
-        "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
-        "voice-volume", "volume", "white-space", "widows", "width", "will-change", "word-break",
-        "word-spacing", "word-wrap", "z-index",
+        "text-decoration-skip-ink", "text-decoration-style", "text-emphasis",
+        "text-emphasis-color", "text-emphasis-position", "text-emphasis-style",
+        "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", "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",
+        "voice-duration", "voice-family", "voice-pitch", "voice-range", "voice-rate",
+        "voice-stress", "voice-volume", "volume", "white-space", "widows", "width",
+        "will-change", "word-break", "word-spacing", "word-wrap", "writing-mode", "z-index",
         // SVG-specific
         "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
         "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_ = [
+        "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",
+        "border-inline", "border-inline-color", "border-inline-end",
+        "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", "content-visibility", "margin-block",
+        "margin-block-end", "margin-block-start", "margin-inline", "margin-inline-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",
         "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
-        "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
-        "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
-        "searchfield-results-decoration", "zoom"
+        "scrollbar-track-color", "searchfield-cancel-button", "searchfield-decoration",
+        "searchfield-results-button", "searchfield-results-decoration", "shape-inside", "zoom"
       ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
 
       var fontProperties_ = [
-        "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
-        "font-stretch", "font-weight", "font-style"
+        "font-display", "font-family", "src", "unicode-range", "font-variant",
+         "font-feature-settings", "font-stretch", "font-weight", "font-style"
       ], fontProperties = keySet(fontProperties_);
 
       var counterDescriptors_ = [
@@ -10347,16 +10510,16 @@
         "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",
@@ -10366,7 +10529,7 @@
         "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_);
@@ -10376,22 +10539,22 @@
         "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", "button-bevel",
         "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",
+        "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",
@@ -10400,11 +10563,11 @@
         "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",
@@ -10415,7 +10578,7 @@
         "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",
+        "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "manipulation", "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",
@@ -10424,13 +10587,13 @@
         "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",
+        "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",
@@ -10438,18 +10601,18 @@
         "repeating-radial-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",
@@ -10459,10 +10622,10 @@
         "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"
@@ -10530,7 +10693,7 @@
             }
           },
           ":": function(stream) {
-            if (stream.match(/\s*\{/, false))
+            if (stream.match(/^\s*\{/, false))
               return [null, null]
             return false;
           },
@@ -11000,9 +11163,13 @@
         };
       }
 
+      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))
@@ -11018,8 +11185,8 @@
             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);
@@ -11053,7 +11220,7 @@
         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";
@@ -11092,7 +11259,7 @@
           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);
@@ -11172,7 +11339,7 @@
               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;
@@ -11180,8 +11347,8 @@
             }
           } else if (tagAfter) { // Opening tag spotted
             while (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;
               else
                 break;
@@ -11212,7 +11379,7 @@
         xmlCurrentContext: function(state) {
           var context = [];
           for (var cx = state.context; cx; cx = cx.prev)
-            if (cx.tagName) context.push(cx.tagName);
+            context.push(cx.tagName);
           return context.reverse()
         }
       };
@@ -11242,12 +11409,12 @@
         {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
         {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
         {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
-        {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
+        {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy", "cbl"]},
         {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp", "cs"]},
         {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
         {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
         {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
-        {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
+        {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists\.txt$/},
         {name: "CoffeeScript", mimes: ["application/vnd.coffeescript", "text/coffeescript", "text/x-coffeescript"], mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
         {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
         {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
@@ -11267,7 +11434,7 @@
         {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
         {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
         {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
-        {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
+        {name: "Embedded JavaScript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
         {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
         {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
         {name: "Esper", mime: "text/x-esper", mode: "sql"},
@@ -11278,7 +11445,7 @@
         {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
         {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
         {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
-        {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
+        {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history)\.md$/i},
         {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
         {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"], file: /^Jenkinsfile$/},
         {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
@@ -11299,7 +11466,7 @@
         {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
         {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
         {name: "Jinja2", mime: "text/jinja2", mode: "jinja2", ext: ["j2", "jinja", "jinja2"]},
-        {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
+        {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"], alias: ["jl"]},
         {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
         {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
         {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
@@ -11367,7 +11534,7 @@
         {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v", "sv", "svh"]},
         {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
         {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
-        {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
+        {name: "TiddlyWiki", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
         {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
         {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
         {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
@@ -11392,7 +11559,8 @@
         {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
         {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
         {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
-        {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
+        {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]},
+        {name: "WebAssembly", mime: "text/webassembly", mode: "wast", ext: ["wat", "wast"]},
       ];
       // Ensure all modes have a mime property for backwards compatibility
       for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
@@ -11488,6 +11656,9 @@
       if (modeCfg.fencedCodeBlockHighlighting === undefined)
         modeCfg.fencedCodeBlockHighlighting = true;
 
+      if (modeCfg.fencedCodeBlockDefaultMode === undefined)
+        modeCfg.fencedCodeBlockDefaultMode = 'text/plain';
+
       if (modeCfg.xml === undefined)
         modeCfg.xml = true;
 
@@ -11527,9 +11698,9 @@
       ,   listRE = /^(?:[*\-+]|^[0-9]+([.)]))\s+/
       ,   taskListRE = /^\[(x| )\](?=\s)/i // Must follow listRE
       ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
-      ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
+      ,   setextHeaderRE = /^ {0,3}(?:\={1,}|-{2,})\s*$/
       ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
-      ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/
+      ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w\/+#-]*)[^\n`]*$/
       ,   linkDefRE = /^\s*\[[^\]]+?\]:.*$/ // naive link-definition
       ,   punctuation = /[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E42\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDF3C-\uDF3E]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]/
       ,   expandedTab = "    "; // CommonMark specifies tab as 4 spaces
@@ -11660,7 +11831,7 @@
 
           // Add this list item's content's indentation to the stack
           state.listStack.push(state.indentation);
-          // Reset inline styles which shouldn't propagate aross list items
+          // Reset inline styles which shouldn't propagate across list items
           state.em = false;
           state.strong = false;
           state.code = false;
@@ -11676,7 +11847,7 @@
           state.quote = 0;
           state.fencedEndRE = new RegExp(match[1] + "+ *$");
           // try switching mode
-          state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2]);
+          state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2] || modeCfg.fencedCodeBlockDefaultMode );
           if (state.localMode) state.localState = CodeMirror.startState(state.localMode);
           state.f = state.block = local;
           if (modeCfg.highlightFormatting) state.formatting = "code-block";
@@ -12049,7 +12220,7 @@
               return getType(state);
             }
           } else if (ch === ' ') {
-            if (stream.match(/^~~/, true)) { // Probably surrounded by space
+            if (stream.match('~~', true)) { // Probably surrounded by space
               if (stream.peek() === ' ') { // Surrounded by spaces, ignore
                 return getType(state);
               } else { // Not surrounded by spaces, back up pointer
@@ -12148,7 +12319,7 @@
       }
 
       function footnoteLinkInside(stream, state) {
-        if (stream.match(/^\]:/, true)) {
+        if (stream.match(']:', true)) {
           state.f = state.inline = footnoteUrl;
           if (modeCfg.highlightFormatting) state.formatting = "link";
           var returnType = getType(state);
@@ -12172,7 +12343,7 @@
         if (stream.peek() === undefined) { // End of line, set flag to check next line
           state.linkTitle = true;
         } else { // More content on line, check if link title
-          stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
+          stream.match(/^(?:\s+(?:"(?:[^"\\]|\\.)+"|'(?:[^'\\]|\\.)+'|\((?:[^)\\]|\\.)+\)))?/, true);
         }
         state.f = state.inline = inlineNormal;
         return tokenTypes.linkHref + " url";
@@ -12549,6 +12720,7 @@
       var statementIndent = parserConfig.statementIndent;
       var jsonldMode = parserConfig.jsonld;
       var jsonMode = parserConfig.json || jsonldMode;
+      var trackScope = parserConfig.trackScope !== false;
       var isTS = parserConfig.typescript;
       var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
 
@@ -12631,21 +12803,25 @@
         } 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);
@@ -12655,7 +12831,7 @@
               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)
@@ -12747,7 +12923,8 @@
 
       // 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;
@@ -12759,6 +12936,7 @@
       }
 
       function inScope(state, varname) {
+        if (!trackScope) return false
         for (var v = state.localVars; v; v = v.next)
           if (v.name == varname) return true;
         for (var cx = state.context; cx; cx = cx.prev) {
@@ -12805,6 +12983,7 @@
       function register(varname) {
         var state = cx.state;
         cx.marked = "def";
+        if (!trackScope) return
         if (state.context) {
           if (state.lexical.info == "var" && state.context && state.context.block) {
             // FIXME function decls are also not block scoped
@@ -12903,7 +13082,7 @@
           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)
@@ -12949,7 +13128,7 @@
       }
       function parenExpr(type) {
         if (type != "(") return pass()
-        return cont(pushlex(")"), expression, expect(")"), poplex)
+        return cont(pushlex(")"), maybeexpression, expect(")"), poplex)
       }
       function expressionInner(type, value, noComma) {
         if (cx.state.fatArrowAt == cx.stream.start) {
@@ -12969,7 +13148,6 @@
         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) {
@@ -12978,7 +13156,7 @@
       }
 
       function maybeoperatorComma(type, value) {
-        if (type == ",") return cont(expression);
+        if (type == ",") return cont(maybeexpression);
         return maybeoperatorNoComma(type, value, false);
       }
       function maybeoperatorNoComma(type, value, noComma) {
@@ -12987,7 +13165,7 @@
         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);
@@ -13007,7 +13185,7 @@
       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 == "}") {
@@ -13133,7 +13311,7 @@
         }
       }
       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)
         }
@@ -13144,13 +13322,19 @@
         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";
@@ -13163,6 +13347,20 @@
           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) {
@@ -13289,11 +13487,11 @@
         }
         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);
@@ -13304,6 +13502,7 @@
         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)
@@ -13323,6 +13522,7 @@
       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) {
@@ -13396,14 +13596,14 @@
         },
 
         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 pops
           if (!/^\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]) &&
@@ -13440,8 +13640,7 @@
         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));
         }
       };
     });
@@ -13453,9 +13652,10 @@
     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 });
 
@@ -13533,7 +13733,8 @@
           name: "xml",
           htmlMode: true,
           multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
-          multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag
+          multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag,
+          allowMissingTagName: parserConfig.allowMissingTagName,
         });
 
         var tags = {};
@@ -14588,7 +14789,7 @@
       }
     }
 
-    var css_248z = ".CodeMirror{font-family:monospace;height:300px;color:#000;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-fat-cursor-mark{background-color:rgba(20,255,20,.5)}.cm-animate-fat-cursor,.cm-fat-cursor-mark{-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;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:0;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-type,.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:none;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:none!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:none}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:\"\"}span.CodeMirror-selectedtext{background:none}";
+    var css_248z = ".CodeMirror{font-family:monospace;height:300px;color:#000;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.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{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:0;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-type,.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-50px;margin-right:-50px;padding-bottom:50px;height:100%;outline:none;position:relative}.CodeMirror-sizer{position:relative;border-right:50px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none;outline:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-50px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:none!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:none}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:\"\"}span.CodeMirror-selectedtext{background:none}";
     styleInject(css_248z);
 
     var braceFold = createCommonjsModule(function (module, exports) {
@@ -14601,9 +14802,9 @@
 
     CodeMirror.registerHelper("fold", "brace", function(cm, start) {
       var line = start.line, lineText = cm.getLine(line);
-      var tokenType;
 
       function findOpening(openCh) {
+        var tokenType;
         for (var at = start.ch, pass = 0;;) {
           var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
           if (found == -1) {
@@ -14614,37 +14815,42 @@
           }
           if (pass == 1 && found < start.ch) break;
           tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
-          if (!/^(comment|string)/.test(tokenType)) return found + 1;
+          if (!/^(comment|string)/.test(tokenType)) return {ch: found + 1, tokenType: tokenType};
           at = found - 1;
         }
       }
 
-      var startToken = "{", endToken = "}", startCh = findOpening("{");
-      if (startCh == null) {
-        startToken = "[", endToken = "]";
-        startCh = findOpening("[");
-      }
-
-      if (startCh == null) return;
-      var count = 1, lastLine = cm.lastLine(), end, endCh;
-      outer: for (var i = line; i <= lastLine; ++i) {
-        var text = cm.getLine(i), pos = i == line ? startCh : 0;
-        for (;;) {
-          var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
-          if (nextOpen < 0) nextOpen = text.length;
-          if (nextClose < 0) nextClose = text.length;
-          pos = Math.min(nextOpen, nextClose);
-          if (pos == text.length) break;
-          if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
-            if (pos == nextOpen) ++count;
-            else if (!--count) { end = i; endCh = pos; break outer; }
+      function findRange(startToken, endToken, found) {
+        var count = 1, lastLine = cm.lastLine(), end, startCh = found.ch, endCh;
+        outer: for (var i = line; i <= lastLine; ++i) {
+          var text = cm.getLine(i), pos = i == line ? startCh : 0;
+          for (;;) {
+            var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+            if (nextOpen < 0) nextOpen = text.length;
+            if (nextClose < 0) nextClose = text.length;
+            pos = Math.min(nextOpen, nextClose);
+            if (pos == text.length) break;
+            if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == found.tokenType) {
+              if (pos == nextOpen) ++count;
+              else if (!--count) { end = i; endCh = pos; break outer; }
+            }
+            ++pos;
           }
-          ++pos;
         }
+
+        if (end == null || line == end) return null
+        return {from: CodeMirror.Pos(line, startCh),
+                to: CodeMirror.Pos(end, endCh)};
+      }
+
+      var startBrace = findOpening("{"), startBracket = findOpening("[");
+      if (startBrace && (!startBracket || startBracket.ch > startBrace.ch)) {
+        return findRange("{", "}", startBrace) || (startBracket && findRange("[", "]", startBracket))
+      } else if (startBracket) {
+        return findRange("[", "]", startBracket) || (startBrace && findRange("{", "}", startBrace))
+      } else {
+        return null
       }
-      if (end == null || line == end) return;
-      return {from: CodeMirror.Pos(line, startCh),
-              to: CodeMirror.Pos(end, endCh)};
     });
 
     CodeMirror.registerHelper("fold", "import", function(cm, start) {
@@ -14770,9 +14976,11 @@
         function getRange(allowFolded) {
           var range = finder(cm, pos);
           if (!range || range.to.line - range.from.line < minSize) return null;
+          if (force === "fold") return range;
+
           var marks = cm.findMarksAt(range.from);
           for (var i = 0; i < marks.length; ++i) {
-            if (marks[i].__isFold && force !== "fold") {
+            if (marks[i].__isFold) {
               if (!allowFolded) return null;
               range.cleared = true;
               marks[i].clear();
@@ -14845,18 +15053,18 @@
         cm.foldCode(cm.getCursor(), null, "fold");
       };
       CodeMirror.commands.unfold = function(cm) {
-        cm.foldCode(cm.getCursor(), null, "unfold");
+        cm.foldCode(cm.getCursor(), { scanUp: false }, "unfold");
       };
       CodeMirror.commands.foldAll = function(cm) {
         cm.operation(function() {
           for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
-            cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
+            cm.foldCode(CodeMirror.Pos(i, 0), { scanUp: false }, "fold");
         });
       };
       CodeMirror.commands.unfoldAll = function(cm) {
         cm.operation(function() {
           for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
-            cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
+            cm.foldCode(CodeMirror.Pos(i, 0), { scanUp: false }, "unfold");
         });
       };
 
@@ -15371,7 +15579,9 @@
             if (e.keyCode == 13) callback(inp.value, e);
           });
 
-          if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);
+          if (options.closeOnBlur !== false) CodeMirror.on(dialog, "focusout", function (evt) {
+            if (evt.relatedTarget !== null) close();
+          });
         } else if (button = dialog.getElementsByTagName("button")[0]) {
           CodeMirror.on(button, "click", function() {
             close();
@@ -15460,8 +15670,11 @@
       mod(codemirror, dialog);
     })(function(CodeMirror) {
 
+      // default search panel location
+      CodeMirror.defineOption("search", {bottom: false});
+
       function dialog(cm, text, shortText, deflt, f) {
-        if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
+        if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true, bottom: cm.options.search.bottom});
         else f(prompt(shortText, deflt));
       }
 
@@ -15696,6 +15909,7 @@
 
       function SearchCursor(doc, query, pos, options) {
         this.atOccurrence = false;
+        this.afterEmptyMatch = false;
         this.doc = doc;
         pos = pos ? doc.clipPos(pos) : Pos(0, 0);
         this.pos = {from: pos, to: pos};
@@ -15731,21 +15945,29 @@
         findPrevious: function() {return this.find(true)},
 
         find: function(reverse) {
-          var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to));
-
-          // Implements weird auto-growing behavior on null-matches for
-          // backwards-compatiblity with the vim code (unfortunately)
-          while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
+          var head = this.doc.clipPos(reverse ? this.pos.from : this.pos.to);
+          if (this.afterEmptyMatch && this.atOccurrence) {
+            // do not return the same 0 width match twice
+            head = Pos(head.line, head.ch);
             if (reverse) {
-              if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1);
-              else if (result.from.line == this.doc.firstLine()) result = null;
-              else result = this.matches(reverse, this.doc.clipPos(Pos(result.from.line - 1)));
+              head.ch--;
+              if (head.ch < 0) {
+                head.line--;
+                head.ch = (this.doc.getLine(head.line) || "").length;
+              }
             } else {
-              if (result.to.ch < this.doc.getLine(result.to.line).length) result.to = Pos(result.to.line, result.to.ch + 1);
-              else if (result.to.line == this.doc.lastLine()) result = null;
-              else result = this.matches(reverse, Pos(result.to.line + 1, 0));
+              head.ch++;
+              if (head.ch > (this.doc.getLine(head.line) || "").length) {
+                head.ch = 0;
+                head.line++;
+              }
+            }
+            if (CodeMirror.cmpPos(head, this.doc.clipPos(head)) != 0) {
+               return this.atOccurrence = false
             }
           }
+          var result = this.matches(reverse, head);
+          this.afterEmptyMatch = result && CodeMirror.cmpPos(result.from, result.to) == 0;
 
           if (result) {
             this.pos = result;
@@ -15806,6 +16028,9 @@
       mod(codemirror, searchcursor, dialog);
     })(function(CodeMirror) {
 
+      // default search panel location
+      CodeMirror.defineOption("search", {bottom: false});
+
       function searchOverlay(query, caseInsensitive) {
         if (typeof query == "string")
           query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), caseInsensitive ? "gi" : "g");
@@ -15850,12 +16075,13 @@
           selectValueOnOpen: true,
           closeOnEnter: false,
           onClose: function() { clearSearch(cm); },
-          onKeyDown: onKeyDown
+          onKeyDown: onKeyDown,
+          bottom: cm.options.search.bottom
         });
       }
 
       function dialog(cm, text, shortText, deflt, f) {
-        if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
+        if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true, bottom: cm.options.search.bottom});
         else f(prompt(shortText, deflt));
       }
 
@@ -15972,18 +16198,43 @@
         if (state.annotate) { state.annotate.clear(); state.annotate = null; }
       });}
 
+      function el(tag, attrs) {
+        var element = tag ? document.createElement(tag) : document.createDocumentFragment();
+        for (var key in attrs) {
+          element[key] = attrs[key];
+        }
+        for (var i = 2; i < arguments.length; i++) {
+          var child = arguments[i];
+          element.appendChild(typeof child == "string" ? document.createTextNode(child) : child);
+        }
+        return element;
+      }
 
       function getQueryDialog(cm)  {
-        return '<span class="CodeMirror-search-label">' + cm.phrase("Search:") + '</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">' + cm.phrase("(Use /re/ syntax for regexp search)") + '</span>';
+        return el("", null,
+                  el("span", {className: "CodeMirror-search-label"}, cm.phrase("Search:")), " ",
+                  el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field"}), " ",
+                  el("span", {style: "color: #888", className: "CodeMirror-search-hint"},
+                     cm.phrase("(Use /re/ syntax for regexp search)")));
       }
       function getReplaceQueryDialog(cm) {
-        return ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">' + cm.phrase("(Use /re/ syntax for regexp search)") + '</span>';
+        return el("", null, " ",
+                  el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field"}), " ",
+                  el("span", {style: "color: #888", className: "CodeMirror-search-hint"},
+                     cm.phrase("(Use /re/ syntax for regexp search)")));
       }
       function getReplacementQueryDialog(cm) {
-        return '<span class="CodeMirror-search-label">' + cm.phrase("With:") + '</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
+        return el("", null,
+                  el("span", {className: "CodeMirror-search-label"}, cm.phrase("With:")), " ",
+                  el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field"}));
       }
       function getDoReplaceConfirm(cm) {
-        return '<span class="CodeMirror-search-label">' + cm.phrase("Replace?") + '</span> <button>' + cm.phrase("Yes") + '</button> <button>' + cm.phrase("No") + '</button> <button>' + cm.phrase("All") + '</button> <button>' + cm.phrase("Stop") + '</button> ';
+        return el("", null,
+                  el("span", {className: "CodeMirror-search-label"}, cm.phrase("Replace?")), " ",
+                  el("button", {}, cm.phrase("Yes")), " ",
+                  el("button", {}, cm.phrase("No")), " ",
+                  el("button", {}, cm.phrase("All")), " ",
+                  el("button", {}, cm.phrase("Stop")));
       }
 
       function replaceAll(cm, query, text) {
@@ -16000,8 +16251,11 @@
       function replace(cm, all) {
         if (cm.getOption("readOnly")) return;
         var query = cm.getSelection() || getSearchState(cm).lastQuery;
-        var dialogText = '<span class="CodeMirror-search-label">' + (all ? cm.phrase("Replace all:") : cm.phrase("Replace:")) + '</span>';
-        dialog(cm, dialogText + getReplaceQueryDialog(cm), dialogText, query, function(query) {
+        var dialogText = all ? cm.phrase("Replace all:") : cm.phrase("Replace:");
+        var fragment = el("", null,
+                          el("span", {className: "CodeMirror-search-label"}, dialogText),
+                          getReplaceQueryDialog(cm));
+        dialog(cm, fragment, dialogText, query, function(query) {
           if (!query) return;
           query = parseQuery(query);
           dialog(cm, getReplacementQueryDialog(cm), cm.phrase("Replace with:"), "", function(text) {