@hpcc-js/codemirror 2.58.0 → 2.59.1

package/dist/index.js

@@ -1,12 +1,12 @@
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@hpcc-js/common')) :
     typeof define === 'function' && define.amd ? define(['exports', '@hpcc-js/common'], factory) :
-    (global = global || self, factory(global['@hpcc-js/codemirror'] = {}, global['@hpcc-js/common']));
-}(this, (function (exports, common) { 'use strict';
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@hpcc-js/codemirror"] = {}, global["@hpcc-js/common"]));
+})(this, (function (exports, common) { 'use strict';
 
     var PKG_NAME = "@hpcc-js/codemirror";
-    var PKG_VERSION = "2.58.0";
-    var BUILD_VERSION = "2.101.0";
+    var PKG_VERSION = "2.59.1";
+    var BUILD_VERSION = "2.102.4";
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -52,21 +52,11 @@
 
     var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-    function createCommonjsModule(fn, basedir, module) {
-    	return module = {
-    	  path: basedir,
-    	  exports: {},
-    	  require: function (path, base) {
-          return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);
-        }
-    	}, fn(module, module.exports), module.exports;
-    }
+    var css = {exports: {}};
 
-    function commonjsRequire () {
-    	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');
-    }
+    var codemirror = {exports: {}};
 
-    var codemirror = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
@@ -77,7 +67,7 @@
     // at http://marijnhaverbeke.nl/blog/#cm-internals .
 
     (function (global, factory) {
-       module.exports = factory() ;
+      module.exports = factory() ;
     }(commonjsGlobal, (function () {
       // Kludges for bugs and behavior differences that can't be feature
       // detected are enabled based on userAgent etc sniffing.
@@ -2651,9 +2641,11 @@
       }
 
       function widgetTopHeight(lineObj) {
+        var ref = visualLine(lineObj);
+        var widgets = ref.widgets;
         var height = 0;
-        if (lineObj.widgets) { for (var i = 0; i < lineObj.widgets.length; ++i) { if (lineObj.widgets[i].above)
-          { height += widgetHeight(lineObj.widgets[i]); } } }
+        if (widgets) { for (var i = 0; i < widgets.length; ++i) { if (widgets[i].above)
+          { height += widgetHeight(widgets[i]); } } }
         return height
       }
 
@@ -5853,7 +5845,7 @@
       };
 
       LineWidget.prototype.changed = function () {
-          var this$1 = this;
+          var this$1$1 = this;
 
         var oldH = this.height, cm = this.doc.cm, line = this.line;
         this.height = null;
@@ -5864,7 +5856,7 @@
           runInOp(cm, function () {
             cm.curOp.forceUpdate = true;
             adjustScrollWhenAboveVisible(cm, line, diff);
-            signalLater(cm, "lineWidgetChanged", cm, this$1, lineNo(line));
+            signalLater(cm, "lineWidgetChanged", cm, this$1$1, lineNo(line));
           });
         }
       };
@@ -5989,7 +5981,7 @@
       // Signals that the marker's widget changed, and surrounding layout
       // should be recomputed.
       TextMarker.prototype.changed = function () {
-          var this$1 = this;
+          var this$1$1 = this;
 
         var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
         if (!pos || !cm) { return }
@@ -6008,7 +6000,7 @@
             if (dHeight)
               { updateLineHeight(line, line.height + dHeight); }
           }
-          signalLater(cm, "markerChanged", cm, this$1);
+          signalLater(cm, "markerChanged", cm, this$1$1);
         });
       };
 
@@ -6353,10 +6345,10 @@
           return {undo: done, redo: undone}
         },
         clearHistory: function() {
-          var this$1 = this;
+          var this$1$1 = this;
 
           this.history = new History(this.history);
-          linkedDocs(this, function (doc) { return doc.history = this$1.history; }, true);
+          linkedDocs(this, function (doc) { return doc.history = this$1$1.history; }, true);
         },
 
         markClean: function() {
@@ -6391,11 +6383,11 @@
         }),
 
         clearGutter: docMethodOp(function(gutterID) {
-          var this$1 = this;
+          var this$1$1 = this;
 
           this.iter(function (line) {
             if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
-              changeLine(this$1, line, "gutter", function () {
+              changeLine(this$1$1, line, "gutter", function () {
                 line.gutterMarkers[gutterID] = null;
                 if (isEmpty(line.gutterMarkers)) { line.gutterMarkers = null; }
                 return true
@@ -7947,7 +7939,7 @@
       // that user code is usually dealing with.
 
       function CodeMirror(place, options) {
-        var this$1 = this;
+        var this$1$1 = this;
 
         if (!(this instanceof CodeMirror)) { return new CodeMirror(place, options) }
 
@@ -7988,7 +7980,7 @@
 
         // Override magic textarea content restore that IE sometimes does
         // on our hidden textarea on reload
-        if (ie && ie_version < 11) { setTimeout(function () { return this$1.display.input.reset(true); }, 20); }
+        if (ie && ie_version < 11) { setTimeout(function () { return this$1$1.display.input.reset(true); }, 20); }
 
         registerEventHandlers(this);
         ensureGlobalHandlers();
@@ -7999,7 +7991,7 @@
 
         if ((options.autofocus && !mobile) || this.hasFocus())
           { setTimeout(function () {
-            if (this$1.hasFocus() && !this$1.state.focused) { onFocus(this$1); }
+            if (this$1$1.hasFocus() && !this$1$1.state.focused) { onFocus(this$1$1); }
           }, 20); }
         else
           { onBlur(this); }
@@ -8580,11 +8572,11 @@
           },
 
           moveH: methodOp(function(dir, unit) {
-            var this$1 = this;
+            var this$1$1 = this;
 
             this.extendSelectionsBy(function (range) {
-              if (this$1.display.shift || this$1.doc.extend || range.empty())
-                { return findPosH(this$1.doc, range.head, dir, unit, this$1.options.rtlMoveVisually) }
+              if (this$1$1.display.shift || this$1$1.doc.extend || range.empty())
+                { return findPosH(this$1$1.doc, range.head, dir, unit, this$1$1.options.rtlMoveVisually) }
               else
                 { return dir < 0 ? range.from() : range.to() }
             }, sel_move);
@@ -8616,19 +8608,19 @@
           },
 
           moveV: methodOp(function(dir, unit) {
-            var this$1 = this;
+            var this$1$1 = this;
 
             var doc = this.doc, goals = [];
             var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected();
             doc.extendSelectionsBy(function (range) {
               if (collapse)
                 { return dir < 0 ? range.from() : range.to() }
-              var headPos = cursorCoords(this$1, range.head, "div");
+              var headPos = cursorCoords(this$1$1, range.head, "div");
               if (range.goalColumn != null) { headPos.left = range.goalColumn; }
               goals.push(headPos.left);
-              var pos = findPosV(this$1, headPos, dir, unit);
+              var pos = findPosV(this$1$1, headPos, dir, unit);
               if (unit == "page" && range == doc.sel.primary())
-                { addToScrollTop(this$1, charCoords(this$1, pos, "div").top - headPos.top); }
+                { addToScrollTop(this$1$1, charCoords(this$1$1, pos, "div").top - headPos.top); }
               return pos
             }, sel_move);
             if (goals.length) { for (var i = 0; i < doc.sel.ranges.length; i++)
@@ -8694,7 +8686,7 @@
           }),
 
           setSize: methodOp(function(width, height) {
-            var this$1 = this;
+            var this$1$1 = this;
 
             var interpret = function (val) { return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; };
             if (width != null) { this.display.wrapper.style.width = interpret(width); }
@@ -8703,7 +8695,7 @@
             var lineNo = this.display.viewFrom;
             this.doc.iter(lineNo, this.display.viewTo, function (line) {
               if (line.widgets) { for (var i = 0; i < line.widgets.length; i++)
-                { if (line.widgets[i].noHScroll) { regLineChange(this$1, lineNo, "widget"); break } } }
+                { if (line.widgets[i].noHScroll) { regLineChange(this$1$1, lineNo, "widget"); break } } }
               ++lineNo;
             });
             this.curOp.forceUpdate = true;
@@ -8872,7 +8864,7 @@
       };
 
       ContentEditableInput.prototype.init = function (display) {
-          var this$1 = this;
+          var this$1$1 = this;
 
         var input = this, cm = input.cm;
         var div = input.div = display.lineDiv;
@@ -8890,26 +8882,26 @@
         on(div, "paste", function (e) {
           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); }
+          if (ie_version <= 11) { setTimeout(operation(cm, function () { return this$1$1.updateFromDOM(); }), 20); }
         });
 
         on(div, "compositionstart", function (e) {
-          this$1.composing = {data: e.data, done: false};
+          this$1$1.composing = {data: e.data, done: false};
         });
         on(div, "compositionupdate", function (e) {
-          if (!this$1.composing) { this$1.composing = {data: e.data, done: false}; }
+          if (!this$1$1.composing) { this$1$1.composing = {data: e.data, done: false}; }
         });
         on(div, "compositionend", function (e) {
-          if (this$1.composing) {
-            if (e.data != this$1.composing.data) { this$1.readFromDOMSoon(); }
-            this$1.composing.done = true;
+          if (this$1$1.composing) {
+            if (e.data != this$1$1.composing.data) { this$1$1.readFromDOMSoon(); }
+            this$1$1.composing.done = true;
           }
         });
 
         on(div, "touchstart", function () { return input.forceCompositionEnd(); });
 
         on(div, "input", function () {
-          if (!this$1.composing) { this$1.readFromDOMSoon(); }
+          if (!this$1$1.composing) { this$1$1.readFromDOMSoon(); }
         });
 
         function onCopyCut(e) {
@@ -9032,13 +9024,13 @@
       };
 
       ContentEditableInput.prototype.startGracePeriod = function () {
-          var this$1 = this;
+          var this$1$1 = this;
 
         clearTimeout(this.gracePeriod);
         this.gracePeriod = setTimeout(function () {
-          this$1.gracePeriod = false;
-          if (this$1.selectionChanged())
-            { this$1.cm.operation(function () { return this$1.cm.curOp.selectionChanged = true; }); }
+          this$1$1.gracePeriod = false;
+          if (this$1$1.selectionChanged())
+            { this$1$1.cm.operation(function () { return this$1$1.cm.curOp.selectionChanged = true; }); }
         }, 20);
       };
 
@@ -9073,11 +9065,11 @@
       ContentEditableInput.prototype.supportsTouch = function () { return true };
 
       ContentEditableInput.prototype.receivedFocus = function () {
-          var this$1 = this;
+          var this$1$1 = this;
 
         var input = this;
         if (this.selectionInEditor())
-          { setTimeout(function () { return this$1.pollSelection(); }, 20); }
+          { setTimeout(function () { return this$1$1.pollSelection(); }, 20); }
         else
           { runInOp(this.cm, function () { return input.cm.curOp.selectionChanged = true; }); }
 
@@ -9207,24 +9199,24 @@
         this.div.focus();
       };
       ContentEditableInput.prototype.readFromDOMSoon = function () {
-          var this$1 = this;
+          var this$1$1 = this;
 
         if (this.readDOMTimeout != null) { return }
         this.readDOMTimeout = setTimeout(function () {
-          this$1.readDOMTimeout = null;
-          if (this$1.composing) {
-            if (this$1.composing.done) { this$1.composing = null; }
+          this$1$1.readDOMTimeout = null;
+          if (this$1$1.composing) {
+            if (this$1$1.composing.done) { this$1$1.composing = null; }
             else { return }
           }
-          this$1.updateFromDOM();
+          this$1$1.updateFromDOM();
         }, 80);
       };
 
       ContentEditableInput.prototype.updateFromDOM = function () {
-          var this$1 = this;
+          var this$1$1 = this;
 
         if (this.cm.isReadOnly() || !this.pollContent())
-          { runInOp(this.cm, function () { return regChange(this$1.cm); }); }
+          { runInOp(this.cm, function () { return regChange(this$1$1.cm); }); }
       };
 
       ContentEditableInput.prototype.setUneditable = function (node) {
@@ -9417,7 +9409,7 @@
       };
 
       TextareaInput.prototype.init = function (display) {
-          var this$1 = this;
+          var this$1$1 = this;
 
         var input = this, cm = this.cm;
         this.createField(display);
@@ -9429,7 +9421,7 @@
         if (ios) { te.style.width = "0px"; }
 
         on(te, "input", function () {
-          if (ie && ie_version >= 9 && this$1.hasSelection) { this$1.hasSelection = null; }
+          if (ie && ie_version >= 9 && this$1$1.hasSelection) { this$1$1.hasSelection = null; }
           input.poll();
         });
 
@@ -9582,12 +9574,12 @@
       // Poll for input changes, using the normal rate of polling. This
       // runs as long as the editor is focused.
       TextareaInput.prototype.slowPoll = function () {
-          var this$1 = this;
+          var this$1$1 = this;
 
         if (this.pollingFast) { return }
         this.polling.set(this.cm.options.pollInterval, function () {
-          this$1.poll();
-          if (this$1.cm.state.focused) { this$1.slowPoll(); }
+          this$1$1.poll();
+          if (this$1$1.cm.state.focused) { this$1$1.slowPoll(); }
         });
       };
 
@@ -9612,7 +9604,7 @@
       // seen text (can be empty), which is stored in prevInput (we must
       // not reset the textarea when typing, because that breaks IME).
       TextareaInput.prototype.poll = function () {
-          var this$1 = this;
+          var this$1$1 = this;
 
         var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
         // Since this is called a *lot*, try to bail out as cheaply as
@@ -9647,15 +9639,15 @@
 
         runInOp(cm, function () {
           applyTextInput(cm, text.slice(same), prevInput.length - same,
-                         null, this$1.composing ? "*compose" : null);
+                         null, this$1$1.composing ? "*compose" : null);
 
           // Don't leave long text in the textarea, since it makes further polling slow
-          if (text.length > 1000 || text.indexOf("\n") > -1) { input.value = this$1.prevInput = ""; }
-          else { this$1.prevInput = text; }
+          if (text.length > 1000 || text.indexOf("\n") > -1) { input.value = this$1$1.prevInput = ""; }
+          else { this$1$1.prevInput = text; }
 
-          if (this$1.composing) {
-            this$1.composing.range.clear();
-            this$1.composing.range = cm.markText(this$1.composing.start, cm.getCursor("to"),
+          if (this$1$1.composing) {
+            this$1$1.composing.range.clear();
+            this$1$1.composing.range = cm.markText(this$1$1.composing.start, cm.getCursor("to"),
                                                {className: "CodeMirror-composing"});
           }
         });
@@ -9906,19 +9898,21 @@
 
       addLegacyProps(CodeMirror);
 
-      CodeMirror.version = "5.65.0";
+      CodeMirror.version = "5.65.2";
 
       return CodeMirror;
 
     })));
-    });
+    }(codemirror));
 
-    var css = createCommonjsModule(function (module, exports) {
+    var CodeMirror = codemirror.exports;
+
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
     CodeMirror.defineMode("css", function(config, parserConfig) {
@@ -10547,7 +10541,7 @@
         "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",
+        "compact", "condensed", "conic-gradient", "contain", "content", "contents",
         "content-box", "context-menu", "continuous", "contrast", "copy", "counter", "counters", "cover", "crop",
         "cross", "crosshair", "cubic-bezier", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
         "decimal-leading-zero", "default", "default-button", "dense", "destination-atop",
@@ -10597,8 +10591,8 @@
         "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
         "progress", "push-button", "radial-gradient", "radio", "read-only",
         "read-write", "read-write-plaintext-only", "rectangle", "region",
-        "relative", "repeat", "repeating-linear-gradient",
-        "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
+        "relative", "repeat", "repeating-linear-gradient", "repeating-radial-gradient",
+        "repeating-conic-gradient", "repeat-x", "repeat-y", "reset", "reverse",
         "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
         "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
         "s-resize", "sans-serif", "saturate", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
@@ -10774,14 +10768,14 @@
       });
 
     });
-    });
+    }());
 
-    var ecl = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
     CodeMirror.defineMode("ecl", function(config) {
@@ -10977,14 +10971,18 @@
     CodeMirror.defineMIME("text/x-ecl", "ecl");
 
     });
-    });
+    }());
+
+    var markdown = {exports: {}};
 
