summaryrefslogtreecommitdiff
path: root/src/syntax.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-08 12:03:46 -0300
committerGabriel Schneider <[email protected]>2026-10-22 10:03:15 -0300
commit1ecb9b720840ea8e4753823fa8cddcf5d6a3a4d2 (patch)
tree973976c63f560201638d453b4b8b277d9cb40040 /src/syntax.zig
parent13d5613b77c62c425c3a124a34c0c2528cc6251f (diff)
downloadpardes-1ecb9b720840ea8e4753823fa8cddcf5d6a3a4d2.tar.gz
pardes-1ecb9b720840ea8e4753823fa8cddcf5d6a3a4d2.zip
Add a readable static Callstack pane and align tagline text
Diffstat (limited to 'src/syntax.zig')
-rw-r--r--src/syntax.zig17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/syntax.zig b/src/syntax.zig
index 89d96239..b2f5ea99 100644
--- a/src/syntax.zig
+++ b/src/syntax.zig
@@ -414,7 +414,6 @@ pub fn walkNodes(tree_ptr: *anyopaque, walk: NodeWalk, from: usize, to: usize, a
return 1;
}
-
/// helix's textobjects, which its `]f`, `mif` and kin select: the name a
/// query's captures begin with (`function.around`, `test.inside`).
pub const Object = @import("modal.zig").Normal.Object;
@@ -940,13 +939,10 @@ pub fn highlightLocationRows(gpa: std.mem.Allocator, content: []const u8, rows:
}
fn codeAfterLocation(line: []const u8) ?struct { path: []const u8, at: usize, text: []const u8 } {
- const token_end = std.mem.indexOfAny(u8, line, " \t") orelse return null;
- if (token_end == 0) return null;
- const token = line[0..token_end];
- const target = look.parsePathLine(token);
- if (target.end != token.len) return null;
+ const trimmed = std.mem.trimStart(u8, line, " \t");
+ const target = @import("locations.zig").parseRaw(trimmed);
if (target.at.line == 0) return null;
- const at = token_end + 1;
+ const at = line.len - trimmed.len + target.code_start;
if (at >= line.len) return null;
return .{ .path = target.path, .at = at, .text = line[at..] };
}
@@ -1355,6 +1351,11 @@ test "syntax codeAfterLocation takes whole-token locations and nothing else" {
try std.testing.expect(codeAfterLocation("src/x.zig:7:2") == null);
try std.testing.expect(codeAfterLocation("") == null);
try std.testing.expect(codeAfterLocation(" leading space") == null);
+ const indented = " some directory/x.zig:7:2-9 return 42;";
+ const nested = codeAfterLocation(indented) orelse return error.ShouldBeALocation;
+ try std.testing.expectEqualStrings("some directory/x.zig", nested.path);
+ try std.testing.expectEqualStrings(" return 42;", nested.text);
+ try std.testing.expectEqualStrings(nested.text, indented[nested.at..]);
}
test "syntax default full grammar set highlights Typst source" {
@@ -1736,6 +1737,7 @@ test "syntax result fragments preserve source indentation and inline markup" {
defer stop();
const fixtures = [_]struct { path: []const u8, source: []const u8 }{
.{ .path = "a.zig", .source = " const number = 42; // note" },
+ .{ .path = " nested path/a.zig", .source = " return call(42, \"hello\"); // note" },
.{ .path = "a.md", .source = "# Heading *slant*" },
.{ .path = "a.md", .source = "**bold** and `code`" },
.{ .path = "a.md", .source = " # this is indented code" },
@@ -1961,4 +1963,3 @@ test "syntax source analysis preserves declarations and injected colors" {
try std.testing.expectEqual(@as(usize, 0), unsupported.declarations.len);
try std.testing.expectEqual(@as(usize, 0), unsupported.colors.len);
}
-