@codemirror/state 6.1.2 → 6.1.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.1.4 (2022-11-15)
+
+### Bug fixes
+
+Fix a bug that caused the `openStart` value passed to span iterators to be incorrect around widgets in some circumstances.
+
+## 6.1.3 (2022-11-10)
+
+### Bug fixes
+
+Avoid unnecessary calls to computed facet getters when a state is reconfigured but no dependencies of the computed facet change.
+
+Fix an infinite loop in `RangeSet.eq` when the `to` parameter isn't given.
+
 ## 6.1.2 (2022-09-21)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1664,18 +1664,20 @@ class FacetProvider {
                 return 0;
             },
             reconfigure: (state, oldState) => {
-                let newVal = getter(state);
-                let oldAddr = oldState.config.address[id];
+                let newVal, oldAddr = oldState.config.address[id];
                 if (oldAddr != null) {
                     let oldVal = getAddr(oldState, oldAddr);
                     if (this.dependencies.every(dep => {
                         return dep instanceof Facet ? oldState.facet(dep) === state.facet(dep) :
                             dep instanceof StateField ? oldState.field(dep, false) == state.field(dep, false) : true;
-                    }) || (multi ? compareArray(newVal, oldVal, compare) : compare(newVal, oldVal))) {
+                    }) || (multi ? compareArray(newVal = getter(state), oldVal, compare) : compare(newVal = getter(state), oldVal))) {
                         state.values[idx] = oldVal;
                         return 0;
                     }
                 }
+                else {
+                    newVal = getter(state);
+                }
                 state.values[idx] = newVal;
                 return 1 /* SlotStatus.Changed */;
             }
