@codemirror/language 0.19.6 → 0.19.7

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.19.7 (2021-12-02)
+
+### Bug fixes
+
+Fix an issue where the parse worker could incorrectly stop working when the parse tree has skipped gaps in it.
+
 ## 0.19.6 (2021-11-26)
 
 ### Bug fixes

package/dist/index.cjs

@@ -179,7 +179,7 @@ up to that point if the tree isn't already available.
 function ensureSyntaxTree(state, upto, timeout = 50) {
     var _a;
     let parse = (_a = state.field(Language.state, false)) === null || _a === void 0 ? void 0 : _a.context;
-    return !parse ? null : parse.treeLen >= upto || parse.work(timeout, upto) ? parse.tree : null;
+    return !parse ? null : parse.isDone(upto) || parse.work(timeout, upto) ? parse.tree : null;
 }
 /**
 Queries whether there is a full syntax tree available up to the
@@ -452,6 +452,7 @@ class ParseContext {
     @internal
     */
     isDone(upto) {
+        upto = Math.min(upto, this.state.doc.length);
         let frags = this.fragments;
         return this.treeLen >= upto && frags.length && frags[0].from == 0 && frags[0].to >= upto;
     }
@@ -555,7 +556,7 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
         if (this.chunkBudget <= 0)
             return; // No more budget
         let { state, viewport: { to: vpTo } } = this.view, field = state.field(Language.state);
-        if (field.tree == field.context.tree && field.context.treeLen >= vpTo + 100000 /* MaxParseAhead */)
+        if (field.tree == field.context.tree && field.context.isDone(vpTo + 100000 /* MaxParseAhead */))
             return;
         let time = Math.min(this.chunkBudget, 100 /* Slice */, deadline ? Math.max(25 /* MinSlice */, deadline.timeRemaining() - 5) : 1e9);
         let viewportFirst = field.context.treeLen < vpTo && state.doc.length > vpTo + 1000;

package/dist/index.js

@@ -175,7 +175,7 @@ up to that point if the tree isn't already available.
 function ensureSyntaxTree(state, upto, timeout = 50) {
     var _a;
     let parse = (_a = state.field(Language.state, false)) === null || _a === void 0 ? void 0 : _a.context;
-    return !parse ? null : parse.treeLen >= upto || parse.work(timeout, upto) ? parse.tree : null;
+    return !parse ? null : parse.isDone(upto) || parse.work(timeout, upto) ? parse.tree : null;
 }
 /**
 Queries whether there is a full syntax tree available up to the
@@ -448,6 +448,7 @@ class ParseContext {
     @internal
     */
     isDone(upto) {
+        upto = Math.min(upto, this.state.doc.length);
         let frags = this.fragments;
         return this.treeLen >= upto && frags.length && frags[0].from == 0 && frags[0].to >= upto;
     }
@@ -551,7 +552,7 @@ const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
         if (this.chunkBudget <= 0)
             return; // No more budget
         let { state, viewport: { to: vpTo } } = this.view, field = state.field(Language.state);
-        if (field.tree == field.context.tree && field.context.treeLen >= vpTo + 100000 /* MaxParseAhead */)
+        if (field.tree == field.context.tree && field.context.isDone(vpTo + 100000 /* MaxParseAhead */))
             return;
         let time = Math.min(this.chunkBudget, 100 /* Slice */, deadline ? Math.max(25 /* MinSlice */, deadline.timeRemaining() - 5) : 1e9);
         let viewportFirst = field.context.treeLen < vpTo && state.doc.length > vpTo + 1000;

package/package.json

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