@lezer/common 0.15.8 → 0.15.9

package/dist/index.cjs

@@ -286,7 +286,8 @@ class Tree {
     }
     /// Get a [tree cursor](#common.TreeCursor) that, unlike regular
     /// cursors, doesn't skip through
-    /// [anonymous](#common.NodeType.isAnonymous) nodes.
+    /// [anonymous](#common.NodeType.isAnonymous) nodes and doesn't
+    /// automatically enter mounted nodes.
     fullCursor() {
         return new TreeCursor(this.topNode, 1 /* Full */);
     }
@@ -508,7 +509,7 @@ class TreeNode {
                 }
                 else if ((mode & 1 /* Full */) || (!next.type.isAnonymous || hasChild(next))) {
                     let mounted;
-                    if (next.props && (mounted = next.prop(NodeProp.mounted)) && !mounted.overlay)
+                    if (!(mode & 1 /* Full */) && next.props && (mounted = next.prop(NodeProp.mounted)) && !mounted.overlay)
                         return new TreeNode(mounted.tree, start, i, parent);
                     let inner = new TreeNode(next, start, i, parent);
                     return (mode & 1 /* Full */) || !inner.type.isAnonymous ? inner
@@ -756,7 +757,7 @@ class TreeCursor {
     /// set to false.
     enter(pos, side, overlays = true, buffers = true) {
         if (!this.buffer)
-            return this.yield(this._tree.enter(pos, side, overlays, buffers));
+            return this.yield(this._tree.enter(pos, side, overlays && !(this.mode & 1 /* Full */), buffers));
         return buffers ? this.enterChild(1, pos, side) : false;
     }
     /// Move to the node's parent node, if this isn't the top node.
@@ -1274,11 +1275,12 @@ function parseMixed(nest) {
     return (parse, input, fragments, ranges) => new MixedParse(parse, nest, input, fragments, ranges);
 }
 class InnerParse {
-    constructor(parser, parse, overlay, target) {
+    constructor(parser, parse, overlay, target, ranges) {
         this.parser = parser;
         this.parse = parse;
         this.overlay = overlay;
         this.target = target;
+        this.ranges = ranges;
     }
 }
 class ActiveOverlay {
@@ -1294,6 +1296,7 @@ class ActiveOverlay {
         this.ranges = [];
     }
 }
+const stoppedInner = new NodeProp({ perNode: true });
 class MixedParse {
     constructor(base, nest, input, fragments, ranges) {
         this.nest = nest;
@@ -1315,8 +1318,12 @@ class MixedParse {
             this.baseTree = done;
             this.startInner();
         }
-        if (this.innerDone == this.inner.length)
-            return this.baseTree;
+        if (this.innerDone == this.inner.length) {
+            let result = this.baseTree;
+            if (this.stoppedAt != null)
+                result = new Tree(result.type, result.children, result.positions, result.length, result.propValues.concat([[stoppedInner, this.stoppedAt]]));
+            return result;
+        }
         let inner = this.inner[this.innerDone], done = inner.parse.advance();
         if (done) {
             this.innerDone++;
@@ -1333,8 +1340,12 @@ class MixedParse {
     get parsedPos() {
         if (this.baseParse)
             return 0;
-        let next = this.inner[this.innerDone];
-        return next ? next.parse.parsedPos : this.input.length;
+        let pos = this.input.length;
+        for (let i = this.innerDone; i < this.inner.length; i++) {
+            if (this.inner[i].ranges[0].from < pos)
+                pos = Math.min(pos, this.inner[i].parse.parsedPos);
+        }
+        return pos;
     }
     stopAt(pos) {
         this.stoppedAt = pos;
@@ -1376,7 +1387,7 @@ class MixedParse {
                 else {
                     let ranges = punchRanges(this.ranges, nest.overlay || [new Range(cursor.from, cursor.to)]);
                     if (ranges.length)
-                        this.inner.push(new InnerParse(nest.parser, nest.parser.startParse(this.input, enterFragments(oldMounts, ranges), ranges), nest.overlay ? nest.overlay.map(r => new Range(r.from - cursor.from, r.to - cursor.from)) : null, cursor.tree));
+                        this.inner.push(new InnerParse(nest.parser, nest.parser.startParse(this.input, enterFragments(oldMounts, ranges), ranges), nest.overlay ? nest.overlay.map(r => new Range(r.from - cursor.from, r.to - cursor.from)) : null, cursor.tree, ranges));
                     if (!nest.overlay)
                         enter = false;
                     else if (ranges.length)
@@ -1404,7 +1415,7 @@ class MixedParse {
                     if (overlay && !--overlay.depth) {
                         let ranges = punchRanges(this.ranges, overlay.ranges);
                         if (ranges.length)
-                            this.inner.splice(overlay.index, 0, new InnerParse(overlay.parser, overlay.parser.startParse(this.input, enterFragments(overlay.mounts, ranges), ranges), overlay.ranges.map(r => new Range(r.from - overlay.start, r.to - overlay.start)), overlay.target));
+                            this.inner.splice(overlay.index, 0, new InnerParse(overlay.parser, overlay.parser.startParse(this.input, enterFragments(overlay.mounts, ranges), ranges), overlay.ranges.map(r => new Range(r.from - overlay.start, r.to - overlay.start)), overlay.target, ranges));
                         overlay = overlay.prev;
                     }
                     if (covered && !--covered.depth)
@@ -1504,10 +1515,13 @@ class StructureCursor {
 }
 class FragmentCursor {
     constructor(fragments) {
+        var _a;
         this.fragments = fragments;
+        this.curTo = 0;
         this.fragI = 0;
         if (fragments.length) {
             let first = this.curFrag = fragments[0];
+            this.curTo = (_a = first.tree.prop(stoppedInner)) !== null && _a !== void 0 ? _a : first.to;
             this.inner = new StructureCursor(first.tree, -first.offset);
         }
         else {
@@ -1515,17 +1529,19 @@ class FragmentCursor {
         }
     }
     hasNode(node) {
-        while (this.curFrag && node.from >= this.curFrag.to)
+        while (this.curFrag && node.from >= this.curTo)
             this.nextFrag();
-        return this.curFrag && this.curFrag.from <= node.from && this.curFrag.to >= node.to && this.inner.hasNode(node);
+        return this.curFrag && this.curFrag.from <= node.from && this.curTo >= node.to && this.inner.hasNode(node);
     }
     nextFrag() {
+        var _a;
         this.fragI++;
         if (this.fragI == this.fragments.length) {
             this.curFrag = this.inner = null;
         }
         else {
             let frag = this.curFrag = this.fragments[this.fragI];
+            this.curTo = (_a = frag.tree.prop(stoppedInner)) !== null && _a !== void 0 ? _a : frag.to;
             this.inner = new StructureCursor(frag.tree, -frag.offset);
         }
     }

package/dist/index.js

@@ -282,7 +282,8 @@ class Tree {
     }
     /// Get a [tree cursor](#common.TreeCursor) that, unlike regular
     /// cursors, doesn't skip through
-    /// [anonymous](#common.NodeType.isAnonymous) nodes.
+    /// [anonymous](#common.NodeType.isAnonymous) nodes and doesn't
+    /// automatically enter mounted nodes.
     fullCursor() {
         return new TreeCursor(this.topNode, 1 /* Full */);
     }
@@ -504,7 +505,7 @@ class TreeNode {
                 }
                 else if ((mode & 1 /* Full */) || (!next.type.isAnonymous || hasChild(next))) {
                     let mounted;
-                    if (next.props && (mounted = next.prop(NodeProp.mounted)) && !mounted.overlay)
+                    if (!(mode & 1 /* Full */) && next.props && (mounted = next.prop(NodeProp.mounted)) && !mounted.overlay)
                         return new TreeNode(mounted.tree, start, i, parent);
                     let inner = new TreeNode(next, start, i, parent);
                     return (mode & 1 /* Full */) || !inner.type.isAnonymous ? inner
@@ -752,7 +753,7 @@ class TreeCursor {
     /// set to false.
     enter(pos, side, overlays = true, buffers = true) {
         if (!this.buffer)
-            return this.yield(this._tree.enter(pos, side, overlays, buffers));
+            return this.yield(this._tree.enter(pos, side, overlays && !(this.mode & 1 /* Full */), buffers));
         return buffers ? this.enterChild(1, pos, side) : false;
     }
     /// Move to the node's parent node, if this isn't the top node.
@@ -1270,11 +1271,12 @@ function parseMixed(nest) {
     return (parse, input, fragments, ranges) => new MixedParse(parse, nest, input, fragments, ranges);
 }
 class InnerParse {
-    constructor(parser, parse, overlay, target) {
+    constructor(parser, parse, overlay, target, ranges) {
         this.parser = parser;
         this.parse = parse;
         this.overlay = overlay;
         this.target = target;
+        this.ranges = ranges;
     }
 }
 class ActiveOverlay {
@@ -1290,6 +1292,7 @@ class ActiveOverlay {
         this.ranges = [];
     }
 }
+const stoppedInner = new NodeProp({ perNode: true });
 class MixedParse {
     constructor(base, nest, input, fragments, ranges) {
         this.nest = nest;
@@ -1311,8 +1314,12 @@ class MixedParse {
             this.baseTree = done;
             this.startInner();
         }
-        if (this.innerDone == this.inner.length)
-            return this.baseTree;
+        if (this.innerDone == this.inner.length) {
+            let result = this.baseTree;
+            if (this.stoppedAt != null)
+                result = new Tree(result.type, result.children, result.positions, result.length, result.propValues.concat([[stoppedInner, this.stoppedAt]]));
+            return result;
+        }
         let inner = this.inner[this.innerDone], done = inner.parse.advance();
         if (done) {
             this.innerDone++;
@@ -1329,8 +1336,12 @@ class MixedParse {
     get parsedPos() {
         if (this.baseParse)
             return 0;
-        let next = this.inner[this.innerDone];
-        return next ? next.parse.parsedPos : this.input.length;
+        let pos = this.input.length;
+        for (let i = this.innerDone; i < this.inner.length; i++) {
+            if (this.inner[i].ranges[0].from < pos)
+                pos = Math.min(pos, this.inner[i].parse.parsedPos);
+        }
+        return pos;
     }
     stopAt(pos) {
         this.stoppedAt = pos;
@@ -1372,7 +1383,7 @@ class MixedParse {
                 else {
                     let ranges = punchRanges(this.ranges, nest.overlay || [new Range(cursor.from, cursor.to)]);
                     if (ranges.length)
-                        this.inner.push(new InnerParse(nest.parser, nest.parser.startParse(this.input, enterFragments(oldMounts, ranges), ranges), nest.overlay ? nest.overlay.map(r => new Range(r.from - cursor.from, r.to - cursor.from)) : null, cursor.tree));
+                        this.inner.push(new InnerParse(nest.parser, nest.parser.startParse(this.input, enterFragments(oldMounts, ranges), ranges), nest.overlay ? nest.overlay.map(r => new Range(r.from - cursor.from, r.to - cursor.from)) : null, cursor.tree, ranges));
                     if (!nest.overlay)
                         enter = false;
                     else if (ranges.length)
@@ -1400,7 +1411,7 @@ class MixedParse {
                     if (overlay && !--overlay.depth) {
                         let ranges = punchRanges(this.ranges, overlay.ranges);
                         if (ranges.length)
-                            this.inner.splice(overlay.index, 0, new InnerParse(overlay.parser, overlay.parser.startParse(this.input, enterFragments(overlay.mounts, ranges), ranges), overlay.ranges.map(r => new Range(r.from - overlay.start, r.to - overlay.start)), overlay.target));
+                            this.inner.splice(overlay.index, 0, new InnerParse(overlay.parser, overlay.parser.startParse(this.input, enterFragments(overlay.mounts, ranges), ranges), overlay.ranges.map(r => new Range(r.from - overlay.start, r.to - overlay.start)), overlay.target, ranges));
                         overlay = overlay.prev;
                     }
                     if (covered && !--covered.depth)
@@ -1500,10 +1511,13 @@ class StructureCursor {
 }
 class FragmentCursor {
     constructor(fragments) {
+        var _a;
         this.fragments = fragments;
+        this.curTo = 0;
         this.fragI = 0;
         if (fragments.length) {
             let first = this.curFrag = fragments[0];
+            this.curTo = (_a = first.tree.prop(stoppedInner)) !== null && _a !== void 0 ? _a : first.to;
             this.inner = new StructureCursor(first.tree, -first.offset);
         }
         else {
@@ -1511,17 +1525,19 @@ class FragmentCursor {
         }
     }
     hasNode(node) {
-        while (this.curFrag && node.from >= this.curFrag.to)
+        while (this.curFrag && node.from >= this.curTo)
             this.nextFrag();
-        return this.curFrag && this.curFrag.from <= node.from && this.curFrag.to >= node.to && this.inner.hasNode(node);
+        return this.curFrag && this.curFrag.from <= node.from && this.curTo >= node.to && this.inner.hasNode(node);
     }
     nextFrag() {
+        var _a;
         this.fragI++;
         if (this.fragI == this.fragments.length) {
             this.curFrag = this.inner = null;
         }
         else {
             let frag = this.curFrag = this.fragments[this.fragI];
+            this.curTo = (_a = frag.tree.prop(stoppedInner)) !== null && _a !== void 0 ? _a : frag.to;
             this.inner = new StructureCursor(frag.tree, -frag.offset);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lezer/common",
-  "version": "0.15.8",
+  "version": "0.15.9",
   "description": "Syntax tree data structure and parser interfaces for the lezer parser",
   "main": "dist/index.cjs",
   "type": "module",