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

fix: always run highlight references if configured

Browse source
This commit is contained in:
CJ van den Berg 2026-01-15 23:16:25 +01:00
parent 82f9429e3c
commit 67a6d01291
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Project.zig
View file

@ -1142,7 +1142,7 @@ pub fn highlight_references(self: *Self, from: tp.pid_ref, file_path: []const u8
pub fn receive(self_: @This(), response: tp.message) !void { pub fn receive(self_: @This(), response: tp.message) !void {
var highlights: []const u8 = undefined; var highlights: []const u8 = undefined;
if (try cbor.match(response.buf, .{ "child", tp.string, "result", tp.null_ })) { if (try cbor.match(response.buf, .{ "child", tp.string, "result", tp.null_ })) {
return; self_.from.send(.{ "HREF", self_.file_path, "done" }) catch {};
} else if (try cbor.match(response.buf, .{ "child", tp.string, "result", tp.extract_cbor(&highlights) })) { } else if (try cbor.match(response.buf, .{ "child", tp.string, "result", tp.extract_cbor(&highlights) })) {
_ = try send_highlight_list(self_.from.ref(), highlights, self_.file_path); _ = try send_highlight_list(self_.from.ref(), highlights, self_.file_path);
} }

36
src/tui/editor.zig
View file

@ -6243,7 +6243,6 @@ pub const Editor = struct {
self.highlight_references_state = .adding; self.highlight_references_state = .adding;
self.highlight_references_pending.clearRetainingCapacity(); self.highlight_references_pending.clearRetainingCapacity();
} }
self.match_type = .highlight_references;
const root = self.buf_root() catch return; const root = self.buf_root() catch return;
var match = match_; var match = match_;
match.begin.row -|= 1; match.begin.row -|= 1;
@ -6254,11 +6253,13 @@ pub const Editor = struct {
pub fn done_highlight_reference(self: *Self) void { pub fn done_highlight_reference(self: *Self) void {
self.cancel_all_matches(); self.cancel_all_matches();
self.match_type = .highlight_references;
for (self.highlight_references_pending.items) |match| for (self.highlight_references_pending.items) |match|
(self.matches.addOne(self.allocator) catch return).* = match; (self.matches.addOne(self.allocator) catch return).* = match;
self.sort_matches(); self.highlight_references_pending.clearRetainingCapacity();
self.highlight_references_state = .done; self.highlight_references_state = .done;
self.need_render(); self.sort_matches();
tui.need_render(@src());
} }
pub fn add_diagnostic( pub fn add_diagnostic(
@ -6923,7 +6924,16 @@ pub const EditorWidget = struct {
.hover => { .hover => {
try self.editor.hover(.{}); try self.editor.hover(.{});
}, },
.highlight_references => self.idle_highlight_references(), .highlight_references => {
const primary = self.editor.get_primary();
switch (self.editor.match_type) {
.find, .auto_find => {},
.highlight_references, .none => {
if (self.editor.cursels.items.len == 1 and primary.selection == null)
self.editor.highlight_references(.{}) catch {};
},
}
},
}; };
return false; return false;
} else if (try m.match(.{ "whitespace_mode", tp.extract(&whitespace_mode) })) { } else if (try m.match(.{ "whitespace_mode", tp.extract(&whitespace_mode) })) {
@ -6934,24 +6944,6 @@ pub const EditorWidget = struct {
return true; return true;
} }
fn idle_highlight_references(self: *Self) void {
const primary = self.editor.get_primary();
switch (self.editor.match_type) {
.find, .auto_find => return,
.highlight_references => {
if (self.editor.match_at_cursor(primary.cursor)) |_| {
return;
} else {
self.editor.cancel_all_matches();
tui.need_render(@src());
}
},
.none => {},
}
if (self.editor.cursels.items.len == 1 and primary.selection == null)
self.editor.highlight_references(.{}) catch return;
}
fn update_hover_timer(self: *Self, event: enum { init, fired, cancel }) void { fn update_hover_timer(self: *Self, event: enum { init, fired, cancel }) void {
if (self.hover_timer) |*t| { if (self.hover_timer) |*t| {
if (event != .fired) t.cancel() catch {}; if (event != .fired) t.cancel() catch {};