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

fix: do not render vcs blame and diagnostics on the same line

Browse source 
Prefer diagnostics
This commit is contained in:
CJ van den Berg 2026-01-27 15:50:46 +01:00
parent 032b1ae14a
commit 32f4bcec3a
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/tui/editor.zig
View file

@ -1225,13 +1225,14 @@ pub const Editor = struct {
return Buffer.Walker.keep_walking; return Buffer.Walker.keep_walking;
} }
}; };
const pc_row: usize = self.get_primary().cursor.row;
const hl_row: ?usize = if (tui.config().highlight_current_line) blk: { const hl_row: ?usize = if (tui.config().highlight_current_line) blk: {
if (self.get_primary().selection) |_| if (self.get_primary().selection) |_|
if (theme.editor_selection.bg) |sel_bg| if (theme.editor_selection.bg) |sel_bg|
if (theme.editor_line_highlight.bg) |hl_bg| if (theme.editor_line_highlight.bg) |hl_bg|
if (sel_bg.color == hl_bg.color and sel_bg.alpha == hl_bg.alpha) if (sel_bg.color == hl_bg.color and sel_bg.alpha == hl_bg.alpha)
break :blk null; break :blk null;
break :blk self.get_primary().cursor.row; break :blk pc_row;
} else null; } else null;
var ctx_: ctx = .{ var ctx_: ctx = .{
.self = self, .self = self,
@ -1249,16 +1250,18 @@ pub const Editor = struct {
self.plane.set_base_style(theme.editor); self.plane.set_base_style(theme.editor);
self.plane.erase(); self.plane.erase();
if (hl_row) |_| if (hl_row) |row|
self.render_line_highlight(&self.get_primary().cursor, theme) catch {}; self.render_line_highlight(row, theme) catch {};
self.plane.home(); self.plane.home();
_ = root.walk_from_line_begin_const(self.view.row, ctx.walker, &ctx_, self.metrics) catch {}; _ = root.walk_from_line_begin_const(self.view.row, ctx.walker, &ctx_, self.metrics) catch {};
} }
self.render_syntax(theme, cache, root) catch {}; self.render_syntax(theme, cache, root) catch {};
self.render_whitespace_map(theme, ctx_.cell_map) catch {}; self.render_whitespace_map(theme, ctx_.cell_map) catch {};
if (tui.config().inline_diagnostics) const pc_row_diag = if (tui.config().inline_diagnostics)
self.render_diagnostics(theme, hl_row, ctx_.cell_map) catch {}; self.render_diagnostics(theme, pc_row, hl_row, ctx_.cell_map)
if (tui.config().inline_vcs_blame) else
false;
if (tui.config().inline_vcs_blame and !pc_row_diag)
self.render_blame(theme, hl_row, ctx_.cell_map) catch {}; self.render_blame(theme, hl_row, ctx_.cell_map) catch {};
self.render_column_highlights() catch {}; self.render_column_highlights() catch {};
self.render_cursors(theme, ctx_.cell_map, focused) catch {}; self.render_cursors(theme, ctx_.cell_map, focused) catch {};
@ -1353,12 +1356,12 @@ pub const Editor = struct {
} }
} }
fn render_line_highlight(self: *Self, cursor: *const Cursor, theme: *const Widget.Theme) !void { fn render_line_highlight(self: *Self, pc_row: usize, theme: *const Widget.Theme) !void {
const row_min = self.view.row; const row_min = self.view.row;
const row_max = row_min + self.view.rows; const row_max = row_min + self.view.rows;
if (cursor.row < row_min or row_max < cursor.row) if (pc_row < row_min or row_max < pc_row)
return; return;
const row = cursor.row - self.view.row; const row = pc_row - self.view.row;
for (0..self.view.cols) |i| { for (0..self.view.cols) |i| {
self.plane.cursor_move_yx(@intCast(row), @intCast(i)); self.plane.cursor_move_yx(@intCast(row), @intCast(i));
var cell = self.plane.cell_init(); var cell = self.plane.cell_init();
@ -1401,8 +1404,14 @@ pub const Editor = struct {
}; };
} }
fn render_diagnostics(self: *Self, theme: *const Widget.Theme, hl_row: ?usize, cell_map: CellMap) !void { fn render_diagnostics(self: *Self, theme: *const Widget.Theme, pc_row: usize, hl_row: ?usize, cell_map: CellMap) bool {
for (self.diagnostics.items) |*diag| self.render_diagnostic(diag, theme, hl_row, cell_map); var diagnostic_on_pc_row: bool = false;
for (self.diagnostics.items) |*diag| {
if (diag.sel.begin.row == pc_row)
diagnostic_on_pc_row = true;
self.render_diagnostic(diag, theme, hl_row, cell_map);
}
return diagnostic_on_pc_row;
} }
fn render_diagnostic(self: *Self, diag: *const Diagnostic, theme: *const Widget.Theme, hl_row: ?usize, cell_map: CellMap) void { fn render_diagnostic(self: *Self, diag: *const Diagnostic, theme: *const Widget.Theme, hl_row: ?usize, cell_map: CellMap) void {