@codemirror/language 6.3.0 → 6.3.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 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
+
+Make syntax-based folding include syntax nodes that start right at the end of a line as potential fold targets.
+
+Fix the `indentService` protocol to allow a distinction between declining to handle the indentation and returning null to indicate the line has no definite indentation.
+
 ## 6.3.0 (2022-10-24)
 
 ### New features

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
@@ -767,8 +773,10 @@ class LanguageDescription {
 Facet that defines a way to provide a function that computes the
 appropriate indentation depth, as a column number (see
 [`indentString`](https://codemirror.net/6/docs/ref/#language.indentString)), at the start of a given
-line, or `null` to indicate no appropriate indentation could be
-determined.
+line. A return value of `null` indicates no indentation can be
+determined, and the line should inherit the indentation of the one
+above it. A return value of `undefined` defers to the next indent
+service.
 */
 const indentService = state.Facet.define();
 /**
@@ -826,7 +834,7 @@ function getIndentation(context, pos) {
         context = new IndentContext(context);
     for (let service of context.state.facet(indentService)) {
         let result = service(context, pos);
-        if (result != null)
+        if (result !== undefined)
             return result;
     }
     let tree = syntaxTree(context.state);
@@ -1187,7 +1195,7 @@ function syntaxFolding(state, start, end) {
     let tree = syntaxTree(state);
     if (tree.length < end)
         return null;
-    let inner = tree.resolveInner(end);
+    let inner = tree.resolveInner(end, 1);
     let found = null;
     for (let cur = inner; cur; cur = cur.parent) {
         if (cur.to <= end || cur.from > end)
@@ -1680,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.d.ts

@@ -363,10 +363,12 @@ declare class LanguageDescription {
 Facet that defines a way to provide a function that computes the
 appropriate indentation depth, as a column number (see
 [`indentString`](https://codemirror.net/6/docs/ref/#language.indentString)), at the start of a given
-line, or `null` to indicate no appropriate indentation could be
-determined.
+line. A return value of `null` indicates no indentation can be
+determined, and the line should inherit the indentation of the one
+above it. A return value of `undefined` defers to the next indent
+service.
 */
-declare const indentService: Facet<(context: IndentContext, pos: number) => number | null, readonly ((context: IndentContext, pos: number) => number | null)[]>;
+declare const indentService: Facet<(context: IndentContext, pos: number) => number | null | undefined, readonly ((context: IndentContext, pos: number) => number | null | undefined)[]>;
 /**
 Facet for overriding the unit by which indentation happens.
 Should be a string consisting either entirely of spaces or

package/dist/index.js

@@ -1,4 +1,4 @@
-import { NodeProp, Tree, IterMode, TreeFragment, Parser, NodeType, NodeSet } from '@lezer/common';
+import { NodeProp, IterMode, Tree, TreeFragment, Parser, NodeType, NodeSet } from '@lezer/common';
 import { StateEffect, StateField, Facet, EditorState, countColumn, combineConfig, RangeSet, RangeSetBuilder, Prec } from '@codemirror/state';
 import { ViewPlugin, logException, EditorView, Decoration, WidgetType, gutter, GutterMarker } from '@codemirror/view';
 import { tags, tagHighlighter, highlightTree, styleTags } from '@lezer/highlight';
@@ -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
@@ -763,8 +769,10 @@ class LanguageDescription {
 Facet that defines a way to provide a function that computes the
 appropriate indentation depth, as a column number (see
 [`indentString`](https://codemirror.net/6/docs/ref/#language.indentString)), at the start of a given
-line, or `null` to indicate no appropriate indentation could be
-determined.
+line. A return value of `null` indicates no indentation can be
+determined, and the line should inherit the indentation of the one
+above it. A return value of `undefined` defers to the next indent
+service.
 */
 const indentService = /*@__PURE__*/Facet.define();
 /**
@@ -822,7 +830,7 @@ function getIndentation(context, pos) {
         context = new IndentContext(context);
     for (let service of context.state.facet(indentService)) {
         let result = service(context, pos);
-        if (result != null)
+        if (result !== undefined)
             return result;
     }
     let tree = syntaxTree(context.state);
@@ -1183,7 +1191,7 @@ function syntaxFolding(state, start, end) {
     let tree = syntaxTree(state);
     if (tree.length < end)
         return null;
-    let inner = tree.resolveInner(end);
+    let inner = tree.resolveInner(end, 1);
     let found = null;
     for (let cur = inner; cur; cur = cur.parent) {
         if (cur.to <= end || cur.from > end)
@@ -1676,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.0",
+  "version": "6.3.2",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",