@@ -2810,6 +2812,18 @@ class EditorState {
     /**
     Find the values for a given language data field, provided by the
     the [`languageData`](https://codemirror.net/6/docs/ref/#state.EditorState^languageData) facet.
+    
+    Examples of language data fields are...
+    
+    - [`"commentTokens"`](https://codemirror.net/6/docs/ref/#commands.CommentTokens) for specifying
+      comment syntax.
+    - [`"autocomplete"`](https://codemirror.net/6/docs/ref/#autocomplete.autocompletion^config.override)
+      for providing language-specific completion sources.
+    - [`"wordChars"`](https://codemirror.net/6/docs/ref/#state.EditorState.charCategorizer) for adding
+      characters that should be considered part of words in this
+      language.
+    - [`"closeBrackets"`](https://codemirror.net/6/docs/ref/#autocomplete.CloseBracketConfig) controls
+      bracket closing behavior.
     */
     languageDataAt(name, pos, side = -1) {
         let values = [];
@@ -3314,7 +3328,7 @@ class RangeSet {
     */
     static eq(oldSets, newSets, from = 0, to) {
         if (to == null)
-            to = 1000000000 /* C.Far */;
+            to = 1000000000 /* C.Far */ - 1;
         let a = oldSets.filter(set => !set.isEmpty && newSets.indexOf(set) < 0);
         let b = newSets.filter(set => !set.isEmpty && oldSets.indexOf(set) < 0);
         if (a.length != b.length)
@@ -3348,23 +3362,24 @@ class RangeSet {
     */
     minPointSize = -1) {
         let cursor = new SpanCursor(sets, null, minPointSize).goto(from), pos = from;
-        let open = cursor.openStart;
+        let openRanges = cursor.openStart;
         for (;;) {
             let curTo = Math.min(cursor.to, to);
             if (cursor.point) {
-                iterator.point(pos, curTo, cursor.point, cursor.activeForPoint(cursor.to), open, cursor.pointRank);
-                open = cursor.openEnd(curTo) + (cursor.to > curTo ? 1 : 0);
+                let active = cursor.activeForPoint(cursor.to);
+                let openCount = cursor.pointFrom < from ? active.length + 1 : Math.min(active.length, openRanges);
+                iterator.point(pos, curTo, cursor.point, active, openCount, cursor.pointRank);
+                openRanges = Math.min(cursor.openEnd(curTo), active.length);
             }
             else if (curTo > pos) {
-                iterator.span(pos, curTo, cursor.active, open);
-                open = cursor.openEnd(curTo);
+                iterator.span(pos, curTo, cursor.active, openRanges);
+                openRanges = cursor.openEnd(curTo);
             }
             if (cursor.to > to)
-                break;
+                return openRanges + (cursor.point && cursor.to > to ? 1 : 0);
             pos = cursor.to;
             cursor.next();
         }
-        return open;
     }
     /**
     Create a range set for the given range or array of ranges. By
@@ -3668,6 +3683,8 @@ class SpanCursor {
         this.pointRank = 0;
         this.to = -1000000000 /* C.Far */;
         this.endSide = 0;
+        // The amount of open active ranges at the start of the iterator.
+        // Not including points.
         this.openStart = -1;
         this.cursor = HeapCursor.from(sets, skip, minPoint);
     }
@@ -3708,7 +3725,7 @@ class SpanCursor {
     next() {
         let from = this.to, wasPoint = this.point;
         this.point = null;
-        let trackOpen = this.openStart < 0 ? [] : null, trackExtra = 0;
+        let trackOpen = this.openStart < 0 ? [] : null;
         for (;;) {
             let a = this.minActive;
             if (a > -1 && (this.activeTo[a] - this.cursor.from || this.active[a].endSide - this.cursor.startSide) < 0) {
@@ -3734,8 +3751,6 @@ class SpanCursor {
                 let nextVal = this.cursor.value;
                 if (!nextVal.point) { // Opening a range
                     this.addActive(trackOpen);
-                    if (this.cursor.from < from && this.cursor.to > from)
-                        trackExtra++;
                     this.cursor.next();
                 }
                 else if (wasPoint && this.cursor.to == this.to && this.cursor.from < this.cursor.to) {
@@ -3748,8 +3763,6 @@ class SpanCursor {
                     this.pointRank = this.cursor.rank;
                     this.to = this.cursor.to;
                     this.endSide = nextVal.endSide;
-                    if (this.cursor.from < from)
-                        trackExtra = 1;
                     this.cursor.next();
                     this.forward(this.to, this.endSide);
                     break;
@@ -3757,10 +3770,9 @@ class SpanCursor {
             }
         }
         if (trackOpen) {
-            let openStart = 0;
-            while (openStart < trackOpen.length && trackOpen[openStart] < from)
-                openStart++;
-            this.openStart = openStart + trackExtra;
+            this.openStart = 0;
+            for (let i = trackOpen.length - 1; i >= 0 && trackOpen[i] < from; i--)
+                this.openStart++;
         }
     }
     activeForPoint(to) {

package/dist/index.d.ts

@@ -1228,6 +1228,18 @@ declare class EditorState {
     /**
     Find the values for a given language data field, provided by the
     the [`languageData`](https://codemirror.net/6/docs/ref/#state.EditorState^languageData) facet.
+    
+    Examples of language data fields are...
+    
+    - [`"commentTokens"`](https://codemirror.net/6/docs/ref/#commands.CommentTokens) for specifying
+      comment syntax.
+    - [`"autocomplete"`](https://codemirror.net/6/docs/ref/#autocomplete.autocompletion^config.override)
+      for providing language-specific completion sources.
+    - [`"wordChars"`](https://codemirror.net/6/docs/ref/#state.EditorState.charCategorizer) for adding
+      characters that should be considered part of words in this
+      language.
+    - [`"closeBrackets"`](https://codemirror.net/6/docs/ref/#autocomplete.CloseBracketConfig) controls
+      bracket closing behavior.
     */
     languageDataAt<T>(name: string, pos: number, side?: -1 | 0 | 1): readonly T[];
     /**

package/dist/index.js

@@ -1659,18 +1659,20 @@ class FacetProvider {
                 return 0;
             },
             reconfigure: (state, oldState) => {
-                let newVal = getter(state);
-                let oldAddr = oldState.config.address[id];
+                let newVal, oldAddr = oldState.config.address[id];
                 if (oldAddr != null) {
                     let oldVal = getAddr(oldState, oldAddr);
                     if (this.dependencies.every(dep => {
                         return dep instanceof Facet ? oldState.facet(dep) === state.facet(dep) :
                             dep instanceof StateField ? oldState.field(dep, false) == state.field(dep, false) : true;
-                    }) || (multi ? compareArray(newVal, oldVal, compare) : compare(newVal, oldVal))) {
+                    }) || (multi ? compareArray(newVal = getter(state), oldVal, compare) : compare(newVal = getter(state), oldVal))) {
                         state.values[idx] = oldVal;
                         return 0;
                     }
                 }
+                else {
+                    newVal = getter(state);
+                }
                 state.values[idx] = newVal;
                 return 1 /* SlotStatus.Changed */;
             }
@@ -2804,6 +2806,18 @@ class EditorState {
     /**
     Find the values for a given language data field, provided by the
     the [`languageData`](https://codemirror.net/6/docs/ref/#state.EditorState^languageData) facet.
+    
+    Examples of language data fields are...
+    
+    - [`"commentTokens"`](https://codemirror.net/6/docs/ref/#commands.CommentTokens) for specifying
+      comment syntax.
+    - [`"autocomplete"`](https://codemirror.net/6/docs/ref/#autocomplete.autocompletion^config.override)
+      for providing language-specific completion sources.
+    - [`"wordChars"`](https://codemirror.net/6/docs/ref/#state.EditorState.charCategorizer) for adding
+      characters that should be considered part of words in this
+      language.
+    - [`"closeBrackets"`](https://codemirror.net/6/docs/ref/#autocomplete.CloseBracketConfig) controls
+      bracket closing behavior.
     */
     languageDataAt(name, pos, side = -1) {
         let values = [];
@@ -3308,7 +3322,7 @@ class RangeSet {
     */
     static eq(oldSets, newSets, from = 0, to) {
         if (to == null)
-            to = 1000000000 /* C.Far */;
+            to = 1000000000 /* C.Far */ - 1;
         let a = oldSets.filter(set => !set.isEmpty && newSets.indexOf(set) < 0);
         let b = newSets.filter(set => !set.isEmpty && oldSets.indexOf(set) < 0);
         if (a.length != b.length)
@@ -3342,23 +3356,24 @@ class RangeSet {
     */
     minPointSize = -1) {
         let cursor = new SpanCursor(sets, null, minPointSize).goto(from), pos = from;
-        let open = cursor.openStart;
+        let openRanges = cursor.openStart;
         for (;;) {
             let curTo = Math.min(cursor.to, to);
             if (cursor.point) {
-                iterator.point(pos, curTo, cursor.point, cursor.activeForPoint(cursor.to), open, cursor.pointRank);
-                open = cursor.openEnd(curTo) + (cursor.to > curTo ? 1 : 0);
+                let active = cursor.activeForPoint(cursor.to);
+                let openCount = cursor.pointFrom < from ? active.length + 1 : Math.min(active.length, openRanges);
+                iterator.point(pos, curTo, cursor.point, active, openCount, cursor.pointRank);
+                openRanges = Math.min(cursor.openEnd(curTo), active.length);
             }
             else if (curTo > pos) {
-                iterator.span(pos, curTo, cursor.active, open);
-                open = cursor.openEnd(curTo);
+                iterator.span(pos, curTo, cursor.active, openRanges);
+                openRanges = cursor.openEnd(curTo);
             }
             if (cursor.to > to)
-                break;
+                return openRanges + (cursor.point && cursor.to > to ? 1 : 0);
             pos = cursor.to;
             cursor.next();
         }
-        return open;
     }
     /**
     Create a range set for the given range or array of ranges. By
@@ -3662,6 +3677,8 @@ class SpanCursor {
         this.pointRank = 0;
         this.to = -1000000000 /* C.Far */;
         this.endSide = 0;
+        // The amount of open active ranges at the start of the iterator.
+        // Not including points.
         this.openStart = -1;
         this.cursor = HeapCursor.from(sets, skip, minPoint);
     }
@@ -3702,7 +3719,7 @@ class SpanCursor {
     next() {
         let from = this.to, wasPoint = this.point;
         this.point = null;
-        let trackOpen = this.openStart < 0 ? [] : null, trackExtra = 0;
+        let trackOpen = this.openStart < 0 ? [] : null;
         for (;;) {
             let a = this.minActive;
             if (a > -1 && (this.activeTo[a] - this.cursor.from || this.active[a].endSide - this.cursor.startSide) < 0) {
@@ -3728,8 +3745,6 @@ class SpanCursor {
                 let nextVal = this.cursor.value;
                 if (!nextVal.point) { // Opening a range
                     this.addActive(trackOpen);
-                    if (this.cursor.from < from && this.cursor.to > from)
-                        trackExtra++;
                     this.cursor.next();
                 }
                 else if (wasPoint && this.cursor.to == this.to && this.cursor.from < this.cursor.to) {
@@ -3742,8 +3757,6 @@ class SpanCursor {
                     this.pointRank = this.cursor.rank;
                     this.to = this.cursor.to;
                     this.endSide = nextVal.endSide;
-                    if (this.cursor.from < from)
-                        trackExtra = 1;
                     this.cursor.next();
                     this.forward(this.to, this.endSide);
                     break;
@@ -3751,10 +3764,9 @@ class SpanCursor {
             }
         }
         if (trackOpen) {
-            let openStart = 0;
-            while (openStart < trackOpen.length && trackOpen[openStart] < from)
-                openStart++;
-            this.openStart = openStart + trackExtra;
+            this.openStart = 0;
+            for (let i = trackOpen.length - 1; i >= 0 && trackOpen[i] < from; i--)
+                this.openStart++;
         }
     }
     activeForPoint(to) {

package/package.json

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