feat: implement inline completion mode with a dropdown overlay
This commit is contained in:
parent
342e7d98c8
commit
3a61bb2ae9
2 changed files with 310 additions and 1 deletions
|
|
@ -1148,7 +1148,10 @@ const cmds = struct {
|
||||||
})) return error.InvalidAddDiagnosticArgument;
|
})) return error.InvalidAddDiagnosticArgument;
|
||||||
file_path = project_manager.normalize_file_path(file_path);
|
file_path = project_manager.normalize_file_path(file_path);
|
||||||
if (self.get_active_editor()) |editor| if (std.mem.eql(u8, file_path, editor.file_path orelse "")) {
|
if (self.get_active_editor()) |editor| if (std.mem.eql(u8, file_path, editor.file_path orelse "")) {
|
||||||
try tui.open_overlay(@import("mode/overlay/completion_palette.zig").Type);
|
switch (tui.config().completion_style) {
|
||||||
|
.palette => try tui.open_overlay(@import("mode/overlay/completion_palette.zig").Type),
|
||||||
|
.dropdown => try tui.open_overlay(@import("mode/overlay/completion_dropdown.zig").Type),
|
||||||
|
}
|
||||||
tui.need_render();
|
tui.need_render();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
306
src/tui/mode/overlay/completion_dropdown.zig
Normal file
306
src/tui/mode/overlay/completion_dropdown.zig
Normal file
|
|
@ -0,0 +1,306 @@
|
||||||
|
const std = @import("std");
|
||||||
|
const cbor = @import("cbor");
|
||||||
|
const tp = @import("thespian");
|
||||||
|
const root = @import("soft_root").root;
|
||||||
|
const command = @import("command");
|
||||||
|
const Buffer = @import("Buffer");
|
||||||
|
const builtin = @import("builtin");
|
||||||
|
const CompletionItemKind = @import("lsp_types").CompletionItemKind;
|
||||||
|
|
||||||
|
const tui = @import("../../tui.zig");
|
||||||
|
pub const Type = @import("dropdown.zig").Create(@This());
|
||||||
|
const ed = @import("../../editor.zig");
|
||||||
|
const module_name = @typeName(@This());
|
||||||
|
const Widget = @import("../../Widget.zig");
|
||||||
|
|
||||||
|
pub const label = "Select completion";
|
||||||
|
pub const name = "completion";
|
||||||
|
pub const description = "completions";
|
||||||
|
pub const icon = " ";
|
||||||
|
pub const modal_dim = false;
|
||||||
|
pub const placement = .primary_cursor;
|
||||||
|
pub const widget_type: Widget.Type = .dropdown;
|
||||||
|
|
||||||
|
pub const Entry = struct {
|
||||||
|
label: []const u8,
|
||||||
|
sort_text: []const u8,
|
||||||
|
cbor: []const u8,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub const ValueType = struct {
|
||||||
|
start: ed.CurSel = .{},
|
||||||
|
cursor: ed.Cursor = .{},
|
||||||
|
replace: ?Buffer.Selection = null,
|
||||||
|
};
|
||||||
|
pub const defaultValue: ValueType = .{};
|
||||||
|
|
||||||
|
var max_description: usize = 0;
|
||||||
|
|
||||||
|
pub fn load_entries(self: *Type) !usize {
|
||||||
|
const editor = tui.get_active_editor() orelse return error.NotFound;
|
||||||
|
self.value.start = editor.get_primary().*;
|
||||||
|
var iter: []const u8 = editor.completions.items;
|
||||||
|
while (iter.len > 0) {
|
||||||
|
var cbor_item: []const u8 = undefined;
|
||||||
|
if (!try cbor.matchValue(&iter, cbor.extract_cbor(&cbor_item))) return error.BadCompletion;
|
||||||
|
(try self.entries.addOne(self.allocator)).* = .{ .cbor = cbor_item, .label = undefined, .sort_text = undefined };
|
||||||
|
}
|
||||||
|
|
||||||
|
max_description = 0;
|
||||||
|
var max_label_len: usize = 0;
|
||||||
|
for (self.entries.items) |*item| {
|
||||||
|
const values = get_values(item.cbor);
|
||||||
|
if (self.value.replace == null) if (get_replace_selection(values.replace)) |replace| {
|
||||||
|
self.value.replace = replace;
|
||||||
|
};
|
||||||
|
item.label = values.label;
|
||||||
|
item.sort_text = values.sort_text;
|
||||||
|
|
||||||
|
var lines = std.mem.splitScalar(u8, values.label_description, '\n');
|
||||||
|
const label_description_len = if (lines.next()) |desc| desc.len else values.label_description.len;
|
||||||
|
|
||||||
|
max_label_len = @max(max_label_len, item.label.len);
|
||||||
|
max_description = @max(max_description, label_description_len + values.label_detail.len);
|
||||||
|
}
|
||||||
|
|
||||||
|
const less_fn = struct {
|
||||||
|
fn less_fn(_: void, lhs: Entry, rhs: Entry) bool {
|
||||||
|
const lhs_str = if (lhs.sort_text.len > 0) lhs.sort_text else lhs.label;
|
||||||
|
const rhs_str = if (rhs.sort_text.len > 0) rhs.sort_text else rhs.label;
|
||||||
|
return std.mem.order(u8, lhs_str, rhs_str) == .lt;
|
||||||
|
}
|
||||||
|
}.less_fn;
|
||||||
|
std.mem.sort(Entry, self.entries.items, {}, less_fn);
|
||||||
|
|
||||||
|
max_description = @min(max_description, tui.screen().w -| max_label_len -| 10);
|
||||||
|
return @max(max_description, if (max_label_len > label.len + 3) 0 else label.len + 3 - max_label_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deinit(_: *Type) void {
|
||||||
|
//
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn handle_event(self: *Type, _: tp.pid_ref, m: tp.message) tp.result {
|
||||||
|
if (try m.match(.{ "E", "update" }) or
|
||||||
|
try m.match(.{ "E", "sel", tp.more }) or
|
||||||
|
try m.match(.{ "E", "view", tp.more }) or
|
||||||
|
try m.match(.{ "E", "pos", tp.more }) or
|
||||||
|
try m.match(.{ "E", "close" }))
|
||||||
|
{
|
||||||
|
const editor = tui.get_active_editor() orelse return;
|
||||||
|
if (!self.value.cursor.eql(editor.get_primary().cursor))
|
||||||
|
tp.self_pid().send(.{ "cmd", "exit_overlay_mode" }) catch |e| self.logger.err(module_name, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn initial_query(self: *Type, allocator: std.mem.Allocator) error{OutOfMemory}![]const u8 {
|
||||||
|
const editor = tui.get_active_editor() orelse return allocator.dupe(u8, "");
|
||||||
|
self.value.cursor = editor.get_primary().cursor;
|
||||||
|
return if (self.value.replace) |replace| blk: {
|
||||||
|
const sel: Buffer.Selection = .{ .begin = replace.begin, .end = self.value.start.cursor };
|
||||||
|
break :blk editor.get_selection(sel, allocator) catch break :blk allocator.dupe(u8, "");
|
||||||
|
} else allocator.dupe(u8, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn update_query(self: *Type, query: []const u8) void {
|
||||||
|
const editor = tui.get_active_editor() orelse return;
|
||||||
|
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;
|
||||||
|
primary.selection = null;
|
||||||
|
self.value.cursor = editor.get_primary().cursor;
|
||||||
|
editor.update_buf(root_) catch {};
|
||||||
|
editor.clamp();
|
||||||
|
editor.need_render();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_insert_selection(self: *Type, cursor: ed.Cursor) ed.Selection {
|
||||||
|
const begin = if (self.value.replace) |sel|
|
||||||
|
sel.begin
|
||||||
|
else if (self.value.start.selection) |sel|
|
||||||
|
sel.begin
|
||||||
|
else
|
||||||
|
self.value.start.cursor;
|
||||||
|
return .{ .begin = begin, .end = cursor };
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn clear_entries(self: *Type) void {
|
||||||
|
self.entries.clearRetainingCapacity();
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_menu_entry(self: *Type, entry: *Entry, matches: ?[]const usize) !void {
|
||||||
|
var value: std.Io.Writer.Allocating = .init(self.allocator);
|
||||||
|
defer value.deinit();
|
||||||
|
const writer = &value.writer;
|
||||||
|
try writer.writeAll(entry.cbor);
|
||||||
|
try cbor.writeValue(writer, matches orelse &[_]usize{});
|
||||||
|
try self.menu.add_item_with_handler(value.written(), select);
|
||||||
|
self.items += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn on_render_menu(_: *Type, button: *Type.ButtonType, theme: *const Widget.Theme, selected: bool) bool {
|
||||||
|
var item_cbor: []const u8 = undefined;
|
||||||
|
var matches_cbor: []const u8 = undefined;
|
||||||
|
|
||||||
|
var iter = button.opts.label;
|
||||||
|
if (!(cbor.matchValue(&iter, cbor.extract_cbor(&item_cbor)) catch false)) return false;
|
||||||
|
if (!(cbor.matchValue(&iter, cbor.extract_cbor(&matches_cbor)) catch false)) return false;
|
||||||
|
|
||||||
|
const values = get_values(item_cbor);
|
||||||
|
const icon_: []const u8 = values.kind.icon();
|
||||||
|
const color: u24 = 0x0;
|
||||||
|
|
||||||
|
if (tui.config().enable_terminal_cursor) blk: {
|
||||||
|
const cursor = (tui.get_active_editor() orelse break :blk).get_primary_abs() orelse break :blk;
|
||||||
|
tui.rdr().cursor_enable(@intCast(cursor.row), @intCast(cursor.col), tui.get_cursor_shape()) catch {};
|
||||||
|
}
|
||||||
|
|
||||||
|
return tui.render_symbol(
|
||||||
|
&button.plane,
|
||||||
|
values.label,
|
||||||
|
icon_,
|
||||||
|
color,
|
||||||
|
values.label_detail,
|
||||||
|
values.label_description,
|
||||||
|
matches_cbor,
|
||||||
|
button.active,
|
||||||
|
selected,
|
||||||
|
button.hover,
|
||||||
|
theme,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const Values = struct {
|
||||||
|
label: []const u8,
|
||||||
|
sort_text: []const u8,
|
||||||
|
kind: CompletionItemKind,
|
||||||
|
replace: Buffer.Selection,
|
||||||
|
additionalTextEdits: []const u8,
|
||||||
|
label_detail: []const u8,
|
||||||
|
label_description: []const u8,
|
||||||
|
detail: []const u8,
|
||||||
|
documentation: []const u8,
|
||||||
|
insertText: []const u8,
|
||||||
|
insertTextFormat: usize,
|
||||||
|
textEdit_newText: []const u8,
|
||||||
|
};
|
||||||
|
|
||||||
|
fn get_values(item_cbor: []const u8) Values {
|
||||||
|
var label_: []const u8 = "";
|
||||||
|
var label_detail: []const u8 = "";
|
||||||
|
var label_description: []const u8 = "";
|
||||||
|
var detail: []const u8 = "";
|
||||||
|
var documentation: []const u8 = "";
|
||||||
|
var sort_text: []const u8 = "";
|
||||||
|
var kind: u8 = 0;
|
||||||
|
var insertText: []const u8 = "";
|
||||||
|
var insertTextFormat: usize = 0;
|
||||||
|
var textEdit_newText: []const u8 = "";
|
||||||
|
var replace: Buffer.Selection = .{};
|
||||||
|
var additionalTextEdits: []const u8 = &.{};
|
||||||
|
_ = cbor.match(item_cbor, .{
|
||||||
|
cbor.any, // file_path
|
||||||
|
cbor.any, // row
|
||||||
|
cbor.any, // col
|
||||||
|
cbor.any, // is_incomplete
|
||||||
|
cbor.extract(&label_), // label
|
||||||
|
cbor.extract(&label_detail), // label_detail
|
||||||
|
cbor.extract(&label_description), // label_description
|
||||||
|
cbor.extract(&kind), // kind
|
||||||
|
cbor.extract(&detail), // detail
|
||||||
|
cbor.extract(&documentation), // documentation
|
||||||
|
cbor.any, // documentation_kind
|
||||||
|
cbor.extract(&sort_text), // sortText
|
||||||
|
cbor.extract(&insertText), // insertText
|
||||||
|
cbor.extract(&insertTextFormat), // insertTextFormat
|
||||||
|
cbor.extract(&textEdit_newText), // textEdit_newText
|
||||||
|
cbor.any, // insert.begin.row
|
||||||
|
cbor.any, // insert.begin.col
|
||||||
|
cbor.any, // insert.end.row
|
||||||
|
cbor.any, // insert.end.col
|
||||||
|
cbor.extract(&replace.begin.row), // replace.begin.row
|
||||||
|
cbor.extract(&replace.begin.col), // replace.begin.col
|
||||||
|
cbor.extract(&replace.end.row), // replace.end.row
|
||||||
|
cbor.extract(&replace.end.col), // replace.end.col
|
||||||
|
cbor.extract_cbor(&additionalTextEdits),
|
||||||
|
}) catch false;
|
||||||
|
return .{
|
||||||
|
.label = label_,
|
||||||
|
.sort_text = sort_text,
|
||||||
|
.kind = @enumFromInt(kind),
|
||||||
|
.replace = replace,
|
||||||
|
.additionalTextEdits = additionalTextEdits,
|
||||||
|
.label_detail = label_detail,
|
||||||
|
.label_description = label_description,
|
||||||
|
.detail = detail,
|
||||||
|
.documentation = documentation,
|
||||||
|
.insertTextFormat = insertTextFormat,
|
||||||
|
.insertText = insertText,
|
||||||
|
.textEdit_newText = textEdit_newText,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const TextEdit = struct { newText: []const u8 = &.{}, insert: ?Range = null, replace: ?Range = null };
|
||||||
|
const Range = struct { start: Position, end: Position };
|
||||||
|
const Position = struct { line: usize, character: usize };
|
||||||
|
|
||||||
|
fn get_replace_selection(replace: Buffer.Selection) ?Buffer.Selection {
|
||||||
|
return if (replace.empty())
|
||||||
|
null
|
||||||
|
else if (tui.get_active_editor()) |edt|
|
||||||
|
replace.from_pos(edt.buf_root() catch return null, edt.metrics)
|
||||||
|
else
|
||||||
|
replace;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn complete(self: *Type, _: ?*Type.ButtonType) !void {
|
||||||
|
self.menu.activate_selected();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn select(menu: **Type.MenuType, button: *Type.ButtonType, _: Type.Pos) void {
|
||||||
|
const self = menu.*.opts.ctx;
|
||||||
|
const values = get_values(button.opts.label);
|
||||||
|
const editor = tui.get_active_editor() orelse return;
|
||||||
|
const primary = editor.get_primary();
|
||||||
|
primary.selection = get_insert_selection(self, editor.get_primary().cursor);
|
||||||
|
const text = if (values.insertText.len > 0)
|
||||||
|
values.insertText
|
||||||
|
else if (values.textEdit_newText.len > 0)
|
||||||
|
values.textEdit_newText
|
||||||
|
else
|
||||||
|
values.label;
|
||||||
|
switch (values.insertTextFormat) {
|
||||||
|
2 => editor.insert_snippet(text) catch |e| self.logger.err(module_name, e),
|
||||||
|
else => editor.insert_cursels(text) catch |e| self.logger.err(module_name, e),
|
||||||
|
}
|
||||||
|
const mv = tui.mainview() orelse return;
|
||||||
|
mv.cancel_info_content() catch {};
|
||||||
|
tp.self_pid().send(.{ "cmd", "exit_overlay_mode" }) catch |e| self.logger.err(module_name, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn updated(self: *Type, button_: ?*Type.ButtonType) !void {
|
||||||
|
const button = button_ orelse return cancel(self);
|
||||||
|
const values = get_values(button.opts.label);
|
||||||
|
const mv = tui.mainview() orelse return;
|
||||||
|
try mv.set_info_content(values.label, .replace);
|
||||||
|
try mv.set_info_content(" ", .append); // blank line
|
||||||
|
try mv.set_info_content(values.detail, .append);
|
||||||
|
if (builtin.mode == .Debug) {
|
||||||
|
try mv.set_info_content("newText:", .append); // blank line
|
||||||
|
try mv.set_info_content(values.textEdit_newText, .append);
|
||||||
|
try mv.set_info_content("insertText:", .append); // blank line
|
||||||
|
try mv.set_info_content(values.insertText, .append);
|
||||||
|
}
|
||||||
|
try mv.set_info_content(" ", .append); // blank line
|
||||||
|
try mv.set_info_content(values.documentation, .append);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn cancel(_: *Type) !void {
|
||||||
|
const editor = tui.get_active_editor() orelse return;
|
||||||
|
editor.cancel_all_matches();
|
||||||
|
editor.cancel_all_selections();
|
||||||
|
const mv = tui.mainview() orelse return;
|
||||||
|
mv.cancel_info_content() catch {};
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue