Compare commits

..

3 commits

4 changed files with 45 additions and 7 deletions

View file

@ -385,7 +385,9 @@
["ctrl+up", "palette_menu_up"],
["ctrl+down", "palette_menu_down"],
["ctrl+enter", "palette_menu_activate"],
["tab", "palette_menu_complete"]
["tab", "palette_menu_complete"],
["ctrl+backspace", "overlay_delete_word_left"],
["backspace", "overlay_delete_backwards"]
]
},
"overlay/dropdown": {
@ -398,7 +400,9 @@
["up", "palette_menu_up"],
["down", "palette_menu_down"],
["enter", "palette_menu_activate"],
["tab", "palette_menu_complete"]
["tab", "palette_menu_complete"],
["ctrl+backspace", "overlay_delete_word_left"],
["backspace", "overlay_delete_backwards"]
]
},
"mini/numeric": {

View file

@ -2286,7 +2286,7 @@ pub const Editor = struct {
var size: usize = 0;
const root_, const trigger_char = try root.delete_range_char(sel, allocator, &size, self.metrics);
self.nudge_delete(sel, cursel, size);
if (trigger_char) |char| self.run_triggers(char, .delete);
if (trigger_char) |char| self.run_triggers(cursel, char, .delete);
return root_;
}
@ -2865,7 +2865,7 @@ pub const Editor = struct {
cursor.row, cursor.col, root_ = try root_.insert_chars(cursor.row, cursor.col, s, allocator, self.metrics);
cursor.target = cursor.col;
self.nudge_insert(.{ .begin = begin, .end = cursor.* }, cursel, s.len);
if (s.len == 1) self.run_triggers(s[0], .insert);
if (s.len == 1) self.run_triggers(cursel, s[0], .insert);
return root_;
}
@ -6253,11 +6253,12 @@ pub const Editor = struct {
return false;
}
pub fn run_triggers(self: *Self, char: u8, event: TriggerEvent) void {
pub fn run_triggers(self: *Self, cursel: *const CurSel, char: u8, event: TriggerEvent) void {
switch (char) {
'\n', '\t', ' ' => return,
else => {},
}
if (!cursel.cursor.eql(self.get_primary().cursor)) return;
for (self.get_event_triggers(event).items) |item| if (item.char == char) {
if (command.log_execute)
self.logger.print("trigger: {t} '{c}' {?s}({d})", .{ event, char, command.get_name(item.command), item.command });

View file

@ -110,7 +110,10 @@ pub fn update_query(self: *Type, query: []const u8) void {
const primary = editor.get_primary();
primary.selection = get_insert_selection(self, editor.get_primary().cursor);
const b = editor.buf_for_update() catch return;
const root_ = editor.insert(b.root, primary, query, b.allocator) catch return;
const root_ = if (query.len > 0)
editor.insert(b.root, primary, query, b.allocator) catch return
else
editor.delete_selection(b.root, primary, b.allocator) catch return;
self.value.cursor = editor.get_primary().cursor;
if (self.value.replace) |*sel| sel.* = .{ .begin = sel.begin, .end = self.value.cursor };
primary.selection = null;
@ -119,7 +122,7 @@ pub fn update_query(self: *Type, query: []const u8) void {
editor.need_render();
if (query.len > 0) {
const last_char = query[query.len - 1];
editor.run_triggers(last_char, .insert);
editor.run_triggers(primary, last_char, .insert);
}
return;
}

View file

@ -353,6 +353,26 @@ pub fn Create(options: type) type {
return matches.items.len;
}
fn delete_word(self: *Self) !void {
if (std.mem.lastIndexOfAny(u8, self.query.items, "/\\. -_")) |pos| {
self.query.shrinkRetainingCapacity(pos);
} else {
self.query.shrinkRetainingCapacity(0);
}
if (@hasDecl(options, "update_query"))
options.update_query(self, self.query.items);
return self.start_query(0);
}
fn delete_code_point(self: *Self) !void {
if (self.query.items.len > 0) {
self.query.shrinkRetainingCapacity(self.query.items.len - tui.egc_last(self.query.items).len);
if (@hasDecl(options, "update_query"))
options.update_query(self, self.query.items);
}
try self.start_query(0);
}
fn insert_code_point(self: *Self, c: u32) !void {
var buf: [6]u8 = undefined;
const bytes = try input.ucs32_to_utf8(&[_]u32{c}, &buf);
@ -523,6 +543,16 @@ pub fn Create(options: type) type {
}
pub const palette_menu_cancel_meta: Meta = .{};
pub fn overlay_delete_word_left(self: *Self, _: Ctx) Result {
self.delete_word() catch |e| return tp.exit_error(e, @errorReturnTrace());
}
pub const overlay_delete_word_left_meta: Meta = .{ .description = "Delete word to the left" };
pub fn overlay_delete_backwards(self: *Self, _: Ctx) Result {
self.delete_code_point() catch |e| return tp.exit_error(e, @errorReturnTrace());
}
pub const overlay_delete_backwards_meta: Meta = .{ .description = "Delete backwards" };
pub fn overlay_insert_code_point(self: *Self, ctx: Ctx) Result {
var egc: u32 = 0;
if (!try ctx.args.match(.{tp.extract(&egc)}))