@codemirror/language 0.19.8 → 0.19.9

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.19.9 (2022-03-30)
+
+### Bug fixes
+
+Make sure nodes that end at the end of a partial parse aren't treated as valid fold targets.
+
+Fix an issue where the parser sometimes wouldn't reuse parsing work done in the background on transactions.
+
 ## 0.19.8 (2022-03-03)
 
 ### Bug fixes

package/dist/index.cjs

@@ -7,6 +7,7 @@ var state = require('@codemirror/state');
 var view = require('@codemirror/view');
 var text = require('@codemirror/text');
 
+var _a;
 /**
 Node prop stored in a grammar's top syntax node to provide the
 facet that stores language data for that language.
@@ -292,7 +293,7 @@ class ParseContext {
     /**
     @internal
     */
-    work(time, upto) {
+    work(until, upto) {
         if (upto != null && upto >= this.state.doc.length)
             upto = undefined;
         if (this.tree != common.Tree.empty && this.isDone(upto !== null && upto !== void 0 ? upto : this.state.doc.length)) {
@@ -301,7 +302,10 @@ class ParseContext {
         }
         return this.withContext(() => {
             var _a;
-            let endTime = Date.now() + time;
+            if (typeof until == "number") {
+                let endTime = Date.now() + until;
+                until = () => Date.now() > endTime;
+            }
             if (!this.parse)
                 this.parse = this.startParse();
             if (upto != null && (this.parse.stoppedAt == null || this.parse.stoppedAt > upto) &&
@@ -319,7 +323,7 @@ class ParseContext {
                     else
                         return true;
                 }
-                if (Date.now() > endTime)
+                if (until())
                     return false;
             }
         });
@@ -474,7 +478,7 @@ class LanguageState {
         this.tree = context.tree;
     }
     apply(tr) {
-        if (!tr.docChanged)
+        if (!tr.docChanged && this.tree == this.context.tree)
             return this;
         let newCx = this.context.changes(tr.changes, tr.state);
         // If the previous parse wasn't done, go forward only up to its
@@ -516,6 +520,8 @@ if (typeof requestIdleCallback != "undefined")
         }, 100 /* MinPause */);
         return () => idle < 0 ? clearTimeout(timeout) : cancelIdleCallback(idle);
     };
+const isInputPending = typeof navigator != "undefined" && ((_a = navigator.scheduling) === null || _a === void 0 ? void 0 : _a.isInputPending)
+    ? () => navigator.scheduling.isInputPending() : null;
 const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
     constructor(view) {
         this.view = view;
@@ -558,9 +564,11 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
         let { state, viewport: { to: vpTo } } = this.view, field = state.field(Language.state);
         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 endTime = Date.now() + Math.min(this.chunkBudget, 100 /* Slice */, deadline && !isInputPending ? Math.max(25 /* MinSlice */, deadline.timeRemaining() - 5) : 1e9);
         let viewportFirst = field.context.treeLen < vpTo && state.doc.length > vpTo + 1000;
-        let done = field.context.work(time, vpTo + (viewportFirst ? 0 : 100000 /* MaxParseAhead */));
+        let done = field.context.work(() => {
+            return isInputPending && isInputPending() || Date.now() > endTime;
+        }, vpTo + (viewportFirst ? 0 : 100000 /* MaxParseAhead */));
         this.chunkBudget -= Date.now() - now;
         if (done || this.chunkBudget <= 0) {
             field.context.takeTree();
@@ -585,7 +593,7 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
             this.working();
     }
     isWorking() {
-        return this.working || this.workScheduled > 0;
+        return !!(this.working || this.workScheduled > 0);
     }
 }, {
     eventHandlers: { focus() { this.scheduleWork(); } }
@@ -1123,7 +1131,7 @@ function syntaxFolding(state, start, end) {
         if (found && cur.from < start)
             break;
         let prop = cur.type.prop(foldNodeProp);
-        if (prop) {
+        if (prop && (cur.to < tree.length - 50 || tree.length == state.doc.length || !isUnfinished(cur))) {
             let value = prop(cur, state);
             if (value && value.from <= end && value.from >= start && value.to > end)
                 found = value;
@@ -1131,6 +1139,10 @@ function syntaxFolding(state, start, end) {
     }
     return found;
 }
+function isUnfinished(node) {
+    let ch = node.lastChild;
+    return ch && ch.to == node.to && ch.type.isError;
+}
 /**
 Check whether the given line is foldable. First asks any fold
 services registered through

package/dist/index.d.ts

@@ -156,7 +156,7 @@ stopped running, either because it parsed the entire document,
 because it spent too much time and was cut off, or because there
 is no language parser enabled.
 */
-declare function syntaxParserRunning(view: EditorView): boolean | (() => void);
+declare function syntaxParserRunning(view: EditorView): boolean;
 /**
 A parse context provided to parsers working on the editor content.
 */

package/dist/index.js

@@ -3,6 +3,7 @@ import { StateEffect, StateField, Facet, EditorState } from '@codemirror/state';
 import { ViewPlugin, logException } from '@codemirror/view';
 import { countColumn } from '@codemirror/text';
 
+var _a;
 /**
 Node prop stored in a grammar's top syntax node to provide the
 facet that stores language data for that language.
@@ -288,7 +289,7 @@ class ParseContext {
     /**
     @internal
     */
-    work(time, upto) {
+    work(until, upto) {
         if (upto != null && upto >= this.state.doc.length)
             upto = undefined;
         if (this.tree != Tree.empty && this.isDone(upto !== null && upto !== void 0 ? upto : this.state.doc.length)) {
@@ -297,7 +298,10 @@ class ParseContext {
         }
         return this.withContext(() => {
             var _a;
-            let endTime = Date.now() + time;
+            if (typeof until == "number") {
+                let endTime = Date.now() + until;
+                until = () => Date.now() > endTime;
+            }
             if (!this.parse)
                 this.parse = this.startParse();
             if (upto != null && (this.parse.stoppedAt == null || this.parse.stoppedAt > upto) &&
@@ -315,7 +319,7 @@ class ParseContext {
                     else
                         return true;
                 }
-                if (Date.now() > endTime)
+                if (until())
                     return false;
             }
         });
@@ -470,7 +474,7 @@ class LanguageState {
         this.tree = context.tree;
     }
     apply(tr) {
-        if (!tr.docChanged)
+        if (!tr.docChanged && this.tree == this.context.tree)
             return this;
         let newCx = this.context.changes(tr.changes, tr.state);
         // If the previous parse wasn't done, go forward only up to its
@@ -512,6 +516,8 @@ if (typeof requestIdleCallback != "undefined")
         }, 100 /* MinPause */);
         return () => idle < 0 ? clearTimeout(timeout) : cancelIdleCallback(idle);
     };
+const isInputPending = typeof navigator != "undefined" && ((_a = navigator.scheduling) === null || _a === void 0 ? void 0 : _a.isInputPending)
+    ? () => navigator.scheduling.isInputPending() : null;
 const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
     constructor(view) {
         this.view = view;
@@ -554,9 +560,11 @@ const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
         let { state, viewport: { to: vpTo } } = this.view, field = state.field(Language.state);
         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 endTime = Date.now() + Math.min(this.chunkBudget, 100 /* Slice */, deadline && !isInputPending ? Math.max(25 /* MinSlice */, deadline.timeRemaining() - 5) : 1e9);
         let viewportFirst = field.context.treeLen < vpTo && state.doc.length > vpTo + 1000;
-        let done = field.context.work(time, vpTo + (viewportFirst ? 0 : 100000 /* MaxParseAhead */));
+        let done = field.context.work(() => {
+            return isInputPending && isInputPending() || Date.now() > endTime;
+        }, vpTo + (viewportFirst ? 0 : 100000 /* MaxParseAhead */));
         this.chunkBudget -= Date.now() - now;
         if (done || this.chunkBudget <= 0) {
             field.context.takeTree();
@@ -581,7 +589,7 @@ const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
             this.working();
     }
     isWorking() {
-        return this.working || this.workScheduled > 0;
+        return !!(this.working || this.workScheduled > 0);
     }
 }, {
     eventHandlers: { focus() { this.scheduleWork(); } }
@@ -1119,7 +1127,7 @@ function syntaxFolding(state, start, end) {
         if (found && cur.from < start)
             break;
         let prop = cur.type.prop(foldNodeProp);
-        if (prop) {
+        if (prop && (cur.to < tree.length - 50 || tree.length == state.doc.length || !isUnfinished(cur))) {
             let value = prop(cur, state);
             if (value && value.from <= end && value.from >= start && value.to > end)
                 found = value;
@@ -1127,6 +1135,10 @@ function syntaxFolding(state, start, end) {
     }
     return found;
 }
+function isUnfinished(node) {
+    let ch = node.lastChild;
+    return ch && ch.to == node.to && ch.type.isError;
+}
 /**
 Check whether the given line is foldable. First asks any fold
 services registered through

package/package.json

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