@codemirror/language 6.10.0 → 6.10.2

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 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
+
+Fix an issue where, when a lot of code is visible in the initial editor, the bottom bit of code is shown without highlighting for one frame.
+
 ## 6.10.0 (2023-12-28)
 
 ### New features

package/dist/index.cjs

@@ -1751,16 +1751,20 @@ class TreeHighlighter {
         this.markCache = Object.create(null);
         this.tree = syntaxTree(view.state);
         this.decorations = this.buildDeco(view, getHighlighters(view.state));
+        this.decoratedTo = view.viewport.to;
     }
     update(update) {
         let tree = syntaxTree(update.state), highlighters = getHighlighters(update.state);
         let styleChange = highlighters != getHighlighters(update.startState);
-        if (tree.length < update.view.viewport.to && !styleChange && tree.type == this.tree.type) {
+        let { viewport } = update.view, decoratedToMapped = update.changes.mapPos(this.decoratedTo, 1);
+        if (tree.length < viewport.to && !styleChange && tree.type == this.tree.type && decoratedToMapped >= viewport.to) {
             this.decorations = this.decorations.map(update.changes);
+            this.decoratedTo = decoratedToMapped;
         }
         else if (tree != this.tree || update.viewportChanged || styleChange) {
             this.tree = tree;
             this.decorations = this.buildDeco(update.view, highlighters);
+            this.decoratedTo = viewport.to;
         }
     }
     buildDeco(view$1, highlighters) {
@@ -2568,7 +2572,7 @@ const isolateMarks = view.ViewPlugin.fromClass(class {
             view$1.state.facet(view.EditorView.perLineTextDirection);
         this.hasRTL = !this.always && textHasRTL(view$1.state.doc);
         this.tree = syntaxTree(view$1.state);
-        this.decorations = buildDeco(view$1, this.tree, this.always);
+        this.decorations = this.always || this.hasRTL ? buildDeco(view$1, this.tree, this.always) : view.Decoration.none;
     }
     update(update) {
         let always = update.state.facet(alwaysIsolate) ||
@@ -2615,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 (;;) {
@@ -2628,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

@@ -1749,16 +1749,20 @@ class TreeHighlighter {
         this.markCache = Object.create(null);
         this.tree = syntaxTree(view.state);
         this.decorations = this.buildDeco(view, getHighlighters(view.state));
+        this.decoratedTo = view.viewport.to;
     }
     update(update) {
         let tree = syntaxTree(update.state), highlighters = getHighlighters(update.state);
         let styleChange = highlighters != getHighlighters(update.startState);
-        if (tree.length < update.view.viewport.to && !styleChange && tree.type == this.tree.type) {
+        let { viewport } = update.view, decoratedToMapped = update.changes.mapPos(this.decoratedTo, 1);
+        if (tree.length < viewport.to && !styleChange && tree.type == this.tree.type && decoratedToMapped >= viewport.to) {
             this.decorations = this.decorations.map(update.changes);
+            this.decoratedTo = decoratedToMapped;
         }
         else if (tree != this.tree || update.viewportChanged || styleChange) {
             this.tree = tree;
             this.decorations = this.buildDeco(update.view, highlighters);
+            this.decoratedTo = viewport.to;
         }
     }
     buildDeco(view, highlighters) {
@@ -2566,7 +2570,7 @@ const isolateMarks = /*@__PURE__*/ViewPlugin.fromClass(class {
             view.state.facet(EditorView.perLineTextDirection);
         this.hasRTL = !this.always && textHasRTL(view.state.doc);
         this.tree = syntaxTree(view.state);
-        this.decorations = buildDeco(view, this.tree, this.always);
+        this.decorations = this.always || this.hasRTL ? buildDeco(view, this.tree, this.always) : Decoration.none;
     }
     update(update) {
         let always = update.state.facet(alwaysIsolate) ||
@@ -2613,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 (;;) {
@@ -2626,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.0",
+  "version": "6.10.2",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",