@codemirror/language 0.18.1 → 0.18.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.18.2 (2021-06-01)
+
+### Bug fixes
+
+Fix an issue where asynchronous re-parsing (with dynamically loaded languages) sometimes failed to fully happen.
+
 ## 0.18.1 (2021-03-31)
 
 ### Breaking changes

package/dist/index.cjs

@@ -483,11 +483,11 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
         }
         this.checkAsyncSchedule(cx);
     }
-    scheduleWork(force = false) {
+    scheduleWork() {
         if (this.working > -1)
             return;
-        let { state } = this.view, field = state.field(Language.state);
-        if (!force && field.tree.length >= state.doc.length)
+        let { state } = this.view, field = state.field(Language.state), frags = field.context.fragments;
+        if (field.tree.length >= state.doc.length && frags.length && frags[0].from == 0 && frags[0].to >= state.doc.length)
             return;
         this.working = requestIdle(this.work, { timeout: 500 /* Pause */ });
     }
@@ -516,7 +516,7 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
     }
     checkAsyncSchedule(cx) {
         if (cx.scheduleOn) {
-            cx.scheduleOn.then(() => this.scheduleWork(true));
+            cx.scheduleOn.then(() => this.scheduleWork());
             cx.scheduleOn = null;
         }
     }

package/dist/index.js

@@ -7,7 +7,7 @@ import { ViewPlugin } from '@codemirror/view';
 Node prop stored in a grammar's top syntax node to provide the
 facet that stores language data for that language.
 */
-const languageDataProp = new NodeProp();
+const languageDataProp = /*@__PURE__*/new NodeProp();
 /**
 Helper function to define a facet (to be added to the top syntax
 node(s) for a language via
@@ -108,7 +108,7 @@ class Language {
 /**
 @internal
 */
-Language.setState = StateEffect.define();
+Language.setState = /*@__PURE__*/StateEffect.define();
 function languageDataFacetAt(state, pos) {
     let topLang = state.facet(language);
     if (!topLang)
@@ -407,7 +407,7 @@ class EditorParseContext {
 /**
 FIXME backwards compatible shim, remove on next major @internal
 */
-EditorParseContext.skippingParser = EditorParseContext.getSkippingParser();
+EditorParseContext.skippingParser = /*@__PURE__*/EditorParseContext.getSkippingParser();
 function cutFragments(fragments, from, to) {
     return TreeFragment.applyChanges(fragments, [{ fromA: from, toA: to, fromB: from, toB: to }]);
 }
@@ -439,7 +439,7 @@ class LanguageState {
         return new LanguageState(parseState);
     }
 }
-Language.state = StateField.define({
+Language.state = /*@__PURE__*/StateField.define({
     create: LanguageState.init,
     update(value, tr) {
         for (let e of tr.effects)
@@ -453,7 +453,7 @@ Language.state = StateField.define({
 let requestIdle = typeof window != "undefined" && window.requestIdleCallback ||
     ((callback, { timeout }) => setTimeout(callback, timeout));
 let cancelIdle = typeof window != "undefined" && window.cancelIdleCallback || clearTimeout;
-const parseWorker = ViewPlugin.fromClass(class ParseWorker {
+const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
     constructor(view) {
         this.view = view;
         this.working = -1;
@@ -479,11 +479,11 @@ const parseWorker = ViewPlugin.fromClass(class ParseWorker {
         }
         this.checkAsyncSchedule(cx);
     }
-    scheduleWork(force = false) {
+    scheduleWork() {
         if (this.working > -1)
             return;
-        let { state } = this.view, field = state.field(Language.state);
-        if (!force && field.tree.length >= state.doc.length)
+        let { state } = this.view, field = state.field(Language.state), frags = field.context.fragments;
+        if (field.tree.length >= state.doc.length && frags.length && frags[0].from == 0 && frags[0].to >= state.doc.length)
             return;
         this.working = requestIdle(this.work, { timeout: 500 /* Pause */ });
     }
@@ -512,7 +512,7 @@ const parseWorker = ViewPlugin.fromClass(class ParseWorker {
     }
     checkAsyncSchedule(cx) {
         if (cx.scheduleOn) {
-            cx.scheduleOn.then(() => this.scheduleWork(true));
+            cx.scheduleOn.then(() => this.scheduleWork());
             cx.scheduleOn = null;
         }
     }
@@ -526,7 +526,7 @@ const parseWorker = ViewPlugin.fromClass(class ParseWorker {
 /**
 The facet used to associate a language with an editor state.
 */
-const language = Facet.define({
+const language = /*@__PURE__*/Facet.define({
     combine(languages) { return languages.length ? languages[0] : null; },
     enables: [Language.state, parseWorker]
 });
@@ -654,13 +654,13 @@ Facet that defines a way to provide a function that computes the
 appropriate indentation depth at the start of a given line, or
 `null` to indicate no appropriate indentation could be determined.
 */
-const indentService = Facet.define();
+const indentService = /*@__PURE__*/Facet.define();
 /**
 Facet for overriding the unit by which indentation happens.
 Should be a string consisting either entirely of spaces or
 entirely of tabs. When not set, this defaults to 2 spaces.
 */
-const indentUnit = Facet.define({
+const indentUnit = /*@__PURE__*/Facet.define({
     combine: values => {
         if (!values.length)
             return "  ";
@@ -788,7 +788,7 @@ with node types. Such a strategy is a function from an indentation
 context to a column number or null, where null indicates that no
 definitive indentation can be determined.
 */
-const indentNodeProp = new NodeProp();
+const indentNodeProp = /*@__PURE__*/new NodeProp();
 // Compute the indentation for a given position from the syntax tree.
 function syntaxIndentation(cx, ast, pos) {
     let tree = ast.resolve(pos);
@@ -1012,14 +1012,14 @@ the extent of a line, such a function should return a foldable
 range that starts on that line (but continues beyond it), if one
 can be found.
 */
-const foldService = Facet.define();
+const foldService = /*@__PURE__*/Facet.define();
 /**
 This node prop is used to associate folding information with
 syntax node types. Given a syntax node, it should check whether
 that tree is foldable and return the range that can be collapsed
 when it is.
 */
-const foldNodeProp = new NodeProp();
+const foldNodeProp = /*@__PURE__*/new NodeProp();
 /**
 [Fold](https://codemirror.net/6/docs/ref/#language.foldNodeProp) function that folds everything but
 the first and the last child of a syntax node. Useful for nodes

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@codemirror/language",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
-    "test": "mocha test/test-*.js",
+    "test": "cm-runtests",
     "prepare": "cm-buildhelper src/index.ts"
   },
   "keywords": [
@@ -33,11 +33,8 @@
     "lezer-tree": "^0.13.0"
   },
   "devDependencies": {
-    "@codemirror/buildhelper": "^0.1.0",
-    "@types/mocha": "^5.2.0",
-    "ist": "^1.1.6",
-    "lezer-javascript": "^0.13.0",
-    "mocha": "^7.1.1"
+    "@codemirror/buildhelper": "^0.1.5",
+    "lezer-javascript": "^0.13.0"
   },
   "repository": {
     "type": "git",