@vuu-ui/vuu-codemirror 0.8.7-debug → 0.8.8-debug

package/esm/index.js

@@ -3686,12 +3686,14 @@ function windowRect(win) {
 }
 function scrollRectIntoView(dom, rect, side, x, y, xMargin, yMargin, ltr) {
   let doc2 = dom.ownerDocument, win = doc2.defaultView || window;
-  for (let cur2 = dom; cur2; ) {
+  for (let cur2 = dom, stop = false; cur2 && !stop; ) {
     if (cur2.nodeType == 1) {
       let bounding, top2 = cur2 == doc2.body;
       if (top2) {
         bounding = windowRect(win);
       } else {
+        if (/^(fixed|sticky)$/.test(getComputedStyle(cur2).position))
+          stop = true;
         if (cur2.scrollHeight <= cur2.clientHeight && cur2.scrollWidth <= cur2.clientWidth) {
           cur2 = cur2.assignedSlot || cur2.parentNode;
           continue;
@@ -3912,7 +3914,7 @@ var ContentView = class {
   constructor() {
     this.parent = null;
     this.dom = null;
-    this.dirty = 2;
+    this.flags = 2;
   }
   get overrideDOMText() {
     return null;
@@ -3936,18 +3938,18 @@ var ContentView = class {
     return this.posBefore(view) + view.length;
   }
   sync(view, track) {
-    if (this.dirty & 2) {
+    if (this.flags & 2) {
       let parent = this.dom;
       let prev = null, next;
       for (let child of this.children) {
-        if (child.dirty) {
-          if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild) && next != view.docView.compositionNode) {
+        if (child.flags & 7) {
+          if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild)) {
             let contentView = ContentView.get(next);
             if (!contentView || !contentView.parent && contentView.canReuseDOM(child))
               child.reuseDOM(next);
           }
           child.sync(view, track);
-          child.dirty = 0;
+          child.flags &= ~7;
         }
         next = prev ? prev.nextSibling : parent.firstChild;
         if (track && !track.written && track.node == parent && next != child.dom)
@@ -3965,11 +3967,11 @@ var ContentView = class {
         track.written = true;
       while (next)
         next = rm$1(next);
-    } else if (this.dirty & 1) {
+    } else if (this.flags & 1) {
       for (let child of this.children)
-        if (child.dirty) {
+        if (child.flags & 7) {
           child.sync(view, track);
-          child.dirty = 0;
+          child.flags &= ~7;
         }
     }
   }
@@ -4037,23 +4039,23 @@ var ContentView = class {
     };
   }
   markDirty(andParent = false) {
-    this.dirty |= 2;
+    this.flags |= 2;
     this.markParentsDirty(andParent);
   }
   markParentsDirty(childList) {
     for (let parent = this.parent; parent; parent = parent.parent) {
       if (childList)
-        parent.dirty |= 2;
-      if (parent.dirty & 1)
+        parent.flags |= 2;
+      if (parent.flags & 1)
         return;
-      parent.dirty |= 1;
+      parent.flags |= 1;
       childList = false;
     }
   }
   setParent(parent) {
     if (this.parent != parent) {
       this.parent = parent;
-      if (this.dirty)
+      if (this.flags & 7)
         this.markParentsDirty(true);
     }
   }
@@ -4117,7 +4119,7 @@ var ContentView = class {
     return false;
   }
   canReuseDOM(other) {
-    return other.constructor == this.constructor;
+    return other.constructor == this.constructor && !((this.flags | other.flags) & 8);
   }
   // When this is a zero-length view with a side, this should return a
   // number <= 0 to indicate it is before its position, or a
@@ -4221,6 +4223,107 @@ function mergeChildrenInto(parent, from, to, insert2, openStart, openEnd) {
   parent.length += dLen;
   replaceRange(parent, fromI, fromOff, toI, toOff, insert2, 0, openStart, openEnd);
 }
+var LineBreakPlaceholder = "\uFFFF";
+var DOMReader = class {
+  constructor(points, state) {
+    this.points = points;
+    this.text = "";
+    this.lineSeparator = state.facet(EditorState.lineSeparator);
+  }
+  append(text) {
+    this.text += text;
+  }
+  lineBreak() {
+    this.text += LineBreakPlaceholder;
+  }
+  readRange(start, end) {
+    if (!start)
+      return this;
+    let parent = start.parentNode;
+    for (let cur2 = start; ; ) {
+      this.findPointBefore(parent, cur2);
+      let oldLen = this.text.length;
+      this.readNode(cur2);
+      let next = cur2.nextSibling;
+      if (next == end)
+        break;
+      let view = ContentView.get(cur2), nextView = ContentView.get(next);
+      if (view && nextView ? view.breakAfter : (view ? view.breakAfter : isBlockElement(cur2)) || isBlockElement(next) && (cur2.nodeName != "BR" || cur2.cmIgnore) && this.text.length > oldLen)
+        this.lineBreak();
+      cur2 = next;
+    }
+    this.findPointBefore(parent, end);
+    return this;
+  }
+  readTextNode(node) {
+    let text = node.nodeValue;
+    for (let point of this.points)
+      if (point.node == node)
+        point.pos = this.text.length + Math.min(point.offset, text.length);
+    for (let off = 0, re = this.lineSeparator ? null : /\r\n?|\n/g; ; ) {
+      let nextBreak = -1, breakSize = 1, m;
+      if (this.lineSeparator) {
+        nextBreak = text.indexOf(this.lineSeparator, off);
+        breakSize = this.lineSeparator.length;
+      } else if (m = re.exec(text)) {
+        nextBreak = m.index;
+        breakSize = m[0].length;
+      }
+      this.append(text.slice(off, nextBreak < 0 ? text.length : nextBreak));
+      if (nextBreak < 0)
+        break;
+      this.lineBreak();
+      if (breakSize > 1) {
+        for (let point of this.points)
+          if (point.node == node && point.pos > this.text.length)
+            point.pos -= breakSize - 1;
+      }
+      off = nextBreak + breakSize;
+    }
+  }
+  readNode(node) {
+    if (node.cmIgnore)
+      return;
+    let view = ContentView.get(node);
+    let fromView = view && view.overrideDOMText;
+    if (fromView != null) {
+      this.findPointInside(node, fromView.length);
+      for (let i = fromView.iter(); !i.next().done; ) {
+        if (i.lineBreak)
+          this.lineBreak();
+        else
+          this.append(i.value);
+      }
+    } else if (node.nodeType == 3) {
+      this.readTextNode(node);
+    } else if (node.nodeName == "BR") {
+      if (node.nextSibling)
+        this.lineBreak();
+    } else if (node.nodeType == 1) {
+      this.readRange(node.firstChild, null);
+    }
+  }
+  findPointBefore(node, next) {
+    for (let point of this.points)
+      if (point.node == node && node.childNodes[point.offset] == next)
+        point.pos = this.text.length;
+  }
+  findPointInside(node, maxLen) {
+    for (let point of this.points)
+      if (node.nodeType == 3 ? point.node == node : node.contains(point.node))
+        point.pos = this.text.length + Math.min(maxLen, point.offset);
+  }
+};
+function isBlockElement(node) {
+  return node.nodeType == 1 && /^(DIV|P|LI|UL|OL|BLOCKQUOTE|DD|DT|H\d|SECTION|PRE)$/.test(node.nodeName);
+}
+var DOMPoint = class {
+  constructor(node, offset) {
+    this.node = node;
+    this.offset = offset;
+    this.pos = -1;
+  }
+};
 var nav = typeof navigator != "undefined" ? navigator : { userAgent: "", vendor: "", platform: "" };
 var doc = typeof document != "undefined" ? document : { documentElement: { style: {} } };
 var ie_edge = /* @__PURE__ */ /Edge\/(\d+)/.exec(nav.userAgent);
@@ -4275,7 +4378,7 @@ var TextView = class extends ContentView {
       this.createDOM(dom);
   }
   merge(from, to, source) {
-    if (source && (!(source instanceof TextView) || this.length - (to - from) + source.length > MaxJoinLen))
+    if (this.flags & 8 || source && (!(source instanceof TextView) || this.length - (to - from) + source.length > MaxJoinLen || source.flags & 8))
       return false;
     this.text = this.text.slice(0, from) + (source ? source.text : "") + this.text.slice(to);
     this.markDirty();
@@ -4285,6 +4388,7 @@ var TextView = class extends ContentView {
     let result = new TextView(this.text.slice(from));
     this.text = this.text.slice(0, from);
     this.markDirty();
+    result.flags |= this.flags & 8;
     return result;
   }
   localPosFromDOM(node, offset) {
@@ -4318,16 +4422,19 @@ var MarkView = class extends ContentView {
         dom.setAttribute(name, this.mark.attrs[name]);
     return dom;
   }
+  canReuseDOM(other) {
+    return super.canReuseDOM(other) && !((this.flags | other.flags) & 8);
+  }
   reuseDOM(node) {
     if (node.nodeName == this.mark.tagName.toUpperCase()) {
       this.setDOM(node);
-      this.dirty |= 4 | 2;
+      this.flags |= 4 | 2;
     }
   }
   sync(view, track) {
     if (!this.dom)
       this.setDOM(this.setAttrs(document.createElement(this.mark.tagName)));
-    else if (this.dirty & 4)
+    else if (this.flags & 4)
       this.setAttrs(this.dom);
     super.sync(view, track);
   }
@@ -4402,7 +4509,7 @@ var WidgetView = class extends ContentView {
     this.prevWidget = null;
   }
   static create(widget, length2, side) {
-    return new (widget.customView || WidgetView)(widget, length2, side);
+    return new WidgetView(widget, length2, side);
   }
   split(from) {
     let result = WidgetView.create(this.widget, this.length - from, this.side);
@@ -4490,127 +4597,6 @@ var WidgetView = class extends ContentView {
       this.widget.destroy(this.dom);
   }
 };
-var CompositionView = class extends WidgetView {
-  domAtPos(pos) {
-    let { topView, text } = this.widget;
-    if (!topView)
-      return new DOMPos(text, Math.min(pos, text.nodeValue.length));
-    return scanCompositionTree(pos, 0, topView, text, this.length - topView.length, (v, p) => v.domAtPos(p), (text2, p) => new DOMPos(text2, Math.min(p, text2.nodeValue.length)));
-  }
-  sync() {
-    this.setDOM(this.widget.toDOM());
-  }
-  localPosFromDOM(node, offset) {
-    let { topView, text } = this.widget;
-    if (!topView)
-      return Math.min(offset, this.length);
-    return posFromDOMInCompositionTree(node, offset, topView, text, this.length - topView.length);
-  }
-  ignoreMutation() {
-    return false;
-  }
-  get overrideDOMText() {
-    return null;
-  }
-  coordsAt(pos, side) {
-    let { topView, text } = this.widget;
-    if (!topView)
-      return textCoords(text, pos, side);
-    return scanCompositionTree(pos, side, topView, text, this.length - topView.length, (v, pos2, side2) => v.coordsAt(pos2, side2), (text2, pos2, side2) => textCoords(text2, pos2, side2));
-  }
-  destroy() {
-    var _a2;
-    super.destroy();
-    (_a2 = this.widget.topView) === null || _a2 === void 0 ? void 0 : _a2.destroy();
-  }
-  get isEditable() {
-    return true;
-  }
-  canReuseDOM() {
-    return true;
-  }
-};
-function scanCompositionTree(pos, side, view, text, dLen, enterView, fromText) {
-  if (view instanceof MarkView) {
-    for (let child = view.dom.firstChild; child; child = child.nextSibling) {
-      let desc = ContentView.get(child);
-      if (!desc) {
-        let inner = scanCompositionNode(pos, side, child, fromText);
-        if (typeof inner != "number")
-          return inner;
-        pos = inner;
-      } else {
-        let hasComp = contains(child, text);
-        let len = desc.length + (hasComp ? dLen : 0);
-        if (pos < len || pos == len && desc.getSide() <= 0)
-          return hasComp ? scanCompositionTree(pos, side, desc, text, dLen, enterView, fromText) : enterView(desc, pos, side);
-        pos -= len;
-      }
-    }
-    return enterView(view, view.length, -1);
-  } else if (view.dom == text) {
-    return fromText(text, pos, side);
-  } else {
-    return enterView(view, pos, side);
-  }
-}
-function scanCompositionNode(pos, side, node, fromText) {
-  if (node.nodeType == 3) {
-    let len = node.nodeValue.length;
-    if (pos <= len)
-      return fromText(node, pos, side);
-    pos -= len;
-  } else if (node.nodeType == 1 && node.contentEditable != "false") {
-    for (let child = node.firstChild; child; child = child.nextSibling) {
-      let inner = scanCompositionNode(pos, side, child, fromText);
-      if (typeof inner != "number")
-        return inner;
-      pos = inner;
-    }
-  }
-  return pos;
-}
-function posFromDOMInCompositionTree(node, offset, view, text, dLen) {
-  if (view instanceof MarkView) {
-    let pos = 0;
-    for (let child = view.dom.firstChild; child; child = child.nextSibling) {
-      let childView = ContentView.get(child);
-      if (childView) {
-        let hasComp = contains(child, text);
-        if (contains(child, node))
-          return pos + (hasComp ? posFromDOMInCompositionTree(node, offset, childView, text, dLen) : childView.localPosFromDOM(node, offset));
-        pos += childView.length + (hasComp ? dLen : 0);
-      } else {
-        let inner = posFromDOMInOpaqueNode(node, offset, child);
-        if (inner.result != null)
-          return pos + inner.result;
-        pos += inner.size;
-      }
-    }
-  } else if (view.dom == text) {
-    return Math.min(offset, text.nodeValue.length);
-  }
-  return view.localPosFromDOM(node, offset);
-}
-function posFromDOMInOpaqueNode(node, offset, target) {
-  if (target.nodeType == 3) {
-    return node == target ? { result: offset } : { size: target.nodeValue.length };
-  } else if (target.nodeType == 1 && target.contentEditable != "false") {
-    let pos = 0;
-    for (let child = target.firstChild, i = 0; ; child = child.nextSibling, i++) {
-      if (node == target && i == offset)
-        return { result: pos };
-      if (!child)
-        return { size: pos };
-      let inner = posFromDOMInOpaqueNode(node, offset, child);
-      if (inner.result != null)
-        return { result: offset + inner.result };
-      pos += inner.size;
-    }
-  } else {
-    return target.contains(node) ? { result: 0 } : { size: 0 };
-  }
-}
 var WidgetBufferView = class extends ContentView {
   constructor(side) {
     super();
@@ -4736,16 +4722,19 @@ function combineAttrs(source, target) {
   }
   return target;
 }
-function attrsEq(a, b) {
+var noAttrs = /* @__PURE__ */ Object.create(null);
+function attrsEq(a, b, ignore) {
   if (a == b)
     return true;
-  if (!a || !b)
-    return false;
+  if (!a)
+    a = noAttrs;
+  if (!b)
+    b = noAttrs;
   let keysA = Object.keys(a), keysB = Object.keys(b);
-  if (keysA.length != keysB.length)
+  if (keysA.length - (ignore && keysA.indexOf(ignore) > -1 ? 1 : 0) != keysB.length - (ignore && keysB.indexOf(ignore) > -1 ? 1 : 0))
     return false;
   for (let key of keysA) {
-    if (keysB.indexOf(key) == -1 || a[key] !== b[key])
+    if (key != ignore && (keysB.indexOf(key) == -1 || a[key] !== b[key]))
       return false;
   }
   return true;
@@ -4764,6 +4753,14 @@ function updateAttrs(dom, prev, attrs) {
   }
   return !!changed;
 }
+function getAttrs(dom) {
+  let attrs = /* @__PURE__ */ Object.create(null);
+  for (let i = 0; i < dom.attributes.length; i++) {
+    let attr = dom.attributes[i];
+    attrs[attr.name] = attr.value;
+  }
+  return attrs;
+}
 var WidgetType = class {
   /**
   Compare this instance to another instance of the same type.
@@ -4832,12 +4829,6 @@ var WidgetType = class {
   /**
   @internal
   */
-  get customView() {
-    return null;
-  }
-  /**
-  @internal
-  */
   get isHidden() {
     return false;
   }
@@ -4938,7 +4929,8 @@ var MarkDecoration = class extends Decoration {
     this.attrs = spec.attributes || null;
   }
   eq(other) {
-    return this == other || other instanceof MarkDecoration && this.tagName == other.tagName && this.class == other.class && attrsEq(this.attrs, other.attrs);
+    var _a2, _b;
+    return this == other || other instanceof MarkDecoration && this.tagName == other.tagName && (this.class || ((_a2 = this.attrs) === null || _a2 === void 0 ? void 0 : _a2.class)) == (other.class || ((_b = other.attrs) === null || _b === void 0 ? void 0 : _b.class)) && attrsEq(this.attrs, other.attrs, "class");
   }
   range(from, to = from) {
     if (from >= to)
@@ -5083,7 +5075,7 @@ var LineView = class extends ContentView {
   reuseDOM(node) {
     if (node.nodeName == "DIV") {
       this.setDOM(node);
-      this.dirty |= 4 | 2;
+      this.flags |= 4 | 2;
     }
   }
   sync(view, track) {
@@ -5092,7 +5084,7 @@ var LineView = class extends ContentView {
       this.setDOM(document.createElement("div"));
       this.dom.className = "cm-line";
       this.prevAttrs = this.attrs ? null : void 0;
-    } else if (this.dirty & 4) {
+    } else if (this.flags & 4) {
       clearAttributes(this.dom);
       this.dom.className = "cm-line";
       this.prevAttrs = this.attrs ? null : void 0;
@@ -5136,8 +5128,8 @@ var LineView = class extends ContentView {
     if (!this.children.length && rect && this.parent) {
       let { heightOracle } = this.parent.view.viewState, height = rect.bottom - rect.top;
       if (Math.abs(height - heightOracle.lineHeight) < 2 && heightOracle.textHeight < height) {
-        let dist = (height - heightOracle.textHeight) / 2;
-        return { top: rect.top + dist, bottom: rect.bottom - dist, left: rect.left, right: rect.left };
+        let dist2 = (height - heightOracle.textHeight) / 2;
+        return { top: rect.top + dist2, bottom: rect.bottom - dist2, left: rect.left, right: rect.left };
       }
     }
     return rect;
@@ -5899,115 +5891,14 @@ function moveVisually(line, order, dir, start, forward) {
     return EditorSelection.cursor(nextSpan.side(!forward, dir) + line.from, forward ? 1 : -1, nextSpan.level);
   return EditorSelection.cursor(nextIndex + line.from, forward ? -1 : 1, span.level);
 }
-var LineBreakPlaceholder = "\uFFFF";
-var DOMReader = class {
-  constructor(points, state) {
-    this.points = points;
-    this.text = "";
-    this.lineSeparator = state.facet(EditorState.lineSeparator);
-  }
-  append(text) {
-    this.text += text;
-  }
-  lineBreak() {
-    this.text += LineBreakPlaceholder;
-  }
-  readRange(start, end) {
-    if (!start)
-      return this;
-    let parent = start.parentNode;
-    for (let cur2 = start; ; ) {
-      this.findPointBefore(parent, cur2);
-      let oldLen = this.text.length;
-      this.readNode(cur2);
-      let next = cur2.nextSibling;
-      if (next == end)
-        break;
-      let view = ContentView.get(cur2), nextView = ContentView.get(next);
-      if (view && nextView ? view.breakAfter : (view ? view.breakAfter : isBlockElement(cur2)) || isBlockElement(next) && (cur2.nodeName != "BR" || cur2.cmIgnore) && this.text.length > oldLen)
-        this.lineBreak();
-      cur2 = next;
-    }
-    this.findPointBefore(parent, end);
-    return this;
-  }
-  readTextNode(node) {
-    let text = node.nodeValue;
-    for (let point of this.points)
-      if (point.node == node)
-        point.pos = this.text.length + Math.min(point.offset, text.length);
-    for (let off = 0, re = this.lineSeparator ? null : /\r\n?|\n/g; ; ) {
-      let nextBreak = -1, breakSize = 1, m;
-      if (this.lineSeparator) {
-        nextBreak = text.indexOf(this.lineSeparator, off);
-        breakSize = this.lineSeparator.length;
-      } else if (m = re.exec(text)) {
-        nextBreak = m.index;
-        breakSize = m[0].length;
-      }
-      this.append(text.slice(off, nextBreak < 0 ? text.length : nextBreak));
-      if (nextBreak < 0)
-        break;
-      this.lineBreak();
-      if (breakSize > 1) {
-        for (let point of this.points)
-          if (point.node == node && point.pos > this.text.length)
-            point.pos -= breakSize - 1;
-      }
-      off = nextBreak + breakSize;
-    }
-  }
-  readNode(node) {
-    if (node.cmIgnore)
-      return;
-    let view = ContentView.get(node);
-    let fromView = view && view.overrideDOMText;
-    if (fromView != null) {
-      this.findPointInside(node, fromView.length);
-      for (let i = fromView.iter(); !i.next().done; ) {
-        if (i.lineBreak)
-          this.lineBreak();
-        else
-          this.append(i.value);
-      }
-    } else if (node.nodeType == 3) {
-      this.readTextNode(node);
-    } else if (node.nodeName == "BR") {
-      if (node.nextSibling)
-        this.lineBreak();
-    } else if (node.nodeType == 1) {
-      this.readRange(node.firstChild, null);
-    }
-  }
-  findPointBefore(node, next) {
-    for (let point of this.points)
-      if (point.node == node && node.childNodes[point.offset] == next)
-        point.pos = this.text.length;
-  }
-  findPointInside(node, maxLen) {
-    for (let point of this.points)
-      if (node.nodeType == 3 ? point.node == node : node.contains(point.node))
-        point.pos = this.text.length + Math.min(maxLen, point.offset);
-  }
-};
-function isBlockElement(node) {
-  return node.nodeType == 1 && /^(DIV|P|LI|UL|OL|BLOCKQUOTE|DD|DT|H\d|SECTION|PRE)$/.test(node.nodeName);
-}
-var DOMPoint = class {
-  constructor(node, offset) {
-    this.node = node;
-    this.offset = offset;
-    this.pos = -1;
-  }
-};
 var DocView = class extends ContentView {
   constructor(view) {
     super();
     this.view = view;
-    this.compositionDeco = Decoration.none;
-    this.compositionNode = null;
     this.decorations = [];
     this.dynamicDecorationMap = [];
+    this.hasComposition = null;
+    this.markedForComposition = /* @__PURE__ */ new Set();
     this.minWidth = 0;
     this.minWidthFrom = 0;
     this.minWidthTo = 0;
@@ -6019,7 +5910,7 @@ var DocView = class extends ContentView {
     this.children = [new LineView()];
     this.children[0].setParent(this);
     this.updateDeco();
-    this.updateInner([new ChangedRange(0, 0, 0, view.state.doc.length)], 0);
+    this.updateInner([new ChangedRange(0, 0, 0, view.state.doc.length)], 0, null);
   }
   get length() {
     return this.view.state.doc.length;
@@ -6035,16 +5926,22 @@ var DocView = class extends ContentView {
         this.minWidthTo = update.changes.mapPos(this.minWidthTo, 1);
       }
     }
-    ({ deco: this.compositionDeco, node: this.compositionNode } = this.view.inputState.composing < 0 ? noComp : computeCompositionDeco(this.view, update.changes));
-    if ((browser.ie || browser.chrome) && !this.compositionDeco.size && update && update.state.doc.lines != update.startState.doc.lines)
+    let composition = this.view.inputState.composing < 0 ? null : findCompositionRange(this.view, update.changes);
+    if (this.hasComposition) {
+      this.markedForComposition.clear();
+      let { from, to } = this.hasComposition;
+      changedRanges = new ChangedRange(from, to, update.changes.mapPos(from, -1), update.changes.mapPos(to, 1)).addToSet(changedRanges.slice());
+    }
+    this.hasComposition = composition ? { from: composition.range.fromB, to: composition.range.toB } : null;
+    if ((browser.ie || browser.chrome) && !composition && update && update.state.doc.lines != update.startState.doc.lines)
       this.forceSelection = true;
     let prevDeco = this.decorations, deco = this.updateDeco();
     let decoDiff = findChangedDeco(prevDeco, deco, update.changes);
     changedRanges = ChangedRange.extendWithRanges(changedRanges, decoDiff);
-    if (this.dirty == 0 && changedRanges.length == 0) {
+    if (!(this.flags & 7) && changedRanges.length == 0) {
       return false;
     } else {
-      this.updateInner(changedRanges, update.startState.doc.length);
+      this.updateInner(changedRanges, update.startState.doc.length, composition);
       if (update.transactions.length)
         this.lastUpdate = Date.now();
       return true;
@@ -6052,20 +5949,24 @@ var DocView = class extends ContentView {
   }
   // Used by update and the constructor do perform the actual DOM
   // update
-  updateInner(changes, oldLength) {
+  updateInner(changes, oldLength, composition) {
     this.view.viewState.mustMeasureContent = true;
-    this.updateChildren(changes, oldLength);
+    this.updateChildren(changes, oldLength, composition);
     let { observer } = this.view;
     observer.ignore(() => {
       this.dom.style.height = this.view.viewState.contentHeight + "px";
       this.dom.style.flexBasis = this.minWidth ? this.minWidth + "px" : "";
       let track = browser.chrome || browser.ios ? { node: observer.selectionRange.focusNode, written: false } : void 0;
       this.sync(this.view, track);
-      this.dirty = 0;
+      this.flags &= ~7;
       if (track && (track.written || observer.selectionRange.focusNode != track.node))
         this.forceSelection = true;
       this.dom.style.height = "";
     });
+    this.markedForComposition.forEach(
+      (cView) => cView.flags &= ~8
+      /* Composition */
+    );
     let gaps = [];
     if (this.view.viewport.from || this.view.viewport.to < this.view.state.doc.length) {
       for (let child of this.children)
@@ -6074,18 +5975,69 @@ var DocView = class extends ContentView {
     }
     observer.updateGaps(gaps);
   }
-  updateChildren(changes, oldLength) {
+  updateChildren(changes, oldLength, composition) {
+    let ranges = composition ? composition.range.addToSet(changes.slice()) : changes;
     let cursor = this.childCursor(oldLength);
-    for (let i = changes.length - 1; ; i--) {
-      let next = i >= 0 ? changes[i] : null;
+    for (let i = ranges.length - 1; ; i--) {
+      let next = i >= 0 ? ranges[i] : null;
       if (!next)
         break;
-      let { fromA, toA, fromB, toB } = next;
-      let { content, breakAtStart, openStart, openEnd } = ContentBuilder.build(this.view.state.doc, fromB, toB, this.decorations, this.dynamicDecorationMap);
+      let { fromA, toA, fromB, toB } = next, content, breakAtStart, openStart, openEnd;
+      if (composition && composition.range.fromB < toB && composition.range.toB > fromB) {
+        let before = ContentBuilder.build(this.view.state.doc, fromB, composition.range.fromB, this.decorations, this.dynamicDecorationMap);
+        let after = ContentBuilder.build(this.view.state.doc, composition.range.toB, toB, this.decorations, this.dynamicDecorationMap);
+        breakAtStart = before.breakAtStart;
+        openStart = before.openStart;
+        openEnd = after.openEnd;
+        let compLine = this.compositionView(composition);
+        if (after.breakAtStart) {
+          compLine.breakAfter = 1;
+        } else if (after.content.length && compLine.merge(compLine.length, compLine.length, after.content[0], false, after.openStart, 0)) {
+          compLine.breakAfter = after.content[0].breakAfter;
+          after.content.shift();
+        }
+        if (before.content.length && compLine.merge(0, 0, before.content[before.content.length - 1], true, 0, before.openEnd)) {
+          before.content.pop();
+        }
+        content = before.content.concat(compLine).concat(after.content);
+      } else {
+        ({ content, breakAtStart, openStart, openEnd } = ContentBuilder.build(this.view.state.doc, fromB, toB, this.decorations, this.dynamicDecorationMap));
+      }
       let { i: toI, off: toOff } = cursor.findPos(toA, 1);
       let { i: fromI, off: fromOff } = cursor.findPos(fromA, -1);
       replaceRange(this, fromI, fromOff, toI, toOff, content, breakAtStart, openStart, openEnd);
     }
+    if (composition)
+      this.fixCompositionDOM(composition);
+  }
+  compositionView(composition) {
+    let cur2 = new TextView(composition.text.nodeValue);
+    cur2.flags |= 8;
+    for (let { deco } of composition.marks)
+      cur2 = new MarkView(deco, [cur2], cur2.length);
+    let line = new LineView();
+    line.append(cur2, 0);
+    return line;
+  }
+  fixCompositionDOM(composition) {
+    let fix = (dom, cView2) => {
+      cView2.flags |= 8;
+      this.markedForComposition.add(cView2);
+      let prev = ContentView.get(dom);
+      if (prev != cView2) {
+        if (prev)
+          prev.dom = null;
+        cView2.setDOM(dom);
+      }
+    };
+    let pos = this.childPos(composition.range.fromB, 1);
+    let cView = this.children[pos.i];
+    fix(composition.line, cView);
+    for (let i = composition.marks.length - 1; i >= -1; i--) {
+      pos = cView.childPos(pos.off, 1);
+      cView = cView.children[pos.i];
+      fix(i >= 0 ? composition.marks[i].node : composition.text, cView);
+    }
   }
   // Sync the DOM selection to this.state.selection
   updateSelection(mustRead = false, fromPointer = false) {
@@ -6100,7 +6052,7 @@ var DocView = class extends ContentView {
     let main = this.view.state.selection.main;
     let anchor = this.domAtPos(main.anchor);
     let head = main.empty ? anchor : this.domAtPos(main.head);
-    if (browser.gecko && main.empty && !this.compositionDeco.size && betweenUneditable(anchor)) {
+    if (browser.gecko && main.empty && !this.hasComposition && betweenUneditable(anchor)) {
       let dummy = document.createTextNode("");
       this.view.observer.ignore(() => anchor.node.insertBefore(dummy, anchor.node.childNodes[anchor.offset] || null));
       anchor = head = new DOMPos(dummy, 0);
@@ -6155,7 +6107,7 @@ var DocView = class extends ContentView {
     this.impreciseHead = head.precise ? null : new DOMPos(domSel.focusNode, domSel.focusOffset);
   }
   enforceCursorAssoc() {
-    if (this.compositionDeco.size)
+    if (this.hasComposition)
       return;
     let { view } = this, cursor = view.state.selection.main;
     let sel = getSelection(view.root);
@@ -6213,6 +6165,28 @@ var DocView = class extends ContentView {
       off = start;
     }
   }
+  coordsForChar(pos) {
+    let { i, off } = this.childPos(pos, 1), child = this.children[i];
+    if (!(child instanceof LineView))
+      return null;
+    while (child.children.length) {
+      let { i: i2, off: childOff } = child.childPos(off, 1);
+      for (; ; i2++) {
+        if (i2 == child.children.length)
+          return null;
+        if ((child = child.children[i2]).length)
+          break;
+      }
+      off = childOff;
+    }
+    if (!(child instanceof TextView))
+      return null;
+    let end = findClusterBreak(child.text, off);
+    if (end == off)
+      return null;
+    let rects = textRange(child.dom, off, end).getClientRects();
+    return !rects.length || rects[0].top >= rects[0].bottom ? null : rects[0];
+  }
   measureVisibleLineHeights(viewport) {
     let result = [], { from, to } = viewport;
     let contentWidth = this.view.contentDOM.clientWidth;
@@ -6259,6 +6233,7 @@ var DocView = class extends ContentView {
     let dummy = document.createElement("div"), lineHeight, charWidth, textHeight;
     dummy.className = "cm-line";
     dummy.style.width = "99999px";
+    dummy.style.position = "absolute";
     dummy.textContent = "abc def ghi jkl mno pqr stu";
     this.view.observer.ignore(() => {
       this.dom.appendChild(dummy);
@@ -6305,7 +6280,6 @@ var DocView = class extends ContentView {
       this.dynamicDecorationMap[i] = false;
     return this.decorations = [
       ...allDeco,
-      this.compositionDeco,
       this.computeBlockGapDeco(),
       this.view.viewState.lineGapDeco
     ];
@@ -6356,89 +6330,83 @@ var BlockGapWidget = class extends WidgetType {
     return this.height;
   }
 };
-function compositionSurroundingNode(view) {
+function findCompositionNode(view) {
   let sel = view.observer.selectionRange;
   let textNode = sel.focusNode && nearbyTextNode(sel.focusNode, sel.focusOffset, 0);
   if (!textNode)
     return null;
-  let cView = view.docView.nearest(textNode);
-  if (!cView)
-    return null;
-  if (cView instanceof LineView) {
-    let topNode = textNode;
-    while (topNode.parentNode != cView.dom)
-      topNode = topNode.parentNode;
-    let prev = topNode.previousSibling;
-    while (prev && !ContentView.get(prev))
-      prev = prev.previousSibling;
-    let pos = prev ? ContentView.get(prev).posAtEnd : cView.posAtStart;
-    return { from: pos, to: pos, node: topNode, text: textNode };
+  let cView = ContentView.get(textNode);
+  let from, to;
+  if (cView instanceof TextView) {
+    from = cView.posAtStart;
+    to = from + cView.length;
   } else {
-    for (; ; ) {
-      let { parent } = cView;
-      if (!parent)
-        return null;
-      if (parent instanceof LineView)
-        break;
-      cView = parent;
-    }
-    let from = cView.posAtStart;
-    return { from, to: from + cView.length, node: cView.dom, text: textNode };
-  }
-}
-var noComp = { deco: Decoration.none, node: null };
-function computeCompositionDeco(view, changes) {
-  let surrounding = compositionSurroundingNode(view);
-  if (!surrounding)
-    return noComp;
-  let { from, to, node, text: textNode } = surrounding;
-  let newFrom = changes.mapPos(from, 1), newTo = Math.max(newFrom, changes.mapPos(to, -1));
-  let { state } = view, reader = new DOMReader([], state);
-  if (node.nodeType == 3)
-    reader.readTextNode(node);
-  else
-    reader.readRange(node.firstChild, null);
-  let { text } = reader;
-  if (text.indexOf(LineBreakPlaceholder) > -1)
-    return noComp;
-  if (newTo - newFrom < text.length) {
-    if (state.doc.sliceString(newFrom, Math.min(state.doc.length, newFrom + text.length)) == text)
-      newTo = newFrom + text.length;
-    else if (state.doc.sliceString(Math.max(0, newTo - text.length), newTo) == text)
-      newFrom = newTo - text.length;
-    else
-      return noComp;
-  } else if (state.doc.sliceString(newFrom, newTo) != text) {
-    return noComp;
-  }
-  let topView = ContentView.get(node);
-  if (topView instanceof CompositionView)
-    topView = topView.widget.topView;
-  else if (topView)
-    topView.parent = null;
-  let deco = Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView), inclusive: true }).range(newFrom, newTo));
-  return { deco, node };
-}
-var CompositionWidget = class extends WidgetType {
-  constructor(top2, text, topView) {
-    super();
-    this.top = top2;
-    this.text = text;
-    this.topView = topView;
-  }
-  eq(other) {
-    return this.top == other.top && this.text == other.text;
-  }
-  toDOM() {
-    return this.top;
+    up:
+      for (let offset = 0, node = textNode; ; ) {
+        for (let sibling = node.previousSibling, cView2; sibling; sibling = sibling.previousSibling) {
+          if (cView2 = ContentView.get(sibling)) {
+            from = to = cView2.posAtEnd + offset;
+            break up;
+          }
+          let reader = new DOMReader([], view.state);
+          reader.readNode(sibling);
+          if (reader.text.indexOf(LineBreakPlaceholder) > -1)
+            return null;
+          offset += reader.text.length;
+        }
+        node = node.parentNode;
+        if (!node)
+          return null;
+        let parentView = ContentView.get(node);
+        if (parentView) {
+          from = to = parentView.posAtStart + offset;
+          break;
+        }
+      }
   }
-  ignoreEvent() {
-    return false;
+  return { from, to, node: textNode };
+}
+function findCompositionRange(view, changes) {
+  let found = findCompositionNode(view);
+  if (!found)
+    return null;
+  let { from: fromA, to: toA, node: textNode } = found;
+  let fromB = changes.mapPos(fromA, -1), toB = changes.mapPos(toA, 1);
+  let text = textNode.nodeValue;
+  if (/[\n\r]/.test(text))
+    return null;
+  if (toB - fromB != text.length) {
+    let fromB2 = changes.mapPos(fromA, 1), toB2 = changes.mapPos(toA, -1);
+    if (toB2 - fromB2 == text.length)
+      fromB = fromB2, toB = toB2;
+    else if (view.state.doc.sliceString(toB - text.length, toB) == text)
+      fromB = toB - text.length;
+    else if (view.state.doc.sliceString(fromB, fromB + text.length) == text)
+      toB = fromB + text.length;
+    else
+      return null;
   }
-  get customView() {
-    return CompositionView;
+  let { main } = view.state.selection;
+  if (view.state.doc.sliceString(fromB, toB) != text || fromB > main.head || toB < main.head)
+    return null;
+  let marks = [];
+  let range = new ChangedRange(fromA, toA, fromB, toB);
+  for (let parent = textNode.parentNode; ; parent = parent.parentNode) {
+    let parentView = ContentView.get(parent);
+    if (parentView instanceof MarkView)
+      marks.push({ node: parent, deco: parentView.mark });
+    else if (parentView instanceof LineView || parent.nodeName == "DIV" && parent.parentNode == view.contentDOM)
+      return { range, text: textNode, marks, line: parent };
+    else if (parent != view.contentDOM)
+      marks.push({ node: parent, deco: new MarkDecoration({
+        inclusive: true,
+        attributes: getAttrs(parent),
+        tagName: parent.tagName.toLowerCase()
+      }) });
+    else
+      return null;
   }
-};
+}
 function nearbyTextNode(startNode, startOffset, side) {
   if (side <= 0)
     for (let node = startNode, offset = startOffset; ; ) {
@@ -6796,9 +6764,9 @@ function moveVertically(view, start, forward, distance) {
     startY = (dir < 0 ? line.top : line.bottom) + docTop;
   }
   let resolvedGoal = rect.left + goal;
-  let dist = distance !== null && distance !== void 0 ? distance : view.viewState.heightOracle.textHeight >> 1;
+  let dist2 = distance !== null && distance !== void 0 ? distance : view.viewState.heightOracle.textHeight >> 1;
   for (let extra = 0; ; extra += 10) {
-    let curY = startY + (dist + extra) * dir;
+    let curY = startY + (dist2 + extra) * dir;
     let pos = posAtCoords(view, { x: resolvedGoal, y: curY }, false, dir);
     if (curY < rect.top || curY > rect.bottom || (dir < 0 ? pos < startPos : pos > startPos))
       return EditorSelection.cursor(pos, start.assoc, void 0, goal);
@@ -7013,12 +6981,16 @@ var PendingKeys = [
 var EmacsyPendingKeys = "dthko";
 var modifierCodes = [16, 17, 18, 20, 91, 92, 224, 225];
 var dragScrollMargin = 6;
-function dragScrollSpeed(dist) {
-  return Math.max(0, dist) * 0.7 + 8;
+function dragScrollSpeed(dist2) {
+  return Math.max(0, dist2) * 0.7 + 8;
+}
+function dist(a, b) {
+  return Math.max(Math.abs(a.clientX - b.clientX), Math.abs(a.clientY - b.clientY));
 }
 var MouseSelection = class {
   constructor(view, startEvent, style, mustSelect) {
     this.view = view;
+    this.startEvent = startEvent;
     this.style = style;
     this.mustSelect = mustSelect;
     this.scrollSpeed = { x: 0, y: 0 };
@@ -7043,7 +7015,7 @@ var MouseSelection = class {
     var _a2;
     if (event.buttons == 0)
       return this.destroy();
-    if (this.dragging !== false)
+    if (this.dragging || this.dragging == null && dist(this.startEvent, event) < 10)
       return;
     this.select(this.lastEvent = event);
     let sx = 0, sy = 0;
@@ -7117,7 +7089,7 @@ var MouseSelection = class {
   }
   select(event) {
     let { view } = this, selection = this.skipAtoms(this.style.get(event, this.extend, this.multiple));
-    if (this.mustSelect || !selection.eq(view.state.selection) || selection.main.assoc != view.state.selection.main.assoc)
+    if (this.mustSelect || !selection.eq(view.state.selection) || selection.main.assoc != view.state.selection.main.assoc && this.dragging === false)
       this.view.dispatch({
         selection,
         userEvent: "select.pointer"
@@ -7507,7 +7479,7 @@ handlers.compositionend = (view) => {
     Promise.resolve().then(() => view.observer.flush());
   } else {
     setTimeout(() => {
-      if (view.inputState.composing < 0 && view.docView.compositionDeco.size)
+      if (view.inputState.composing < 0 && view.docView.hasComposition)
         view.update([]);
     }, 50);
   }
@@ -8688,12 +8660,12 @@ function findPosition({ total, ranges }, ratio) {
     return ranges[0].from;
   if (ratio >= 1)
     return ranges[ranges.length - 1].to;
-  let dist = Math.floor(total * ratio);
+  let dist2 = Math.floor(total * ratio);
   for (let i = 0; ; i++) {
     let { from, to } = ranges[i], size = to - from;
-    if (dist <= size)
-      return from + dist;
-    dist -= size;
+    if (dist2 <= size)
+      return from + dist2;
+    dist2 -= size;
   }
 }
 function findFraction(structure, pos) {
@@ -8899,7 +8871,7 @@ var baseTheme$1 = /* @__PURE__ */ buildTheme("." + baseThemeID, {
     display: "flex",
     height: "100%",
     boxSizing: "border-box",
-    left: 0,
+    insetInlineStart: 0,
     zIndex: 200
   },
   "&light .cm-gutters": {
@@ -9107,7 +9079,7 @@ function applyDOMChange(view, domChange) {
       let mainSel = newSel && newSel.main.to <= changes.newLength ? newSel.main : void 0;
       if (startState.selection.ranges.length > 1 && view.inputState.composing >= 0 && change.to <= sel.to && change.to >= sel.to - 10) {
         let replaced = view.state.sliceDoc(change.from, change.to);
-        let compositionRange = compositionSurroundingNode(view) || view.state.doc.lineAt(sel.head);
+        let composition = findCompositionNode(view) || view.state.doc.lineAt(sel.head);
         let offset = sel.to - change.to, size = sel.to - sel.from;
         tr = startState.changeByRange((range) => {
           if (range.from == sel.from && range.to == sel.to)
@@ -9117,7 +9089,7 @@ function applyDOMChange(view, domChange) {
           // changes in the same node work without aborting
           // composition, so cursors in the composition range are
           // ignored.
-          compositionRange && range.to >= compositionRange.from && range.from <= compositionRange.to)
+          composition && range.to >= composition.from && range.from <= composition.to)
             return { range };
           let rangeChanges = startState.changes({ from, to, insert: change.insert }), selOff = range.to - sel.to;
           return {
@@ -9530,7 +9502,7 @@ var DOMObserver = class {
       return null;
     cView.markDirty(rec.type == "attributes");
     if (rec.type == "attributes")
-      cView.dirty |= 4;
+      cView.flags |= 4;
     if (rec.type == "childList") {
       let childBefore = findChild(cView, rec.previousSibling || rec.target.previousSibling, -1);
       let childAfter = findChild(cView, rec.nextSibling || rec.target.nextSibling, 1);
@@ -10220,6 +10192,17 @@ var EditorView = class {
     return flattenRect(rect, span.dir == Direction.LTR == side > 0);
   }
   /**
+  Return the rectangle around a given character. If `pos` does not
+  point in front of a character that is in the viewport and
+  rendered (i.e. not replaced, not a line break), this will return
+  null. For space characters that are a line wrap point, this will
+  return the position before the line break.
+  */
+  coordsForChar(pos) {
+    this.readMeasured();
+    return this.docView.coordsForChar(pos);
+  }
+  /**
   The default width of a character in the editor. May not
   accurately reflect the width of all characters (given variable
   width fonts or styling of invididual ranges).
@@ -10518,7 +10501,7 @@ function buildKeymap(bindings, platform = currentPlatform) {
     else if (current != is)
       throw new Error("Key binding " + name + " is used both as a regular binding and as a multi-stroke prefix");
   };
-  let add = (scope, key, command2, preventDefault) => {
+  let add = (scope, key, command2, preventDefault, stopPropagation) => {
     var _a2, _b;
     let scopeObj = bound[scope] || (bound[scope] = /* @__PURE__ */ Object.create(null));
     let parts = key.split(/ (?!$)/).map((k) => normalizeKeyName(k, platform));
@@ -10528,6 +10511,7 @@ function buildKeymap(bindings, platform = currentPlatform) {
       if (!scopeObj[prefix])
         scopeObj[prefix] = {
           preventDefault: true,
+          stopPropagation: false,
           run: [(view) => {
             let ourObj = storedPrefix = { view, prefix, scope };
             setTimeout(() => {
@@ -10540,11 +10524,17 @@ function buildKeymap(bindings, platform = currentPlatform) {
     }
     let full = parts.join(" ");
     checkPrefix(full, false);
-    let binding = scopeObj[full] || (scopeObj[full] = { preventDefault: false, run: ((_b = (_a2 = scopeObj._any) === null || _a2 === void 0 ? void 0 : _a2.run) === null || _b === void 0 ? void 0 : _b.slice()) || [] });
+    let binding = scopeObj[full] || (scopeObj[full] = {
+      preventDefault: false,
+      stopPropagation: false,
+      run: ((_b = (_a2 = scopeObj._any) === null || _a2 === void 0 ? void 0 : _a2.run) === null || _b === void 0 ? void 0 : _b.slice()) || []
+    });
     if (command2)
       binding.run.push(command2);
     if (preventDefault)
       binding.preventDefault = true;
+    if (stopPropagation)
+      binding.stopPropagation = true;
   };
   for (let b of bindings) {
     let scopes = b.scope ? b.scope.split(" ") : ["editor"];
@@ -10552,7 +10542,7 @@ function buildKeymap(bindings, platform = currentPlatform) {
       for (let scope of scopes) {
         let scopeObj = bound[scope] || (bound[scope] = /* @__PURE__ */ Object.create(null));
         if (!scopeObj._any)
-          scopeObj._any = { preventDefault: false, run: [] };
+          scopeObj._any = { preventDefault: false, stopPropagation: false, run: [] };
         for (let key in scopeObj)
           scopeObj[key].run.push(b.any);
       }
@@ -10560,9 +10550,9 @@ function buildKeymap(bindings, platform = currentPlatform) {
     if (!name)
       continue;
     for (let scope of scopes) {
-      add(scope, name, b.run, b.preventDefault);
+      add(scope, name, b.run, b.preventDefault, b.stopPropagation);
       if (b.shift)
-        add(scope, "Shift-" + name, b.shift, b.preventDefault);
+        add(scope, "Shift-" + name, b.shift, b.preventDefault, b.stopPropagation);
     }
   }
   return bound;
@@ -10570,11 +10560,13 @@ function buildKeymap(bindings, platform = currentPlatform) {
 function runHandlers(map, event, view, scope) {
   let name = keyName(event);
   let charCode = codePointAt(name, 0), isChar = codePointSize(charCode) == name.length && name != " ";
-  let prefix = "", fallthrough = false;
+  let prefix = "", handled = false, prevented = false, stopPropagation = false;
   if (storedPrefix && storedPrefix.view == view && storedPrefix.scope == scope) {
     prefix = storedPrefix.prefix + " ";
-    if (fallthrough = modifierCodes.indexOf(event.keyCode) < 0)
+    if (modifierCodes.indexOf(event.keyCode) < 0) {
+      prevented = true;
       storedPrefix = null;
+    }
   }
   let ran = /* @__PURE__ */ new Set();
   let runFor = (binding) => {
@@ -10582,32 +10574,42 @@ function runHandlers(map, event, view, scope) {
       for (let cmd2 of binding.run)
         if (!ran.has(cmd2)) {
           ran.add(cmd2);
-          if (cmd2(view, event))
+          if (cmd2(view, event)) {
+            if (binding.stopPropagation)
+              stopPropagation = true;
             return true;
+          }
         }
-      if (binding.preventDefault)
-        fallthrough = true;
+      if (binding.preventDefault) {
+        if (binding.stopPropagation)
+          stopPropagation = true;
+        prevented = true;
+      }
     }
     return false;
   };
   let scopeObj = map[scope], baseName, shiftName;
   if (scopeObj) {
-    if (runFor(scopeObj[prefix + modifiers(name, event, !isChar)]))
-      return true;
-    if (isChar && (event.altKey || event.metaKey || event.ctrlKey) && // Ctrl-Alt may be used for AltGr on Windows
+    if (runFor(scopeObj[prefix + modifiers(name, event, !isChar)])) {
+      handled = true;
+    } else if (isChar && (event.altKey || event.metaKey || event.ctrlKey) && // Ctrl-Alt may be used for AltGr on Windows
     !(browser.windows && event.ctrlKey && event.altKey) && (baseName = base[event.keyCode]) && baseName != name) {
-      if (runFor(scopeObj[prefix + modifiers(baseName, event, true)]))
-        return true;
-      else if (event.shiftKey && (shiftName = shift[event.keyCode]) != name && shiftName != baseName && runFor(scopeObj[prefix + modifiers(shiftName, event, false)]))
-        return true;
-    } else if (isChar && event.shiftKey) {
-      if (runFor(scopeObj[prefix + modifiers(name, event, true)]))
-        return true;
+      if (runFor(scopeObj[prefix + modifiers(baseName, event, true)])) {
+        handled = true;
+      } else if (event.shiftKey && (shiftName = shift[event.keyCode]) != name && shiftName != baseName && runFor(scopeObj[prefix + modifiers(shiftName, event, false)])) {
+        handled = true;
+      }
+    } else if (isChar && event.shiftKey && runFor(scopeObj[prefix + modifiers(name, event, true)])) {
+      handled = true;
     }
-    if (runFor(scopeObj._any))
-      return true;
+    if (!handled && runFor(scopeObj._any))
+      handled = true;
   }
-  return fallthrough;
+  if (prevented)
+    handled = true;
+  if (handled && stopPropagation)
+    event.stopPropagation();
+  return handled;
 }
 var RectangleMarker = class {
   /**
@@ -12731,6 +12733,8 @@ var FuzzyMatcher = class {
     this.any = [];
     this.precise = [];
     this.byWord = [];
+    this.score = 0;
+    this.matched = [];
     for (let p = 0; p < pattern.length; ) {
       let char = codePointAt(pattern, p), size = codePointSize(char);
       this.chars.push(char);
@@ -12740,21 +12744,23 @@ var FuzzyMatcher = class {
     }
     this.astral = pattern.length != this.chars.length;
   }
+  ret(score2, matched) {
+    this.score = score2;
+    this.matched = matched;
+    return true;
+  }
   // Matches a given word (completion) against the pattern (input).
-  // Will return null for no match, and otherwise an array that starts
-  // with the match score, followed by any number of `from, to` pairs
-  // indicating the matched parts of `word`.
+  // Will return a boolean indicating whether there was a match and,
+  // on success, set `this.score` to the score, `this.matched` to an
+  // array of `from, to` pairs indicating the matched parts of `word`.
   //
   // The score is a number that is more negative the worse the match
   // is. See `Penalty` above.
   match(word) {
     if (this.pattern.length == 0)
-      return [
-        -100
-        /* NotFull */
-      ];
+      return this.ret(-100, []);
     if (word.length < this.pattern.length)
-      return null;
+      return false;
     let { chars, folded, any, precise, byWord } = this;
     if (chars.length == 1) {
       let first = codePointAt(word, 0), firstSize = codePointSize(first);
@@ -12764,12 +12770,12 @@ var FuzzyMatcher = class {
       else if (first == folded[0])
         score2 += -200;
       else
-        return null;
-      return [score2, 0, firstSize];
+        return false;
+      return this.ret(score2, [0, firstSize]);
     }
     let direct = word.indexOf(this.pattern);
     if (direct == 0)
-      return [word.length == this.pattern.length ? 0 : -100, 0, this.pattern.length];
+      return this.ret(word.length == this.pattern.length ? 0 : -100, [0, this.pattern.length]);
     let len = chars.length, anyTo = 0;
     if (direct < 0) {
       for (let i = 0, e = Math.min(word.length, 200); i < e && anyTo < len; ) {
@@ -12779,7 +12785,7 @@ var FuzzyMatcher = class {
         i += codePointSize(next);
       }
       if (anyTo < len)
-        return null;
+        return false;
     }
     let preciseTo = 0;
     let byWordTo = 0, byWordFolded = false;
@@ -12814,27 +12820,27 @@ var FuzzyMatcher = class {
     if (byWordTo == len && byWord[0] == 0 && wordAdjacent)
       return this.result(-100 + (byWordFolded ? -200 : 0), byWord, word);
     if (adjacentTo == len && adjacentStart == 0)
-      return [-200 - word.length + (adjacentEnd == word.length ? 0 : -100), 0, adjacentEnd];
+      return this.ret(-200 - word.length + (adjacentEnd == word.length ? 0 : -100), [0, adjacentEnd]);
     if (direct > -1)
-      return [-700 - word.length, direct, direct + this.pattern.length];
+      return this.ret(-700 - word.length, [direct, direct + this.pattern.length]);
     if (adjacentTo == len)
-      return [-200 + -700 - word.length, adjacentStart, adjacentEnd];
+      return this.ret(-200 + -700 - word.length, [adjacentStart, adjacentEnd]);
     if (byWordTo == len)
       return this.result(-100 + (byWordFolded ? -200 : 0) + -700 + (wordAdjacent ? 0 : -1100), byWord, word);
-    return chars.length == 2 ? null : this.result((any[0] ? -700 : 0) + -200 + -1100, any, word);
+    return chars.length == 2 ? false : this.result((any[0] ? -700 : 0) + -200 + -1100, any, word);
   }
   result(score2, positions, word) {
-    let result = [score2 - word.length], i = 1;
+    let result = [], i = 0;
     for (let pos of positions) {
       let to = pos + (this.astral ? codePointSize(codePointAt(word, pos)) : 1);
-      if (i > 1 && result[i - 1] == pos)
+      if (i && result[i - 1] == pos)
         result[i - 1] = to;
       else {
         result[i++] = pos;
         result[i++] = to;
       }
     }
-    return result;
+    return this.ret(score2 - word.length, result);
   }
 };
 var completionConfig = /* @__PURE__ */ Facet.define({
@@ -12917,8 +12923,8 @@ function optionContent(config2) {
     render(completion, _s, match) {
       let labelElt = document.createElement("span");
       labelElt.className = "cm-completionLabel";
-      let { label } = completion, off = 0;
-      for (let j = 1; j < match.length; ) {
+      let label = completion.displayLabel || completion.label, off = 0;
+      for (let j = 0; j < match.length; ) {
         let from = match[j++], to = match[j++];
         if (from > off)
           labelElt.appendChild(document.createTextNode(label.slice(off, from)));
@@ -13204,20 +13210,17 @@ function sortOptions(active, state) {
   };
   for (let a of active)
     if (a.hasResult()) {
+      let getMatch = a.result.getMatch;
       if (a.result.filter === false) {
-        let getMatch = a.result.getMatch;
         for (let option of a.result.options) {
-          let match = [1e9 - options.length];
-          if (getMatch)
-            for (let n of getMatch(option))
-              match.push(n);
-          addOption(new Option(option, a.source, match, match[0]));
+          addOption(new Option(option, a.source, getMatch ? getMatch(option) : [], 1e9 - options.length));
         }
       } else {
-        let matcher = new FuzzyMatcher(state.sliceDoc(a.from, a.to)), match;
+        let matcher = new FuzzyMatcher(state.sliceDoc(a.from, a.to));
         for (let option of a.result.options)
-          if (match = matcher.match(option.label)) {
-            addOption(new Option(option, a.source, match, match[0] + (option.boost || 0)));
+          if (matcher.match(option.label)) {
+            let matched = !option.displayLabel ? matcher.matched : getMatch ? getMatch(option, matcher.matched) : [];
+            addOption(new Option(option, a.source, matched, matcher.score + (option.boost || 0)));
           }
       }
     }