From 402bc58112c5881d814ee6b04559d7369d455a9f Mon Sep 17 00:00:00 2001 From: Randy Palamar Date: Fri, 5 Dec 2025 14:53:04 -0700 Subject: vis-lua: complete_command: utilize map_prefix() instead of grep we already have a function for filtering by a prefix. No need for snprintf and extra grep process for filtering. also use simpler buffer_append for appending instead of going through string formatting --- vis-cmds.c | 7 ++++--- vis-lua.c | 8 +++----- vis.h | 3 ++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/vis-cmds.c b/vis-cmds.c index b543683..adb5822 100644 --- a/vis-cmds.c +++ b/vis-cmds.c @@ -695,11 +695,12 @@ static bool print_cmd(const char *key, void *value, void *data) { static bool print_cmd_name(const char *key, void *value, void *data) { CommandDef *cmd = value; - return buffer_appendf(data, "%s\n", cmd->name); + bool result = buffer_append(data, cmd->name, strlen(cmd->name)); + return result && buffer_append(data, "\n", 1); } -void vis_print_cmds(Vis *vis, Buffer *buf) { - map_iterate(vis->cmds, print_cmd_name, buf); +void vis_print_cmds(Vis *vis, Buffer *buf, const char *prefix) { + map_iterate(map_prefix(vis->cmds, prefix), print_cmd_name, buf); } static bool print_option(const char *key, void *value, void *txt) { diff --git a/vis-lua.c b/vis-lua.c index 99d9746..7986503 100644 --- a/vis-lua.c +++ b/vis-lua.c @@ -1161,13 +1161,11 @@ static int complete_command(lua_State *L) { Vis *vis = obj_ref_check(L, 1, "vis"); const char *prefix = luaL_checkstring(L, 2); char *out = NULL, *err = NULL; - char cmd[32]; - int max_prefix_len = sizeof(cmd) - sizeof("grep '^' | vis-menu -b"); // including NUL - snprintf(cmd, sizeof(cmd), "grep '^%.*s' | vis-menu -b", max_prefix_len, prefix); Buffer buf = {0}; - vis_print_cmds(vis, &buf); - int status = vis_pipe_buf_collect(vis, buffer_content0(&buf), (const char*[]){cmd, NULL}, &out, &err, false); + vis_print_cmds(vis, &buf, prefix); + int status = vis_pipe_buf_collect(vis, buffer_content0(&buf), (const char*[]){"vis-menu", "-b", 0}, + &out, &err, false); lua_pushinteger(L, status); if (out) lua_pushstring(L, out); diff --git a/vis.h b/vis.h index 01bf1a0..80a37aa 100644 --- a/vis.h +++ b/vis.h @@ -1234,8 +1234,9 @@ bool vis_prompt_cmd(Vis *vis, const char *cmd); * Write newline separated list of available commands to ``buf`` * @param vis The editor instance. * @param buf The buffer to write to. + * @param prefix Prefix to filter command list by. */ -void vis_print_cmds(Vis*, Buffer *buf); +void vis_print_cmds(Vis*, Buffer *buf, const char *prefix); /** * Pipe a given file range to an external process. -- cgit v1.2.3