Compare commits

..

2 commits

2 changed files with 9 additions and 14 deletions

View file

@ -6,8 +6,8 @@
.dependencies = .{
.syntax = .{
.url = "git+https://github.com/neurocyte/flow-syntax?ref=master#9106b13b4c98b145229ad643e7869f29c7b0816b",
.hash = "flow_syntax-0.1.0-X8jOoZQTAQCV2bjyceUHrRl_iu41imzTDLGT5R-XwT_9",
.url = "git+https://github.com/neurocyte/flow-syntax?ref=master#a2356a459e8a1c30e43da8648d45e4eaec518f2b",
.hash = "flow_syntax-0.1.0-X8jOoZQTAQCWj2TJgmEykecTmQFQGqUduPxLVZJM_y88",
},
.flags = .{
.url = "git+https://github.com/neurocyte/flags?ref=main#984b27948da3e4e40a253f76c85b51ec1a9ada11",

View file

@ -2710,13 +2710,12 @@ pub const Editor = struct {
pub const cut_internal_vim_meta: Meta = .{ .description = "Cut selection or current line to internal clipboard (vim)" };
pub fn cut(self: *Self, _: Context) Result {
const primary = self.get_primary();
const b = self.buf_for_update() catch return;
var root = b.root;
if (self.cursels.items.len == 1 and primary.selection == null)
try self.select_line_at_cursor(root, primary, .include_eol);
tui.clipboard_start_group();
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| {
if (cursel.selection == null)
try self.select_line_at_cursor(root, cursel, .include_eol);
const cut_text, root = try self.cut_selection(root, cursel, tui.clipboard_allocator());
tui.clipboard_add_chunk(cut_text);
};
@ -2727,17 +2726,13 @@ pub const Editor = struct {
pub const cut_meta: Meta = .{ .description = "Cut selection or current line to clipboard" };
pub fn copy(self: *Self, _: Context) Result {
const primary = self.get_primary();
const root = self.buf_root() catch return;
if (self.cursels.items.len == 1)
if (primary.selection) |_| {} else {
const sel = primary.enable_selection(root, self.metrics) catch return;
try move_cursor_begin(root, &sel.begin, self.metrics);
try move_cursor_end(root, &sel.end, self.metrics);
try move_cursor_right(root, &sel.end, self.metrics);
};
tui.clipboard_start_group();
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| if (cursel.selection) |sel| {
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| {
const sel = if (cursel.selection) |sel| sel else blk: {
try self.select_line_at_cursor(root, cursel, .include_eol);
break :blk cursel.selection orelse continue;
};
tui.clipboard_add_chunk(try copy_selection(root, sel, tui.clipboard_allocator(), self.metrics));
};
return tui.clipboard_send_to_system();