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

fix: render inserted and changed lines the same in the diff gutter

Browse source 
The diffing algo is unstable which causes the diff gutter to change
a lot while typing. This is a little annoying and not that useful so
we'll just render them the same until we get a stable diff algo.
This commit is contained in:
CJ van den Berg 2026-01-13 12:42:32 +01:00
parent 25d5f80a4c
commit 1e02d978de
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/tui/editor_gutter.zig
View file

@ -259,7 +259,12 @@ inline fn render_diff_symbols(self: *Self, diff_symbols: *[]Symbol, pos: usize,
if ((diff_symbols.*)[0].line > linenum) return; if ((diff_symbols.*)[0].line > linenum) return;
const sym = (diff_symbols.*)[0]; const sym = (diff_symbols.*)[0];
const char = switch (sym.kind) { const kind: Kind = switch (sym.kind) {
.insert => .insert,
.modified => .insert, //TODO: we map .modified to .insert here because the diff algo is unstable
.delete => .delete,
};
const char = switch (kind) {
.insert => "┃", .insert => "┃",
.modified => "┋", .modified => "┋",
.delete => "▔", .delete => "▔",
@ -268,7 +273,7 @@ inline fn render_diff_symbols(self: *Self, diff_symbols: *[]Symbol, pos: usize,
self.plane.cursor_move_yx(@intCast(pos), @intCast(self.get_width() - 1)) catch return; self.plane.cursor_move_yx(@intCast(pos), @intCast(self.get_width() - 1)) catch return;
var cell = self.plane.cell_init(); var cell = self.plane.cell_init();
_ = self.plane.at_cursor_cell(&cell) catch return; _ = self.plane.at_cursor_cell(&cell) catch return;
cell.set_style_fg(switch (sym.kind) { cell.set_style_fg(switch (kind) {
.insert => theme.editor_gutter_added, .insert => theme.editor_gutter_added,
.modified => theme.editor_gutter_modified, .modified => theme.editor_gutter_modified,
.delete => theme.editor_gutter_deleted, .delete => theme.editor_gutter_deleted,