-    var xml = createCommonjsModule(function (module, exports) {
+    var xml = {exports: {}};
+
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
     var htmlConfig = {
@@ -11391,14 +11389,16 @@
       CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
 
     });
-    });
+    }());
 
-    var meta = createCommonjsModule(function (module, exports) {
+    var meta = {exports: {}};
+
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
       CodeMirror.modeInfo = [
@@ -11609,14 +11609,14 @@
         }
       };
     });
-    });
+    }());
 
-    var markdown = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror, xml, meta);
+      mod(codemirror.exports, xml.exports, meta.exports);
     })(function(CodeMirror) {
 
     CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
@@ -12492,9 +12492,11 @@
     CodeMirror.defineMIME("text/x-markdown", "markdown");
 
     });
-    });
+    }());
+
+    var overlay = {exports: {}};
 
-    var overlay = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
@@ -12508,7 +12510,7 @@
     // combined.
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
     CodeMirror.overlayMode = function(base, overlay, combine) {
@@ -12579,14 +12581,14 @@
     };
 
     });
-    });
+    }());
 
-    var gfm = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror, markdown, overlay);
+      mod(codemirror.exports, markdown.exports, overlay.exports);
     })(function(CodeMirror) {
 
     var urlRE = /^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i;
@@ -12705,14 +12707,16 @@
 
       CodeMirror.defineMIME("text/x-gfm", "gfm");
     });
