@codemirror/language 6.3.1 → 6.3.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.3.2 (2022-12-16)
+
+### Bug fixes
+
+Fix a bug that caused `ensureSyntaxTree` to return incomplete trees when using a viewport-aware parser like `StreamLanguage`.
+
 ## 6.3.1 (2022-11-14)
 
 ### Bug fixes

package/dist/index.cjs

@@ -183,7 +183,13 @@ 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.isDone(upto) || parse.work(timeout, upto) ? parse.tree : null;
+    if (!parse)
+        return null;
+    let oldVieport = parse.viewport;
+    parse.updateViewport({ from: 0, to: upto });
+    let result = parse.isDone(upto) || parse.work(timeout, upto) ? parse.tree : null;
+    parse.updateViewport(oldVieport);
+    return result;
 }
 /**
 Queries whether there is a full syntax tree available up to the
@@ -1682,7 +1688,7 @@ A default highlight style (works well with light themes).
 */
 const defaultHighlightStyle = HighlightStyle.define([
     { tag: highlight.tags.meta,
-        color: "#7a757a" },
+        color: "#404740" },
     { tag: highlight.tags.link,
         textDecoration: "underline" },
     { tag: highlight.tags.heading,

package/dist/index.js

@@ -179,7 +179,13 @@ 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.isDone(upto) || parse.work(timeout, upto) ? parse.tree : null;
+    if (!parse)
+        return null;
+    let oldVieport = parse.viewport;
+    parse.updateViewport({ from: 0, to: upto });
+    let result = parse.isDone(upto) || parse.work(timeout, upto) ? parse.tree : null;
+    parse.updateViewport(oldVieport);
+    return result;
 }
 /**
 Queries whether there is a full syntax tree available up to the
@@ -1678,7 +1684,7 @@ A default highlight style (works well with light themes).
 */
 const defaultHighlightStyle = /*@__PURE__*/HighlightStyle.define([
     { tag: tags.meta,
-        color: "#7a757a" },
+        color: "#404740" },
     { tag: tags.link,
         textDecoration: "underline" },
     { tag: tags.heading,

package/package.json

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