@codemirror/language 6.10.1 → 6.10.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.10.2 (2024-06-03)
+
+### Bug fixes
+
+Fix an infinite loop that could occur when enabling `bidiIsolates` in documents with both bidirectional text and very long lines.
+
 ## 6.10.1 (2024-02-02)
 
 ### Bug fixes

package/dist/index.cjs

@@ -2619,9 +2619,13 @@ function buildDeco(view, tree, always) {
 function clipRTLLines(ranges, doc) {
     let cur = doc.iter(), pos = 0, result = [], last = null;
     for (let { from, to } of ranges) {
-        if (from != pos) {
-            if (pos < from)
-                cur.next(from - pos);
+        if (last && last.to > from) {
+            from = last.to;
+            if (from >= to)
+                continue;
+        }
+        if (pos + cur.value.length < from) {
+            cur.next(from - (pos + cur.value.length));
             pos = from;
         }
         for (;;) {
@@ -2632,7 +2636,7 @@ function clipRTLLines(ranges, doc) {
                 else
                     result.push(last = { from: start, to: Math.min(to, end) });
             }
-            if (pos >= to)
+            if (end >= to)
                 break;
             pos = end;
             cur.next();

package/dist/index.js

@@ -2617,9 +2617,13 @@ function buildDeco(view, tree, always) {
 function clipRTLLines(ranges, doc) {
     let cur = doc.iter(), pos = 0, result = [], last = null;
     for (let { from, to } of ranges) {
-        if (from != pos) {
-            if (pos < from)
-                cur.next(from - pos);
+        if (last && last.to > from) {
+            from = last.to;
+            if (from >= to)
+                continue;
+        }
+        if (pos + cur.value.length < from) {
+            cur.next(from - (pos + cur.value.length));
             pos = from;
         }
         for (;;) {
@@ -2630,7 +2634,7 @@ function clipRTLLines(ranges, doc) {
                 else
                     result.push(last = { from: start, to: Math.min(to, end) });
             }
-            if (pos >= to)
+            if (end >= to)
                 break;
             pos = end;
             cur.next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/language",
-  "version": "6.10.1",
+  "version": "6.10.2",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",