-    });
+    }());
 
-    var javascript = createCommonjsModule(function (module, exports) {
+    var javascript = {exports: {}};
+
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
     CodeMirror.defineMode("javascript", function(config, parserConfig) {
@@ -13034,6 +13038,7 @@
         cx.state.context = new Context(cx.state.context, cx.state.localVars, true);
         cx.state.localVars = null;
       }
+      pushcontext.lex = pushblockcontext.lex = true;
       function popcontext() {
         cx.state.localVars = cx.state.context.vars;
         cx.state.context = cx.state.context.prev;
@@ -13660,14 +13665,14 @@
     CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
 
     });
-    });
+    }());
 
-    var htmlmixed = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror, xml, javascript, css);
+      mod(codemirror.exports, xml.exports, javascript.exports, css.exports);
     })(function(CodeMirror) {
 
       var defaultTags = {
@@ -13709,7 +13714,7 @@
       }
 
       function getTagRegexp(tagName, anchored) {
-        return new RegExp((anchored ? "^" : "") + "<\/\s*" + tagName + "\s*>", "i");
+        return new RegExp((anchored ? "^" : "") + "<\/\\s*" + tagName + "\\s*>", "i");
       }
 
       function addTags(from, to) {
@@ -13809,10 +13814,10 @@
 
       CodeMirror.defineMIME("text/html", "htmlmixed");
     });
-    });
+    }());
 
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
-    codemirror.defineMode("dot", function (config) {
+    CodeMirror.defineMode("dot", function (config) {
         var ops = /--|->|=|;/;
         var brackets = /[\[\]{}]/;
         return {
@@ -13907,22 +13912,22 @@
             blockCommentEnd: "*/"
         };
     });
-    codemirror.defineMIME("text/x-dot", "dot");
+    CodeMirror.defineMIME("text/x-dot", "dot");
 
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
-    codemirror.defineMode("markdown", function (cmCfg, modeCfg) {
-        var htmlMode = codemirror.getMode(cmCfg, "text/html");
+    CodeMirror.defineMode("markdown", function (cmCfg, modeCfg) {
+        var htmlMode = CodeMirror.getMode(cmCfg, "text/html");
         var htmlModeMissing = htmlMode.name == "null";
         if (modeCfg.defaultMode === undefined)
             modeCfg.defaultMode = "";
         function getMode(name) {
             name = name === "" ? modeCfg.defaultMode : name;
-            if (codemirror.findModeByName) {
-                var found = codemirror.findModeByName(name);
+            if (CodeMirror.findModeByName) {
+                var found = CodeMirror.findModeByName(name);
                 if (found)
                     name = found.mime || found.mimes[0];
             }
-            var mode = codemirror.getMode(cmCfg, name);
+            var mode = CodeMirror.getMode(cmCfg, name);
             return mode.name == "null" ? null : mode;
         }
         // Should characters that affect highlighting be highlighted separate?
@@ -14007,7 +14012,7 @@
             if (state.f == htmlBlock) {
                 var exit = htmlModeMissing;
                 if (!exit) {
-                    var inner = codemirror.innerMode(htmlMode, state.htmlState);
+                    var inner = CodeMirror.innerMode(htmlMode, state.htmlState);
                     exit = inner.mode.name == "xml" && inner.state.tagStart === null &&
                         (!inner.state.context && inner.state.tokenize.isInText);
                 }
@@ -14115,7 +14120,7 @@
                 // try switching mode
                 state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2]);
                 if (state.localMode)
-                    state.localState = codemirror.startState(state.localMode);
+                    state.localState = CodeMirror.startState(state.localMode);
                 state.f = state.block = local;
                 if (modeCfg.highlightFormatting)
                     state.formatting = "code-block";
@@ -14161,7 +14166,7 @@
         function htmlBlock(stream, state) {
             var style = htmlMode.token(stream, state.htmlState);
             if (!htmlModeMissing) {
-                var inner = codemirror.innerMode(htmlMode, state.htmlState);
+                var inner = CodeMirror.innerMode(htmlMode, state.htmlState);
                 if ((inner.mode.name == "xml" && inner.state.tagStart === null &&
                     (!inner.state.context && inner.state.tokenize.isInText)) ||
                     (state.md_inside && stream.current().indexOf(">") > -1)) {
@@ -14448,7 +14453,7 @@
                         state.md_inside = true;
                 }
                 stream.backUp(1);
-                state.htmlState = codemirror.startState(htmlMode);
+                state.htmlState = CodeMirror.startState(htmlMode);
                 return switchBlock(stream, state, htmlBlock);
             }
             if (modeCfg.xml && ch === '<' && stream.match(/^\/\w*?>/)) {
@@ -14677,10 +14682,10 @@
                     prevLine: s.prevLine,
                     thisLine: s.thisLine,
                     block: s.block,
-                    htmlState: s.htmlState && codemirror.copyState(htmlMode, s.htmlState),
+                    htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),
                     indentation: s.indentation,
                     localMode: s.localMode,
-                    localState: s.localMode ? codemirror.copyState(s.localMode, s.localState) : null,
+                    localState: s.localMode ? CodeMirror.copyState(s.localMode, s.localState) : null,
                     inline: s.inline,
                     text: s.text,
                     formatting: false,
@@ -14748,7 +14753,7 @@
                     return htmlMode.indent(state.htmlState, textAfter, line);
                 if (state.localState && state.localMode.indent)
                     return state.localMode.indent(state.localState, textAfter, line);
-                return codemirror.Pass;
+                return CodeMirror.Pass;
             },
             blankLine: blankLine,
             getType: getType,
@@ -14759,10 +14764,10 @@
         };
         return mode;
     }, "xml");
-    codemirror.defineMIME("text/markdown", "markdown");
-    codemirror.defineMIME("text/x-markdown", "markdown");
+    CodeMirror.defineMIME("text/markdown", "markdown");
+    CodeMirror.defineMIME("text/x-markdown", "markdown");
 
-    function styleInject(css, ref) {
+    function styleInject$1(css, ref) {
       if ( ref === void 0 ) ref = {};
       var insertAt = ref.insertAt;
 
@@ -14789,69 +14794,78 @@
       }
     }
 
-    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 css_248z$2 = ".CodeMirror{color:#000;direction:ltr;font-family:monospace;height:300px}.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{background-color:#f7f7f7;border-right:1px solid #ddd;white-space:nowrap}.CodeMirror-linenumber{color:#999;min-width:20px;padding:0 3px 0 5px;text-align:right;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{background:#7e7;border:0!important;width:auto}.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{bottom:0;left:0;overflow:hidden;position:absolute;right:0;top:-50px}.CodeMirror-ruler{border-left:1px solid #ccc;bottom:0;position:absolute;top:0}.cm-s-default .cm-header{color:blue}.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{background:#fff;overflow:hidden;position:relative}.CodeMirror-scroll{height:100%;margin-bottom:-50px;margin-right:-50px;outline:none;overflow:scroll!important;padding-bottom:50px;position:relative;z-index:0}.CodeMirror-sizer{border-right:50px solid transparent;position:relative}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{display:none;outline:none;position:absolute;z-index:6}.CodeMirror-vscrollbar{overflow-x:hidden;overflow-y:scroll;right:0;top:0}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-x:scroll;overflow-y:hidden}.CodeMirror-scrollbar-filler{bottom:0;right:0}.CodeMirror-gutter-filler{bottom:0;left:0}.CodeMirror-gutters{left:0;min-height:100%;position:absolute;top:0;z-index:3}.CodeMirror-gutter{display:inline-block;height:100%;margin-bottom:-50px;vertical-align:top;white-space:normal}.CodeMirror-gutter-wrapper{background:none!important;border:none!important;position:absolute;z-index:4}.CodeMirror-gutter-background{bottom:0;position:absolute;top:0;z-index:4}.CodeMirror-gutter-elt{cursor:default;position:absolute;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{word-wrap:normal;-webkit-tap-highlight-color:transparent;background:transparent;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;color:inherit;font-family:inherit;font-size:inherit;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual;line-height:inherit;margin:0;overflow:visible;position:relative;white-space:pre;z-index:2}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{bottom:0;left:0;position:absolute;right:0;top:0;z-index:0}.CodeMirror-linewidget{padding:.1px;position:relative;z-index:2}.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{height:0;overflow:hidden;position:absolute;visibility:hidden;width:100%}.CodeMirror-cursor{pointer-events:none;position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{position:relative;visibility:hidden;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$1(css_248z$2);
 
-    var braceFold = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
-    CodeMirror.registerHelper("fold", "brace", function(cm, start) {
-      var line = start.line, lineText = cm.getLine(line);
-
-      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) {
-            if (pass == 1) break;
-            pass = 1;
-            at = lineText.length;
-            continue;
-          }
-          if (pass == 1 && found < start.ch) break;
-          tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
-          if (!/^(comment|string)/.test(tokenType)) return {ch: found + 1, tokenType: tokenType};
-          at = found - 1;
-        }
-      }
-
-      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; }
+    function bracketFolding(pairs) {
+      return function(cm, start) {
+        var line = start.line, lineText = cm.getLine(line);
+
+        function findOpening(pair) {
+          var tokenType;
+          for (var at = start.ch, pass = 0;;) {
+            var found = at <= 0 ? -1 : lineText.lastIndexOf(pair[0], at - 1);
+            if (found == -1) {
+              if (pass == 1) break;
+              pass = 1;
+              at = lineText.length;
+              continue;
+            }
+            if (pass == 1 && found < start.ch) break;
+            tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
+            if (!/^(comment|string)/.test(tokenType)) return {ch: found + 1, tokenType: tokenType, pair: pair};
+            at = found - 1;
+          }
+        }
+
+        function findRange(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(found.pair[0], pos), nextClose = text.indexOf(found.pair[1], 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)};
-      }
+          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 {
+        var found = [];
+        for (var i = 0; i < pairs.length; i++) {
+          var open = findOpening(pairs[i]);
+          if (open) found.push(open);
+        }
+        found.sort(function(a, b) { return a.ch - b.ch });
+        for (var i = 0; i < found.length; i++) {
+          var range = findRange(found[i]);
+          if (range) return range
+        }
         return null
       }
-    });
+    }
+
+    CodeMirror.registerHelper("fold", "brace", bracketFolding([["{", "}"], ["[", "]"]]));
+
+    CodeMirror.registerHelper("fold", "brace-paren", bracketFolding([["{", "}"], ["[", "]"], ["(", ")"]]));
 
     CodeMirror.registerHelper("fold", "import", function(cm, start) {
       function hasImport(line) {
@@ -14897,14 +14911,14 @@
     });
 
     });
