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

refactor: import Selection directly into completion_dropdown

Browse source
This commit is contained in:
CJ van den Berg 2026-02-03 19:26:41 +01:00
parent 87e0e06aaf
commit 59de78723e
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/tui/mode/overlay/completion_dropdown.zig
View file

@ -4,6 +4,7 @@ const tp = @import("thespian");
const root = @import("soft_root").root; const root = @import("soft_root").root;
const command = @import("command"); const command = @import("command");
const Buffer = @import("Buffer"); const Buffer = @import("Buffer");
const Selection = Buffer.Selection;
const builtin = @import("builtin"); const builtin = @import("builtin");
const CompletionItemKind = @import("lsp_types").CompletionItemKind; const CompletionItemKind = @import("lsp_types").CompletionItemKind;
@ -33,7 +34,7 @@ pub const ValueType = struct {
editor: *ed.Editor = undefined, editor: *ed.Editor = undefined,
cursor: ed.Cursor = .{}, cursor: ed.Cursor = .{},
view: ed.View = .{}, view: ed.View = .{},
query: ?Buffer.Selection = null, query: ?Selection = null,
last_query: ?[]const u8 = null, last_query: ?[]const u8 = null,
commands: command.Collection(cmds) = undefined, commands: command.Collection(cmds) = undefined,
data: []const u8 = &.{}, data: []const u8 = &.{},
@ -118,7 +119,7 @@ pub fn initial_query(self: *Type, allocator: std.mem.Allocator) error{ Stop, Out
fn get_query_text_nostore(self: *Type, cursor: ed.Cursor, allocator: std.mem.Allocator) error{ Stop, OutOfMemory }![]const u8 { fn get_query_text_nostore(self: *Type, cursor: ed.Cursor, allocator: std.mem.Allocator) error{ Stop, OutOfMemory }![]const u8 {
return if (self.value.query) |query| blk: { return if (self.value.query) |query| blk: {
const sel: Buffer.Selection = .{ .begin = query.begin, .end = cursor }; const sel: Selection = .{ .begin = query.begin, .end = cursor };
break :blk try self.value.editor.get_selection(sel, allocator); break :blk try self.value.editor.get_selection(sel, allocator);
} else allocator.dupe(u8, ""); } else allocator.dupe(u8, "");
} }
@ -219,8 +220,8 @@ pub const Values = struct {
label: []const u8, label: []const u8,
sort_text: []const u8, sort_text: []const u8,
kind: CompletionItemKind, kind: CompletionItemKind,
insert: ?Buffer.Selection, insert: ?Selection,
replace: ?Buffer.Selection, replace: ?Selection,
additionalTextEdits: []const u8, additionalTextEdits: []const u8,
label_detail: []const u8, label_detail: []const u8,
label_description: []const u8, label_description: []const u8,
@ -282,8 +283,8 @@ pub fn get_values(item_cbor: []const u8) Values {
}; };
} }
fn get_range(range_cbor: []const u8) ?Buffer.Selection { fn get_range(range_cbor: []const u8) ?Selection {
var range: Buffer.Selection = .{}; var range: Selection = .{};
return if (cbor.match(range_cbor, tp.null_) catch false) return if (cbor.match(range_cbor, tp.null_) catch false)
null null
else if (cbor.match(range_cbor, .{ else if (cbor.match(range_cbor, .{
@ -301,11 +302,11 @@ const TextEdit = struct { newText: []const u8 = &.{}, insert: ?Range = null, rep
const Range = struct { start: Position, end: Position }; const Range = struct { start: Position, end: Position };
const Position = struct { line: usize, character: usize }; const Position = struct { line: usize, character: usize };
pub fn get_query_selection(editor: *ed.Editor, values: Values) ?Buffer.Selection { pub fn get_query_selection(editor: *ed.Editor, values: Values) ?Selection {
return get_replacement_selection(editor, values.insert, values.replace, null); return get_replacement_selection(editor, values.insert, values.replace, null);
} }
fn get_replacement_selection(editor: *ed.Editor, insert_: ?Buffer.Selection, replace_: ?Buffer.Selection, query: ?Buffer.Selection) Buffer.Selection { fn get_replacement_selection(editor: *ed.Editor, insert_: ?Selection, replace_: ?Selection, query: ?Selection) Selection {
const pos = switch (tui.config().completion_insert_mode) { const pos = switch (tui.config().completion_insert_mode) {
.replace => replace_ orelse insert_, .replace => replace_ orelse insert_,
.insert => insert_ orelse replace_, .insert => insert_ orelse replace_,
@ -334,7 +335,7 @@ fn get_replacement_selection(editor: *ed.Editor, insert_: ?Buffer.Selection, rep
}; };
} }
fn get_insert_selection(editor: *ed.Editor, values: Values, query: ?Buffer.Selection) Buffer.Selection { fn get_insert_selection(editor: *ed.Editor, values: Values, query: ?Selection) Selection {
return get_replacement_selection(editor, values.insert, values.replace, query); return get_replacement_selection(editor, values.insert, values.replace, query);
} }