neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: use language specific formatters defined in flow-syntax/file_types

Browse source
This commit is contained in:
CJ van den Berg 2024-06-06 21:12:26 +02:00
parent 3bd10e106d
commit 60218a06b7
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/tui/editor.zig
View file

@ -3444,6 +3444,22 @@ pub const Editor = struct {
self.get_primary().selection = sel;
}
pub fn format(self: *Self, ctx: command.Context) tp.result {
if (ctx.args.buf.len > 0 and try ctx.args.match(.{ tp.string, tp.more })) {
try self.filter_cmd(ctx.args);
return;
}
if (self.syntax) |syn| if (syn.file_type.formatter) |fmtr| if (fmtr.len > 0) {
var args = std.ArrayList(u8).init(self.a);
const writer = args.writer();
cbor.writeArrayHeader(writer, fmtr.len) catch |e| return tp.exit_error(e);
for (fmtr) |arg| cbor.writeValue(writer, arg) catch |e| return tp.exit_error(e);
try self.filter_cmd(.{ .buf = args.items });
return;
};
return tp.exit("no formatter");
}
pub fn filter(self: *Self, ctx: command.Context) tp.result {
if (!try ctx.args.match(.{ tp.string, tp.more }))
return tp.exit_error(error.InvalidArgument);
@ -3473,7 +3489,9 @@ pub const Editor = struct {
};
errdefer self.filter_deinit();
const state = &self.filter.?;
self.logger.print("filter: start", .{});
var buf: [1024]u8 = undefined;
const json = cmd.to_json(&buf) catch |e| return tp.exit_error(e);
self.logger.print("filter: start {s}", .{json});
var sp = tp.subprocess.init(self.a, cmd, "filter", .Pipe) catch |e| return tp.exit_error(e);
defer {
sp.close() catch {};

2
src/tui/mode/input/flow.zig
View file

@ -161,7 +161,7 @@ fn mapPress(self: *Self, keypress: u32, egc: u32, modifiers: u32) tp.result {
'D' => self.cmd("dupe_up", .{}),
// 'B' => self.cmd("select_word_left", .{}),
// 'F' => self.cmd("select_word_right", .{}),
'F' => self.cmd("filter", command.fmt(.{ "zig", "fmt", "--stdin" })),
'F' => self.cmd("format", .{}),
'S' => self.cmd("filter", command.fmt(.{ "sort", "-u" })),
'V' => self.cmd("paste", .{}),
'I' => self.cmd("add_cursors_to_line_ends", .{}),