-    });
+    }());
 
-    var commentFold = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
     CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
@@ -14953,14 +14967,16 @@
     });
 
     });
-    });
+    }());
 
-    var foldcode = createCommonjsModule(function (module, exports) {
+    var foldcode = {exports: {}};
+
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
       function doFold(cm, pos, options, force) {
@@ -15109,14 +15125,14 @@
         return getOption(this, options, name);
       });
     });
-    });
+    }());
 
-    var foldgutter = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror, foldcode);
+      mod(codemirror.exports, foldcode.exports);
     })(function(CodeMirror) {
 
       CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
@@ -15269,14 +15285,14 @@
           updateFoldInfo(cm, line, line + 1);
       }
     });
-    });
+    }());
 
-    var indentFold = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
     function lineIndent(cm, lineNo) {
@@ -15313,14 +15329,14 @@
     });
 
     });
-    });
+    }());
 
-    var xmlFold = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
 
       var Pos = CodeMirror.Pos;
@@ -15494,19 +15510,21 @@
         return findMatchingClose(iter, name);
       };
     });
-    });
+    }());
 
-    var css_248z$1 = ".CodeMirror-foldmarker{color:#00f;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-folded,.CodeMirror-foldgutter-open{cursor:pointer}.CodeMirror-foldgutter-open:after{content:\"\\25BE\"}.CodeMirror-foldgutter-folded:after{content:\"\\25B8\"}";
-    styleInject(css_248z$1);
+    var css_248z$1$1 = ".CodeMirror-foldmarker{color:blue;cursor:pointer;font-family:arial;line-height:.3;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-folded,.CodeMirror-foldgutter-open{cursor:pointer}.CodeMirror-foldgutter-open:after{content:\"\\25BE\"}.CodeMirror-foldgutter-folded:after{content:\"\\25B8\"}";
+    styleInject$1(css_248z$1$1);
 
