@lezer/common 0.15.9 → 0.15.10

package/dist/index.cjs

@@ -213,7 +213,7 @@ class NodeSet {
         return new NodeSet(newTypes);
     }
 }
-const CachedNode = new WeakMap();
+const CachedNode = new WeakMap(), CachedInnerNode = new WeakMap();
 /// A piece of syntax tree. There are two ways to approach these
 /// trees: the way they are actually stored in memory, and the
 /// convenient way.
@@ -302,7 +302,9 @@ class Tree {
     /// position. With 0, it'll only enter nodes that cover the position
     /// from both sides.
     resolve(pos, side = 0) {
-        return this.cursor(pos, side).node;
+        let node = resolveNode(CachedNode.get(this) || this.topNode, pos, side, false);
+        CachedNode.set(this, node);
+        return node;
     }
     /// Like [`resolve`](#common.Tree.resolve), but will enter
     /// [overlaid](#common.MountedTree.overlay) nodes, producing a syntax node
@@ -310,13 +312,9 @@ class Tree {
     /// (with parent links going through all parent structure, including
     /// the host trees).
     resolveInner(pos, side = 0) {
-        let result = this.topNode;
-        for (;;) {
-            let inner = result.enter(pos, side);
-            if (!inner)
-                return result;
-            result = inner;
-        }
+        let node = resolveNode(CachedInnerNode.get(this) || this.topNode, pos, side, true);
+        CachedInnerNode.set(this, node);
+        return node;
     }
     /// Iterate over the tree and its children, calling `enter` for any
     /// node that touches the `from`/`to` region (if given) before
@@ -481,6 +479,30 @@ function enterUnfinishedNodesBefore(node, pos) {
     }
     return node;
 }
+function resolveNode(node, pos, side, overlays) {
+    var _a;
+    // Move up to a node that actually holds the position, if possible
+    while (node.from == node.to ||
+        (side < 1 ? node.from >= pos : node.from > pos) ||
+        (side > -1 ? node.to <= pos : node.to < pos)) {
+        let parent = !overlays && node instanceof TreeNode && node.index < 0 ? null : node.parent;
+        if (!parent)
+            return node;
+        node = parent;
+    }
+    // Must go up out of overlays when those do not overlap with pos
+    if (overlays)
+        for (let scan = node, parent = scan.parent; parent; scan = parent, parent = scan.parent) {
+            if (scan instanceof TreeNode && scan.index < 0 && ((_a = parent.enter(pos, side, true)) === null || _a === void 0 ? void 0 : _a.from) != scan.from)
+                node = parent;
+        }
+    for (;;) {
+        let inner = node.enter(pos, side, overlays);
+        if (!inner)
+            return node;
+        node = inner;
+    }
+}
 class TreeNode {
     constructor(node, _from, 
     // Index in parent node, set to -1 if the node is not a direct child of _parent.node (overlay)
@@ -562,7 +584,10 @@ class TreeNode {
     get tree() { return this.node; }
     toTree() { return this.node; }
     resolve(pos, side = 0) {
-        return this.cursor.moveTo(pos, side).node;
+        return resolveNode(this, pos, side, false);
+    }
+    resolveInner(pos, side = 0) {
+        return resolveNode(this, pos, side, true);
     }
     enterUnfinishedNodesBefore(pos) { return enterUnfinishedNodesBefore(this, pos); }
     getChild(type, before = null, after = null) {
@@ -660,7 +685,10 @@ class BufferNode {
         return new Tree(this.type, children, positions, this.to - this.from);
     }
     resolve(pos, side = 0) {
-        return this.cursor.moveTo(pos, side).node;
+        return resolveNode(this, pos, side, false);
+    }
+    resolveInner(pos, side = 0) {
+        return resolveNode(this, pos, side, true);
     }
     enterUnfinishedNodesBefore(pos) { return enterUnfinishedNodesBefore(this, pos); }
     /// @internal
@@ -1317,6 +1345,9 @@ class MixedParse {
             this.baseParse = null;
             this.baseTree = done;
             this.startInner();
+            if (this.stoppedAt != null)
+                for (let inner of this.inner)
+                    inner.parse.stopAt(this.stoppedAt);
         }
         if (this.innerDone == this.inner.length) {
             let result = this.baseTree;
@@ -1360,7 +1391,7 @@ class MixedParse {
         let overlay = null;
         let covered = null;
         let cursor = new TreeCursor(new TreeNode(this.baseTree, this.ranges[0].from, 0, null), 1 /* Full */);
-        scan: for (let nest, isCovered;;) {
+        scan: for (let nest, isCovered; this.stoppedAt == null || cursor.from < this.stoppedAt;) {
             let enter = true, range;
             if (fragmentCursor.hasNode(cursor)) {
                 if (overlay) {

package/dist/index.js

@@ -209,7 +209,7 @@ class NodeSet {
         return new NodeSet(newTypes);
     }
 }
-const CachedNode = new WeakMap();
+const CachedNode = new WeakMap(), CachedInnerNode = new WeakMap();
 /// A piece of syntax tree. There are two ways to approach these
 /// trees: the way they are actually stored in memory, and the
 /// convenient way.
@@ -298,7 +298,9 @@ class Tree {
     /// position. With 0, it'll only enter nodes that cover the position
     /// from both sides.
     resolve(pos, side = 0) {
-        return this.cursor(pos, side).node;
+        let node = resolveNode(CachedNode.get(this) || this.topNode, pos, side, false);
+        CachedNode.set(this, node);
+        return node;
     }
     /// Like [`resolve`](#common.Tree.resolve), but will enter
     /// [overlaid](#common.MountedTree.overlay) nodes, producing a syntax node
@@ -306,13 +308,9 @@ class Tree {
     /// (with parent links going through all parent structure, including
     /// the host trees).
     resolveInner(pos, side = 0) {
-        let result = this.topNode;
-        for (;;) {
-            let inner = result.enter(pos, side);
-            if (!inner)
-                return result;
-            result = inner;
-        }
+        let node = resolveNode(CachedInnerNode.get(this) || this.topNode, pos, side, true);
+        CachedInnerNode.set(this, node);
+        return node;
     }
     /// Iterate over the tree and its children, calling `enter` for any
     /// node that touches the `from`/`to` region (if given) before
@@ -477,6 +475,30 @@ function enterUnfinishedNodesBefore(node, pos) {
     }
     return node;
 }
+function resolveNode(node, pos, side, overlays) {
+    var _a;
+    // Move up to a node that actually holds the position, if possible
+    while (node.from == node.to ||
+        (side < 1 ? node.from >= pos : node.from > pos) ||
+        (side > -1 ? node.to <= pos : node.to < pos)) {
+        let parent = !overlays && node instanceof TreeNode && node.index < 0 ? null : node.parent;
+        if (!parent)
+            return node;
+        node = parent;
+    }
+    // Must go up out of overlays when those do not overlap with pos
+    if (overlays)
+        for (let scan = node, parent = scan.parent; parent; scan = parent, parent = scan.parent) {
+            if (scan instanceof TreeNode && scan.index < 0 && ((_a = parent.enter(pos, side, true)) === null || _a === void 0 ? void 0 : _a.from) != scan.from)
+                node = parent;
+        }
+    for (;;) {
+        let inner = node.enter(pos, side, overlays);
+        if (!inner)
+            return node;
+        node = inner;
+    }
+}
 class TreeNode {
     constructor(node, _from, 
     // Index in parent node, set to -1 if the node is not a direct child of _parent.node (overlay)
@@ -558,7 +580,10 @@ class TreeNode {
     get tree() { return this.node; }
     toTree() { return this.node; }
     resolve(pos, side = 0) {
-        return this.cursor.moveTo(pos, side).node;
+        return resolveNode(this, pos, side, false);
+    }
+    resolveInner(pos, side = 0) {
+        return resolveNode(this, pos, side, true);
     }
     enterUnfinishedNodesBefore(pos) { return enterUnfinishedNodesBefore(this, pos); }
     getChild(type, before = null, after = null) {
@@ -656,7 +681,10 @@ class BufferNode {
         return new Tree(this.type, children, positions, this.to - this.from);
     }
     resolve(pos, side = 0) {
-        return this.cursor.moveTo(pos, side).node;
+        return resolveNode(this, pos, side, false);
+    }
+    resolveInner(pos, side = 0) {
+        return resolveNode(this, pos, side, true);
     }
     enterUnfinishedNodesBefore(pos) { return enterUnfinishedNodesBefore(this, pos); }
     /// @internal
@@ -1313,6 +1341,9 @@ class MixedParse {
             this.baseParse = null;
             this.baseTree = done;
             this.startInner();
+            if (this.stoppedAt != null)
+                for (let inner of this.inner)
+                    inner.parse.stopAt(this.stoppedAt);
         }
         if (this.innerDone == this.inner.length) {
             let result = this.baseTree;
@@ -1356,7 +1387,7 @@ class MixedParse {
         let overlay = null;
         let covered = null;
         let cursor = new TreeCursor(new TreeNode(this.baseTree, this.ranges[0].from, 0, null), 1 /* Full */);
-        scan: for (let nest, isCovered;;) {
+        scan: for (let nest, isCovered; this.stoppedAt == null || cursor.from < this.stoppedAt;) {
             let enter = true, range;
             if (fragmentCursor.hasNode(cursor)) {
                 if (overlay) {