Make selectParentSyntax able to jump between overlays

marijnh · marijnh · commit e209d2f6e5c5 · 2023-09-19T17:23:21.000+02:00
FIX: Make it possible for `selectParentSyntax` to jump out of or into a syntax
tree overlay.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "@codemirror/language": "^6.0.0",
     "@codemirror/state": "^6.2.0",
     "@codemirror/view": "^6.0.0",
-    "@lezer/common": "^1.0.0"
+    "@lezer/common": "^1.1.0"
   },
   "devDependencies": {
     "@codemirror/buildhelper": "^1.0.0",
diff --git a/src/commands.ts b/src/commands.ts
@@ -401,12 +401,15 @@ export const selectLine: StateCommand = ({state, dispatch}) => {
 /// syntax tree.
 export const selectParentSyntax: StateCommand = ({state, dispatch}) => {
   let selection = updateSel(state.selection, range => {
-    let context = syntaxTree(state).resolveInner(range.head, 1)
-    while (!((context.from < range.from && context.to >= range.to) ||
-             (context.to > range.to && context.from <= range.from) ||
-             !context.parent?.parent))
-      context = context.parent
-    return EditorSelection.range(context.to, context.from)
+    let stack = syntaxTree(state).resolveStack(range.from, 1)
+    for (let cur: typeof stack | null = stack; cur; cur = cur.next) {
+      let {node} = cur
+      if (((node.from < range.from && node.to >= range.to) ||
+           (node.to > range.to && node.from <= range.from)) &&
+          node.parent?.parent)
+        return EditorSelection.range(node.to, node.from)
+    }
+    return range
   })
   dispatch(setSel(state, selection))
   return true
