mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 14:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(api): use an arena for user commands

Browse Source
This commit is contained in:
bfredl
2024-02-18 11:10:05 +01:00
parent a9f578b7a5
commit 1d95abc66b
2 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/api/command.c
View File

@@ -1166,10 +1166,10 @@ err:
/// @param[out] err Error details, if any. /// @param[out] err Error details, if any.
/// ///
/// @returns Map of maps describing commands. /// @returns Map of maps describing commands.
Dictionary nvim_get_commands(Dict(get_commands) *opts, Error *err) Dictionary nvim_get_commands(Dict(get_commands) *opts, Arena *arena, Error *err)
FUNC_API_SINCE(4) FUNC_API_SINCE(4)
{ {
return nvim_buf_get_commands(-1, opts, err); return nvim_buf_get_commands(-1, opts, arena, err);
} }
/// Gets a map of buffer-local |user-commands|. /// Gets a map of buffer-local |user-commands|.
@@ -1179,7 +1179,7 @@ Dictionary nvim_get_commands(Dict(get_commands) *opts, Error *err)
/// @param[out] err Error details, if any. /// @param[out] err Error details, if any.
/// ///
/// @returns Map of maps describing commands. /// @returns Map of maps describing commands.
Dictionary nvim_buf_get_commands(Buffer buffer, Dict(get_commands) *opts, Error *err) Dictionary nvim_buf_get_commands(Buffer buffer, Dict(get_commands) *opts, Arena *arena, Error *err)
FUNC_API_SINCE(4) FUNC_API_SINCE(4)
{ {
bool global = (buffer == -1); bool global = (buffer == -1);
@@ -1192,12 +1192,12 @@ Dictionary nvim_buf_get_commands(Buffer buffer, Dict(get_commands) *opts, Error
api_set_error(err, kErrorTypeValidation, "builtin=true not implemented"); api_set_error(err, kErrorTypeValidation, "builtin=true not implemented");
return (Dictionary)ARRAY_DICT_INIT; return (Dictionary)ARRAY_DICT_INIT;
} }
return commands_array(NULL); return commands_array(NULL, arena);
} }
buf_T *buf = find_buffer_by_handle(buffer, err); buf_T *buf = find_buffer_by_handle(buffer, err);
if (opts->builtin || !buf) { if (opts->builtin || !buf) {
return (Dictionary)ARRAY_DICT_INIT; return (Dictionary)ARRAY_DICT_INIT;
} }
return commands_array(buf); return commands_array(buf, arena);
} }

55
src/nvim/usercmd.c
View File