-    var dialog = createCommonjsModule(function (module, exports) {
+    var dialog = {exports: {}};
+
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     // Open simple dialogs on top of an editor. Relies on dialog.css.
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
       function dialogDiv(cm, template, bottom) {
         var wrap = cm.getWrapperElement();
@@ -15658,16 +15676,16 @@
         return close;
       });
     });
-    });
+    }());
 
-    var jumpToLine = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     // Defines jumpToLine command. Uses dialog.js if present.
 
     (function(mod) {
-      mod(codemirror, dialog);
+      mod(codemirror.exports, dialog.exports);
     })(function(CodeMirror) {
 
       // default search panel location
@@ -15708,14 +15726,16 @@
 
       CodeMirror.keyMap["default"]["Alt-G"] = "jumpToLine";
     });
-    });
+    }());
+
+    var searchcursor = {exports: {}};
 
-    var searchcursor = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
     (function(mod) {
-      mod(codemirror);
+      mod(codemirror.exports);
     })(function(CodeMirror) {
       var Pos = CodeMirror.Pos;
 
@@ -16010,9 +16030,9 @@
           this.setSelections(ranges, 0);
       });
     });
-    });
+    }());
 
-    var search = createCommonjsModule(function (module, exports) {
+    (function (module, exports) {
     // CodeMirror, copyright (c) by Marijn Haverbeke and others
     // Distributed under an MIT license: https://codemirror.net/LICENSE
 
@@ -16025,7 +16045,7 @@
     // Ctrl-G.
 
     (function(mod) {
-      mod(codemirror, searchcursor, dialog);
+      mod(codemirror.exports, searchcursor.exports, dialog.exports);
     })(function(CodeMirror) {
 
       // default search panel location
@@ -16299,12 +16319,12 @@
       CodeMirror.commands.replace = replace;
       CodeMirror.commands.replaceAll = function(cm) {replace(cm, true);};
     });
-    });
+    }());
 
