@codemirror/state 6.5.2 → 6.5.3

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 6.5.3 (2025-12-22)
+
+### Bug fixes
+
+Fix an issue where `RangeValue.eq` could get called with a value of a different class.
+
+`EditorState.charCategorizer` now only uses the highest-precedence set of word characters from the language data, to allow overriding these.
+
 ## 6.5.2 (2025-02-03)
 
 ### Bug fixes

package/dist/index.cjs

@@ -2827,7 +2827,8 @@ class EditorState {
      - Other (anything else)
     */
     charCategorizer(at) {
-        return makeCategorizer(this.languageDataAt("wordChars", at).join(""));
+        let chars = this.languageDataAt("wordChars", at);
+        return makeCategorizer(chars.length ? chars[0] : "");
     }
     /**
     Find the word at the given position, meaning the range
@@ -3013,6 +3014,9 @@ class RangeValue {
 RangeValue.prototype.startSide = RangeValue.prototype.endSide = 0;
 RangeValue.prototype.point = false;
 RangeValue.prototype.mapMode = exports.MapMode.TrackDel;
+function cmpVal(a, b) {
+    return a == b || a.constructor == b.constructor && a.eq(b);
+}
 /**
 A range associates a value with a range of positions.
 */
@@ -3319,7 +3323,7 @@ class RangeSet {
         for (;;) {
             if (sideA.to != sideB.to ||
                 !sameValues(sideA.active, sideB.active) ||
-                sideA.point && (!sideB.point || !sideA.point.eq(sideB.point)))
+                sideA.point && (!sideB.point || !cmpVal(sideA.point, sideB.point)))
                 return false;
             if (sideA.to > to)
                 return true;
@@ -3794,22 +3798,27 @@ function compare(a, startA, b, startB, length, comparator) {
     b.goto(startB);
     let endB = startB + length;
     let pos = startB, dPos = startB - startA;
-    for (;;) {
+    let bounds = !!comparator.boundChange;
+    for (let boundChange = false;;) {
         let dEnd = (a.to + dPos) - b.to, diff = dEnd || a.endSide - b.endSide;
         let end = diff < 0 ? a.to + dPos : b.to, clipEnd = Math.min(end, endB);
-        if (a.point || b.point) {
-            if (!(a.point && b.point && (a.point == b.point || a.point.eq(b.point)) &&
+        let point = a.point || b.point;
+        if (point) {
+            if (!(a.point && b.point && cmpVal(a.point, b.point) &&
                 sameValues(a.activeForPoint(a.to), b.activeForPoint(b.to))))
                 comparator.comparePoint(pos, clipEnd, a.point, b.point);
+            boundChange = false;
         }
         else {
+            if (boundChange)
+                comparator.boundChange(pos);
             if (clipEnd > pos && !sameValues(a.active, b.active))
                 comparator.compareRange(pos, clipEnd, a.active, b.active);
+            if (bounds && clipEnd < endB && (dEnd || a.openEnd(end) != b.openEnd(end)))
+                boundChange = true;
         }
         if (end > endB)
             break;
-        if ((dEnd || a.openEnd != b.openEnd) && comparator.boundChange)
-            comparator.boundChange(end);
         pos = end;
         if (diff <= 0)
             a.next();
@@ -3821,7 +3830,7 @@ function sameValues(a, b) {
     if (a.length != b.length)
         return false;
     for (let i = 0; i < a.length; i++)
-        if (a[i] != b[i] && !a[i].eq(b[i]))
+        if (a[i] != b[i] && !cmpVal(a[i], b[i]))
             return false;
     return true;
 }

package/dist/index.d.cts

@@ -221,12 +221,13 @@ declare class ChangeDesc {
     position pointing into the new document.
     
     `assoc` indicates which side the position should be associated
-    with. When it is negative or zero, the mapping will try to keep
-    the position close to the character before it (if any), and will
+    with. When it is negative, the mapping will try to keep the
+    position close to the character before it (if any), and will
     move it before insertions at that point or replacements across
-    that point. When it is positive, the position is associated with
-    the character after it, and will be moved forward for insertions
-    at or replacements across the position. Defaults to -1.
+    that point. When it is zero or positive, the position is associated
+    with the character after it, and will be moved forward for
+    */
+    /**
     
     `mode` determines whether deletions should be
     [reported](https://codemirror.net/6/docs/ref/#state.MapMode). It defaults to
@@ -1488,7 +1489,11 @@ interface RangeCursor<T> {
     /**
     Move the iterator forward.
     */
-    next: () => void;
+    next(): void;
+    /**
+    Jump the cursor to the given position.
+    */
+    goto(pos: number): void;
     /**
     The next range's value. Holds `null` when the cursor has reached
     its end.
@@ -1502,6 +1507,11 @@ interface RangeCursor<T> {
     The next end position.
     */
     to: number;
+    /**
+    The position of the set that this range comes from in the array
+    of sets being iterated over.
+    */
+    rank: number;
 }
 type RangeSetUpdate<T extends RangeValue> = {
     /**

package/dist/index.d.ts

@@ -221,12 +221,13 @@ declare class ChangeDesc {
     position pointing into the new document.
     
     `assoc` indicates which side the position should be associated
-    with. When it is negative or zero, the mapping will try to keep
-    the position close to the character before it (if any), and will
+    with. When it is negative, the mapping will try to keep the
+    position close to the character before it (if any), and will
     move it before insertions at that point or replacements across
-    that point. When it is positive, the position is associated with
-    the character after it, and will be moved forward for insertions
-    at or replacements across the position. Defaults to -1.
+    that point. When it is zero or positive, the position is associated
+    with the character after it, and will be moved forward for
+    */
+    /**
     
     `mode` determines whether deletions should be
     [reported](https://codemirror.net/6/docs/ref/#state.MapMode). It defaults to
@@ -1488,7 +1489,11 @@ interface RangeCursor<T> {
     /**
     Move the iterator forward.
     */
-    next: () => void;
+    next(): void;
+    /**
+    Jump the cursor to the given position.
+    */
+    goto(pos: number): void;
     /**
     The next range's value. Holds `null` when the cursor has reached
     its end.
@@ -1502,6 +1507,11 @@ interface RangeCursor<T> {
     The next end position.
     */
     to: number;
+    /**
+    The position of the set that this range comes from in the array
+    of sets being iterated over.
+    */
+    rank: number;
 }
 type RangeSetUpdate<T extends RangeValue> = {
     /**

package/dist/index.js

@@ -2823,7 +2823,8 @@ class EditorState {
      - Other (anything else)
     */
     charCategorizer(at) {
-        return makeCategorizer(this.languageDataAt("wordChars", at).join(""));
+        let chars = this.languageDataAt("wordChars", at);
+        return makeCategorizer(chars.length ? chars[0] : "");
     }
     /**
     Find the word at the given position, meaning the range
@@ -3009,6 +3010,9 @@ class RangeValue {
 RangeValue.prototype.startSide = RangeValue.prototype.endSide = 0;
 RangeValue.prototype.point = false;
 RangeValue.prototype.mapMode = MapMode.TrackDel;
+function cmpVal(a, b) {
+    return a == b || a.constructor == b.constructor && a.eq(b);
+}
 /**
 A range associates a value with a range of positions.
 */
@@ -3315,7 +3319,7 @@ class RangeSet {
         for (;;) {
             if (sideA.to != sideB.to ||
                 !sameValues(sideA.active, sideB.active) ||
-                sideA.point && (!sideB.point || !sideA.point.eq(sideB.point)))
+                sideA.point && (!sideB.point || !cmpVal(sideA.point, sideB.point)))
                 return false;
             if (sideA.to > to)
                 return true;
@@ -3790,22 +3794,27 @@ function compare(a, startA, b, startB, length, comparator) {
     b.goto(startB);
     let endB = startB + length;
     let pos = startB, dPos = startB - startA;
-    for (;;) {
+    let bounds = !!comparator.boundChange;
+    for (let boundChange = false;;) {
         let dEnd = (a.to + dPos) - b.to, diff = dEnd || a.endSide - b.endSide;
         let end = diff < 0 ? a.to + dPos : b.to, clipEnd = Math.min(end, endB);
-        if (a.point || b.point) {
-            if (!(a.point && b.point && (a.point == b.point || a.point.eq(b.point)) &&
+        let point = a.point || b.point;
+        if (point) {
+            if (!(a.point && b.point && cmpVal(a.point, b.point) &&
                 sameValues(a.activeForPoint(a.to), b.activeForPoint(b.to))))
                 comparator.comparePoint(pos, clipEnd, a.point, b.point);
+            boundChange = false;
         }
         else {
+            if (boundChange)
+                comparator.boundChange(pos);
             if (clipEnd > pos && !sameValues(a.active, b.active))
                 comparator.compareRange(pos, clipEnd, a.active, b.active);
+            if (bounds && clipEnd < endB && (dEnd || a.openEnd(end) != b.openEnd(end)))
+                boundChange = true;
         }
         if (end > endB)
             break;
-        if ((dEnd || a.openEnd != b.openEnd) && comparator.boundChange)
-            comparator.boundChange(end);
         pos = end;
         if (diff <= 0)
             a.next();
@@ -3817,7 +3826,7 @@ function sameValues(a, b) {
     if (a.length != b.length)
         return false;
     for (let i = 0; i < a.length; i++)
-        if (a[i] != b[i] && !a[i].eq(b[i]))
+        if (a[i] != b[i] && !cmpVal(a[i], b[i]))
             return false;
     return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/state",
-  "version": "6.5.2",
+  "version": "6.5.3",
   "description": "Editor state data structures for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",