@codemirror/language 6.10.6 → 6.10.8

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.10.8 (2024-12-23)
+
+### Bug fixes
+
+Fix a regression introduced 6.10.7 that caused indention to sometimes crash on nested language boundaries.
+
+## 6.10.7 (2024-12-17)
+
+### Bug fixes
+
+Fix an issue where indentation for a stream language would fail to work when the parse covered only part of the document, far from the start.
+
+Make sure the inner mode gets a chance to indent when indenting right at the end of a nested language section.
+
 ## 6.10.6 (2024-11-29)
 
 ### Bug fixes

package/dist/index.cjs

@@ -995,10 +995,10 @@ const indentNodeProp = new common.NodeProp();
 // Compute the indentation for a given position from the syntax tree.
 function syntaxIndentation(cx, ast, pos) {
     let stack = ast.resolveStack(pos);
-    let inner = stack.node.enterUnfinishedNodesBefore(pos);
+    let inner = ast.resolveInner(pos, -1).resolve(pos, 0).enterUnfinishedNodesBefore(pos);
     if (inner != stack.node) {
         let add = [];
-        for (let cur = inner; cur != stack.node; cur = cur.parent)
+        for (let cur = inner; cur && !(cur.from == stack.node.from && cur.type == stack.node.type); cur = cur.parent)
             add.push(cur);
         for (let i = add.length - 1; i >= 0; i--)
             stack = { node: add[i], next: stack };
@@ -2230,14 +2230,14 @@ class StreamLanguage extends Language {
             if (from != null && from < cx.pos - 1e4)
                 from = undefined;
         }
-        let start = findState(this, cx.node.tree, 0, cx.node.from, from !== null && from !== void 0 ? from : cx.pos), statePos, state;
+        let start = findState(this, cx.node.tree, cx.node.from, cx.node.from, from !== null && from !== void 0 ? from : cx.pos), statePos, state;
         if (start) {
             state = start.state;
             statePos = start.pos + 1;
         }
         else {
             state = this.streamParser.startState(cx.unit);
-            statePos = 0;
+            statePos = cx.node.from;
         }
         if (cx.pos - statePos > 10000 /* C.MaxIndentScanDist */)
             return null;

package/dist/index.js

@@ -993,10 +993,10 @@ const indentNodeProp = /*@__PURE__*/new NodeProp();
 // Compute the indentation for a given position from the syntax tree.
 function syntaxIndentation(cx, ast, pos) {
     let stack = ast.resolveStack(pos);
-    let inner = stack.node.enterUnfinishedNodesBefore(pos);
+    let inner = ast.resolveInner(pos, -1).resolve(pos, 0).enterUnfinishedNodesBefore(pos);
     if (inner != stack.node) {
         let add = [];
-        for (let cur = inner; cur != stack.node; cur = cur.parent)
+        for (let cur = inner; cur && !(cur.from == stack.node.from && cur.type == stack.node.type); cur = cur.parent)
             add.push(cur);
         for (let i = add.length - 1; i >= 0; i--)
             stack = { node: add[i], next: stack };
@@ -2228,14 +2228,14 @@ class StreamLanguage extends Language {
             if (from != null && from < cx.pos - 1e4)
                 from = undefined;
         }
-        let start = findState(this, cx.node.tree, 0, cx.node.from, from !== null && from !== void 0 ? from : cx.pos), statePos, state;
+        let start = findState(this, cx.node.tree, cx.node.from, cx.node.from, from !== null && from !== void 0 ? from : cx.pos), statePos, state;
         if (start) {
             state = start.state;
             statePos = start.pos + 1;
         }
         else {
             state = this.streamParser.startState(cx.unit);
-            statePos = 0;
+            statePos = cx.node.from;
         }
         if (cx.pos - statePos > 10000 /* C.MaxIndentScanDist */)
             return null;

package/package.json

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