-    var css_248z$2 = ".CodeMirror-dialog{position:absolute;left:0;right:0;background:inherit;z-index:15;padding:.1em .8em;overflow:hidden;color:inherit}.CodeMirror-dialog-top{border-bottom:1px solid #eee;top:0}.CodeMirror-dialog-bottom{border-top:1px solid #eee;bottom:0}.CodeMirror-dialog input{border:none;outline:none;background:transparent;width:20em;color:inherit;font-family:monospace}.CodeMirror-dialog button{font-size:70%}";
-    styleInject(css_248z$2);
+    var css_248z$3 = ".CodeMirror-dialog{background:inherit;color:inherit;left:0;overflow:hidden;padding:.1em .8em;position:absolute;right:0;z-index:15}.CodeMirror-dialog-top{border-bottom:1px solid #eee;top:0}.CodeMirror-dialog-bottom{border-top:1px solid #eee;bottom:0}.CodeMirror-dialog input{background:transparent;border:none;color:inherit;font-family:monospace;outline:none;width:20em}.CodeMirror-dialog button{font-size:70%}";
+    styleInject$1(css_248z$3);
 
-    function styleInject$1(css, ref) {
+    function styleInject(css, ref) {
       if ( ref === void 0 ) ref = {};
       var insertAt = ref.insertAt;
 
@@ -16331,8 +16351,8 @@
       }
     }
 
