summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-11-17 07:53:29 -0300
committerGabriel Schneider <[email protected]>2026-11-17 12:15:01 -0300
commit690c504391e07a0767df8255e288ffe39296af22 (patch)
tree162bf46bc8cae3f0cec46b58d3d3cc2ea558a7e3 /src
parentdee94c740bdaea61ff35b4e0a7f1d2815c9ee441 (diff)
downloadpardes-690c504391e07a0767df8255e288ffe39296af22.tar.gz
pardes-690c504391e07a0767df8255e288ffe39296af22.zip
+39 -6 lib: a new line's indent comes from the parse handed in (docs/next-editor.md): in the library, edit.treeIndent reads normal.nodeTree, the caller's `Syntax`, and its `Language`'s indent query (`indents`, which addLanguage already kept and nothing read), as a file's Enter, `o` and `O` read its own tree; without a query, or without a parse, the plain indent as before (a level more after `(`, `[`, `{` or `)`), which pushed every line of a language whose lines end in a call one level further in (examples/live, the sketch's language); pardes's own panes compile the branch out; test/lib: `f(1)` and Enter with no parse, with a grammar and no indent query (both a level in) and with one (none); hxlib 538 of 658 with 0 mismatches, core-test 811 of 950, shell-test 990 of 993, hxdiff 658 with 0 mismatches, lib-test 11 of 11
Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_016Y9MNBECMWcJD5pdS4SR6T
Diffstat (limited to 'src')
-rw-r--r--src/CHANGELOG.md5
-rw-r--r--src/edit.zig7
2 files changed, 10 insertions, 2 deletions
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
index 6d51311b..764b9815 100644
--- a/src/CHANGELOG.md
+++ b/src/CHANGELOG.md
@@ -19,7 +19,10 @@
in the library on pardes's own functions, Alt-i going back the way
Alt-o came; `replace` rewrites a byte range as one step to undo, the
ranges following, and a drag that rewrites a number every frame can
- join its frames into one.
+ join its frames into one. A new line's indent comes from that parse
+ where its grammar has an indent query (a `Language`'s `indents`), as a
+ file's does from its own, so a language whose lines end in `)` is not
+ pushed a level in at every line.
- The terminal is a module of its own (`src/term/`: the emulator, its
screen state for replicas, kitty images, the pager's parse), which never
imports the core and is reached through one table of plain-data
diff --git a/src/edit.zig b/src/edit.zig
index 32943c19..fe644541 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -762,8 +762,13 @@ pub fn retireEditText(e: Editor, new: []u8) void {
}
/// helix's indent for a line opened after byte `at` of `row` (indent.zig),
-/// from the file's tree, where its grammar has an indent query.
+/// from the file's tree, where its grammar has an indent query; in the
+/// library, from the parse handed in (normal.nodeTree), its `Language`'s.
fn treeIndent(e: Editor, t: *Text, text: []const u8, row: usize, at: usize) Error!?[]const u8 {
+ if (comptime Editor.lib) {
+ const tree = normal.nodeTree(e, t, text) orelse return null;
+ return indents.forNewline(e.scratch, indents.lang(tree.path) orelse return null, tree.root, text, row, at);
+ }
const f = bodyFile(t) orelse return null;
const l = indents.lang(f.path) orelse return null;
const tree = normal.fileTree(e.p, f) orelse return null;