@@ -1744,25 +1744,24 @@ int do_ucmd(exarg_T *eap, bool preview)
/// @param buf Buffer to inspect, or NULL to get global commands. /// @param buf Buffer to inspect, or NULL to get global commands.
/// ///
/// @return Map of maps describing commands /// @return Map of maps describing commands
Dictionary commands_array(buf_T *buf) Dictionary commands_array(buf_T *buf, Arena *arena)
{ {
Dictionary rv = ARRAY_DICT_INIT;
char str[20];
garray_T *gap = (buf == NULL) ? &ucmds : &buf->b_ucmds; garray_T *gap = (buf == NULL) ? &ucmds : &buf->b_ucmds;
Dictionary rv = arena_dict(arena, (size_t)gap->ga_len);
for (int i = 0; i < gap->ga_len; i++) { for (int i = 0; i < gap->ga_len; i++) {
char arg[2] = { 0, 0 }; char arg[2] = { 0, 0 };
Dictionary d = ARRAY_DICT_INIT; Dictionary d = arena_dict(arena, 14);
ucmd_T *cmd = USER_CMD_GA(gap, i); ucmd_T *cmd = USER_CMD_GA(gap, i);
PUT(d, "name", CSTR_TO_OBJ(cmd->uc_name)); PUT_C(d, "name", CSTR_AS_OBJ(cmd->uc_name));
PUT(d, "definition", CSTR_TO_OBJ(cmd->uc_rep)); PUT_C(d, "definition", CSTR_AS_OBJ(cmd->uc_rep));
PUT(d, "script_id", INTEGER_OBJ(cmd->uc_script_ctx.sc_sid)); PUT_C(d, "script_id", INTEGER_OBJ(cmd->uc_script_ctx.sc_sid));
PUT(d, "bang", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_BANG))); PUT_C(d, "bang", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_BANG)));
PUT(d, "bar", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_TRLBAR))); PUT_C(d, "bar", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_TRLBAR)));
PUT(d, "register", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_REGSTR))); PUT_C(d, "register", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_REGSTR)));
PUT(d, "keepscript", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_KEEPSCRIPT))); PUT_C(d, "keepscript", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_KEEPSCRIPT)));
PUT(d, "preview", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_PREVIEW))); PUT_C(d, "preview", BOOLEAN_OBJ(!!(cmd->uc_argt & EX_PREVIEW)));
switch (cmd->uc_argt & (EX_EXTRA | EX_NOSPC | EX_NEEDARG)) { switch (cmd->uc_argt & (EX_EXTRA | EX_NOSPC | EX_NEEDARG)) {
case 0: case 0:
@@ -1776,49 +1775,47 @@ Dictionary commands_array(buf_T *buf)
case (EX_EXTRA | EX_NOSPC | EX_NEEDARG): case (EX_EXTRA | EX_NOSPC | EX_NEEDARG):
arg[0] = '1'; break; arg[0] = '1'; break;
} }
PUT(d, "nargs", CSTR_TO_OBJ(arg)); PUT_C(d, "nargs", CSTR_TO_ARENA_OBJ(arena, arg));
char *cmd_compl = get_command_complete(cmd->uc_compl); char *cmd_compl = get_command_complete(cmd->uc_compl);
PUT(d, "complete", (cmd_compl == NULL PUT_C(d, "complete", (cmd_compl == NULL
? NIL : CSTR_TO_OBJ(cmd_compl))); ? NIL : CSTR_AS_OBJ(cmd_compl)));
PUT(d, "complete_arg", cmd->uc_compl_arg == NULL PUT_C(d, "complete_arg", cmd->uc_compl_arg == NULL
? NIL : CSTR_TO_OBJ(cmd->uc_compl_arg)); ? NIL : CSTR_AS_OBJ(cmd->uc_compl_arg));
Object obj = NIL; Object obj = NIL;
if (cmd->uc_argt & EX_COUNT) { if (cmd->uc_argt & EX_COUNT) {
if (cmd->uc_def >= 0) { if (cmd->uc_def >= 0) {
snprintf(str, sizeof(str), "%" PRId64, cmd->uc_def); obj = STRING_OBJ(arena_printf(arena, "%" PRId64, cmd->uc_def)); // -count=N
obj = CSTR_TO_OBJ(str); // -count=N
} else { } else {
obj = CSTR_TO_OBJ("0"); // -count obj = CSTR_AS_OBJ("0"); // -count
} }
} }
PUT(d, "count", obj); PUT_C(d, "count", obj);
obj = NIL; obj = NIL;
if (cmd->uc_argt & EX_RANGE) { if (cmd->uc_argt & EX_RANGE) {
if (cmd->uc_argt & EX_DFLALL) { if (cmd->uc_argt & EX_DFLALL) {
obj = CSTR_TO_OBJ("%"); // -range=% obj = STATIC_CSTR_AS_OBJ("%"); // -range=%
} else if (cmd->uc_def >= 0) { } else if (cmd->uc_def >= 0) {
snprintf(str, sizeof(str), "%" PRId64, cmd->uc_def); obj = STRING_OBJ(arena_printf(arena, "%" PRId64, cmd->uc_def)); // -range=N
obj = CSTR_TO_OBJ(str); // -range=N
} else { } else {
obj = CSTR_TO_OBJ("."); // -range obj = STATIC_CSTR_AS_OBJ("."); // -range
} }
} }
PUT(d, "range", obj); PUT_C(d, "range", obj);
obj = NIL; obj = NIL;
for (int j = 0; addr_type_complete[j].expand != ADDR_NONE; j++) { for (int j = 0; addr_type_complete[j].expand != ADDR_NONE; j++) {
if (addr_type_complete[j].expand != ADDR_LINES if (addr_type_complete[j].expand != ADDR_LINES
&& addr_type_complete[j].expand == cmd->uc_addr_type) { && addr_type_complete[j].expand == cmd->uc_addr_type) {
obj = CSTR_TO_OBJ(addr_type_complete[j].name); obj = CSTR_AS_OBJ(addr_type_complete[j].name);
break; break;
} }
} }
PUT(d, "addr", obj); PUT_C(d, "addr", obj);
PUT(rv, cmd->uc_name, DICTIONARY_OBJ(d)); PUT_C(rv, cmd->uc_name, DICTIONARY_OBJ(d));
} }
return rv; return rv;
} }