-    var css_248z$3 = ".codemirror_Editor{border:1px solid #d3d3d3}.codemirror_Editor .cm-marked-text{background-color:#ff0}.codemirror_Editor .cm-marked-error,.codemirror_Editor .cm-marked-info,.codemirror_Editor .cm-marked-warning{display:inline-block;position:relative;background-position:0 100%;background-repeat:repeat-x}.codemirror_Editor .cm-marked-info{background-image:url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAHElEQVQYV2NkgIP//xkYGBkZIXwIB0SDCQgHAgDEXAgCKU2DPwAAAABJRU5ErkJggg==\")}.codemirror_Editor .cm-marked-error{background-image:url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAHUlEQVQYV2NkgIL/DAz/GRkYGBlBfBgHTMM4MJUAzFoIAuwf4BEAAAAASUVORK5CYII=\")}.codemirror_Editor .cm-marked-warning{background-image:url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAHUlEQVQYV2NkgIL/Sxn+M0YzMDKC+DAOmIZxYCoBKQkLp8ga+UwAAAAASUVORK5CYII=\")}";
-    styleInject$1(css_248z$3);
+    var css_248z$1 = ".codemirror_Editor{border:1px solid #d3d3d3}.codemirror_Editor .cm-marked-text{background-color:#ff0}.codemirror_Editor .cm-marked-error,.codemirror_Editor .cm-marked-info,.codemirror_Editor .cm-marked-warning{background-position:0 100%;background-repeat:repeat-x;display:inline-block;position:relative}.codemirror_Editor .cm-marked-info{background-image:url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAHElEQVQYV2NkgIP//xkYGBkZIXwIB0SDCQgHAgDEXAgCKU2DPwAAAABJRU5ErkJggg==\")}.codemirror_Editor .cm-marked-error{background-image:url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAHUlEQVQYV2NkgIL/DAz/GRkYGBlBfBgHTMM4MJUAzFoIAuwf4BEAAAAASUVORK5CYII=\")}.codemirror_Editor .cm-marked-warning{background-image:url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAHUlEQVQYV2NkgIL/Sxn+M0YzMDKC+DAOmIZxYCoBKQkLp8ga+UwAAAAASUVORK5CYII=\")}";
+    styleInject(css_248z$1);
 
     var Editor = /** @class */ (function (_super) {
         __extends(Editor, _super);
@@ -16355,7 +16375,7 @@
             if (this.gutterMarkerWidth() > 0) {
                 gutters.unshift({
                     className: "CodeMirror-guttermarker",
-                    style: "width:" + this.gutterMarkerWidth() + "px;"
+                    style: "width:".concat(this.gutterMarkerWidth(), "px;")
                 });
             }
             return gutters;
@@ -16467,7 +16487,7 @@
         Editor.prototype.enter = function (domNode, element) {
             var _this = this;
             _super.prototype.enter.call(this, domNode, element);
-            this._codemirror = codemirror.fromTextArea(element.append("textarea").node(), this.options());
+            this._codemirror = CodeMirror.fromTextArea(element.append("textarea").node(), this.options());
             this._codemirror.on("changes", function (cm, changes) {
                 _this.changes(changes);
             });
@@ -16529,8 +16549,8 @@
     }(Editor));
     DOTEditor.prototype._class += " codemirror_JSEditor";
 
-    var css_248z$4 = ".codemirror_ECLEditor .cm-s-default span.cm-comment{color:green}.codemirror_ECLEditor .cm-s-default span.cm-keyword{color:#00f}.codemirror_ECLEditor .cm-s-default span.cm-variable{font-weight:700;color:navy}.codemirror_ECLEditor .cm-s-default span.cm-variable-2,.codemirror_ECLEditor .cm-s-default span.cm-variable-3{color:maroon}.codemirror_ECLEditor .cm-s-default span.cm-builtin{color:purple}.codemirror_ECLEditor .cm-s-default span.cm-string{color:grey}.cm-s-default span.cm-atom,.codemirror_ECLEditor .cm-s-default span.cm-number{color:#000}.codemirror_ECLEditor .cm-s-default span.cm-meta{color:#004080}.codemirror_ECLEditor .ErrorLine{background:#c00!important;color:#fff!important}.codemirror_ECLEditor .WarningLine{background:#ff9!important}.codemirror_ECLEditor .highlightline{background:#e8f2ff!important}";
-    styleInject$1(css_248z$4);
+    var css_248z = ".codemirror_ECLEditor .cm-s-default span.cm-comment{color:green}.codemirror_ECLEditor .cm-s-default span.cm-keyword{color:#00f}.codemirror_ECLEditor .cm-s-default span.cm-variable{color:navy;font-weight:700}.codemirror_ECLEditor .cm-s-default span.cm-variable-2,.codemirror_ECLEditor .cm-s-default span.cm-variable-3{color:maroon}.codemirror_ECLEditor .cm-s-default span.cm-builtin{color:purple}.codemirror_ECLEditor .cm-s-default span.cm-string{color:grey}.cm-s-default span.cm-atom,.codemirror_ECLEditor .cm-s-default span.cm-number{color:#000}.codemirror_ECLEditor .cm-s-default span.cm-meta{color:#004080}.codemirror_ECLEditor .ErrorLine{background:#c00!important;color:#fff!important}.codemirror_ECLEditor .WarningLine{background:#ff9!important}.codemirror_ECLEditor .highlightline{background:#e8f2ff!important}";
+    styleInject(css_248z);
 
     var ECLEditor = /** @class */ (function (_super) {
         __extends(ECLEditor, _super);
@@ -16671,5 +16691,5 @@
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
 //# sourceMappingURL=index.js.map