Use EnterBracketed mode when finding inner language

marijnh · marijnh · commit d131a0fac0b3 · 2025-12-22T16:31:44.000+01:00
FIX: Improve finding inner language in syntax tree when the nested parse
has been marked as bracketed.
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@codemirror/state": "^6.0.0",
     "@codemirror/view": "^6.23.0",
-    "@lezer/common": "^1.1.0",
+    "@lezer/common": "^1.5.0",
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.0.0",
     "style-mod": "^4.0.0"
diff --git a/src/language.ts b/src/language.ts
@@ -156,7 +156,7 @@ export class Language {
 function topNodeAt(state: EditorState, pos: number, side: -1 | 0 | 1) {
   let topLang = state.facet(language), tree = syntaxTree(state).topNode
   if (!topLang || topLang.allowsNesting) {
-    for (let node: SyntaxNode | null = tree; node; node = node.enter(pos, side, IterMode.ExcludeBuffers))
+    for (let node: SyntaxNode | null = tree; node; node = node.enter(pos, side, IterMode.ExcludeBuffers | IterMode.EnterBracketed))
       if (node.type.isTop) tree = node
   }
   return tree

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ export class Language {`
`156`	`156`	`function topNodeAt(state: EditorState, pos: number, side: -1 \| 0 \| 1) {`
`157`	`157`	`let topLang = state.facet(language), tree = syntaxTree(state).topNode`
`158`	`158`	`if (!topLang \|\| topLang.allowsNesting) {`
`159`		`- for (let node: SyntaxNode \| null = tree; node; node = node.enter(pos, side, IterMode.ExcludeBuffers))`
	`159`	`+ for (let node: SyntaxNode \| null = tree; node; node = node.enter(pos, side, IterMode.ExcludeBuffers \| IterMode.EnterBracketed))`
`160`	`160`	`if (node.type.isTop) tree = node`
`161`	`161`	`}`
`162`	`162`	`return tree`