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

fix: pop_cursor should reset match.has_selection

Browse source
This commit is contained in:
CJ van den Berg 2024-06-30 23:17:38 +02:00
parent 3e34271059
commit 23f2e1a1c0
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/tui/editor.zig
View file

@ -458,8 +458,12 @@ pub const Editor = struct {
} }
pub fn pop_cursor(self: *Self, _: Context) Result { pub fn pop_cursor(self: *Self, _: Context) Result {
if (self.cursels.items.len > 1) if (self.cursels.items.len > 1) {
_ = self.cursels.popOrNull(); const cursel = self.cursels.popOrNull() orelse return orelse return;
if (cursel.selection) |sel| if (self.find_selection_match(sel)) |match| {
match.has_selection = false;
};
}
self.clamp(); self.clamp();
} }
@ -3187,6 +3191,14 @@ pub const Editor = struct {
(self.matches.addOne() catch return).* = match; (self.matches.addOne() catch return).* = match;
} }
fn find_selection_match(self: *const Self, sel: Selection) ?*Match {
for (self.matches.items) |*match_| if (match_.*) |*match| {
if (match.to_selection().eql(sel))
return match;
};
return null;
}
fn scan_first_match(self: *const Self) ?*Match { fn scan_first_match(self: *const Self) ?*Match {
for (self.matches.items) |*match_| if (match_.*) |*match| { for (self.matches.items) |*match_| if (match_.*) |*match| {
if (match.has_selection) continue; if (match.has_selection) continue;
@ -3236,6 +3248,9 @@ pub const Editor = struct {
const primary = self.get_primary(); const primary = self.get_primary();
if (self.get_next_match(primary.cursor)) |match| { if (self.get_next_match(primary.cursor)) |match| {
const root = self.buf_root() catch return; const root = self.buf_root() catch return;
if (primary.selection) |sel| if (self.find_selection_match(sel)) |match_| {
match_.has_selection = false;
};
primary.selection = match.to_selection(); primary.selection = match.to_selection();
primary.cursor.move_to(root, match.end.row, match.end.col, self.plane) catch return; primary.cursor.move_to(root, match.end.row, match.end.col, self.plane) catch return;
self.clamp(); self.clamp();
@ -3259,6 +3274,9 @@ pub const Editor = struct {
const primary = self.get_primary(); const primary = self.get_primary();
if (self.get_prev_match(primary.cursor)) |match| { if (self.get_prev_match(primary.cursor)) |match| {
const root = self.buf_root() catch return; const root = self.buf_root() catch return;
if (primary.selection) |sel| if (self.find_selection_match(sel)) |match_| {
match_.has_selection = false;
};
primary.selection = match.to_selection(); primary.selection = match.to_selection();
primary.selection.?.reverse(); primary.selection.?.reverse();
primary.cursor.move_to(root, match.begin.row, match.begin.col, self.plane) catch return; primary.cursor.move_to(root, match.begin.row, match.begin.col, self.plane) catch return;