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

feat: Helix & Vim mode: adding more commands (#218)

Browse source 
* Helix mode: select_left

* select_to_char_right implementation

* Vim select_to_char_left

* Helix select_to_char_left

* Helix & Vim: select_end

* select_to_char_left: Avoid panic with no selection

* select_left_helix: handling panic and shrinking code

* Correcting helix left and right select

* Helix mode: select_left

* select_to_char_right implementation

* Vim select_to_char_left

* Helix select_to_char_left

* Helix & Vim: select_end

* select_to_char_left: Avoid panic with no selection

* select_left_helix: handling panic and shrinking code

* Correcting helix left and right select

* Enable_selection on init_command

* move_to_char modification

* move_or_select

---------

Co-authored-by: CJ van den Berg <cj@vdbonline.com>
This commit is contained in:
Levi 2025-04-08 05:28:29 -03:00 • committed by GitHub
parent 716f871d03
commit fb985a703a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 126 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/tui/editor.zig
View file

@ -96,7 +96,7 @@ pub const CurSel = struct {
self.* = .{};
}
fn enable_selection(self: *Self, root: Buffer.Root, metrics: Buffer.Metrics) !*Selection {
pub fn enable_selection(self: *Self, root: Buffer.Root, metrics: Buffer.Metrics) !*Selection {
return switch (tui.get_selection_style()) {
.normal => self.enable_selection_normal(),
.inclusive => try self.enable_selection_inclusive(root, metrics),
@ -147,7 +147,7 @@ pub const CurSel = struct {
}
}
fn check_selection(self: *Self, root: Buffer.Root, metrics: Buffer.Metrics) void {
pub fn check_selection(self: *Self, root: Buffer.Root, metrics: Buffer.Metrics) void {
if (self.selection) |sel| if (sel.empty()) {
self.disable_selection(root, metrics);
};
@ -2123,7 +2123,7 @@ pub const Editor = struct {
return if (cursor.col == first) cursor.move_begin() else cursor.move_to(root, cursor.row, first, metrics);
}
fn move_cursor_right(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) error{Stop}!void {
pub fn move_cursor_right(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) error{Stop}!void {
try cursor.move_right(root, metrics);
}
@ -3089,6 +3089,18 @@ pub const Editor = struct {
}
pub const move_to_char_right_meta: Meta = .{ .arguments = &.{.integer} };
pub fn move_or_select_to_char_left(self: *Self, ctx: Context) Result {
const selected = if (self.get_primary().selection) |_| true else false;
if (selected) try self.select_to_char_left(ctx) else try self.move_to_char_left(ctx);
}
pub const move_or_select_to_char_left_meta: Meta = .{ .arguments = &.{.integer} };
pub fn move_or_select_to_char_right(self: *Self, ctx: Context) Result {
const selected = if (self.get_primary().selection) |_| true else false;
if (selected) try self.select_to_char_right(ctx) else try self.move_to_char_right(ctx);
}
pub const move_or_select_to_char_right_meta: Meta = .{ .arguments = &.{.integer} };
pub fn move_up(self: *Self, _: Context) Result {
const root = try self.buf_root();
self.with_cursors_const(root, move_cursor_up) catch {};
@ -3592,6 +3604,12 @@ pub const Editor = struct {
}
pub const cancel_meta: Meta = .{ .description = "Cancel current action" };
pub fn enable_selection(self: *Self, _: Context) Result {
const root = try self.buf_root();
_ = try self.get_primary().enable_selection(root, self.metrics);
}
pub const enable_selection_meta: Meta = .{ .description = "Enable selection" };
pub fn select_line_vim(self: *Self, _: Context) Result {
self.selection_mode = .line;
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel|
@ -3702,6 +3720,16 @@ pub const Editor = struct {
}
pub const select_to_char_left_meta: Meta = .{ .arguments = &.{.integer} };
pub fn select_to_char_left_vim(self: *Self, ctx: Context) Result {
const root = try self.buf_root();
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| {
if (cursel.selection) |*sel| try sel.begin.move_right(root, self.metrics);
};
self.with_selections_const_arg(root, move_cursor_to_char_left, ctx) catch {};
self.clamp();
}
pub const select_to_char_left_vim_meta: Meta = .{ .arguments = &.{.integer} };
pub fn select_to_char_right(self: *Self, ctx: Context) Result {
const root = try self.buf_root();
self.with_selections_const_arg(root, move_cursor_to_char_right, ctx) catch {};