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

fix(api): nvim_parse_cmd parses :map incorrectly #34068

Browse Source 
Problem: nvim_parse_cmd() incorrectly splits mapping commands like
into three arguments instead of preserving whitespace in the RHS.

Solution: Add special handling for mapping commands to parse them as exactly
two arguments - the LHS and the RHS with all whitespace preserved.
This commit is contained in:
glepnir
2025-06-15 01:17:56 +08:00
committed by GitHub
parent 4367441213
commit c7f38e3bc8
3 changed files with 89 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@
#include "nvim/autocmd.h"
#include "nvim/autocmd_defs.h"
#include "nvim/buffer_defs.h"
#include "nvim/charset.h"
#include "nvim/cmdexpand_defs.h"
#include "nvim/ex_cmds_defs.h"
#include "nvim/ex_docmd.h"
@@ -40,6 +41,31 @@
# include "api/command.c.generated.h"
#endif
/// Parse arguments for :map/:abbrev commands, preserving whitespace in RHS.
/// @param arg_str The argument string to parse
/// @param arena Arena allocator
/// @return Array with at most 2 elements: [lhs, rhs]
static Array parse_map_cmd(const char *arg_str, Arena *arena)
{
Array args = arena_array(arena, 2);
char *lhs_start = (char *)arg_str;
char *lhs_end = skiptowhite(lhs_start);
size_t lhs_len = (size_t)(lhs_end - lhs_start);
// Add the LHS (first argument)
ADD_C(args, STRING_OBJ(cstrn_as_string(lhs_start, lhs_len)));
// Add the RHS (second argument) if it exists, preserving all whitespace
char *rhs_start = skipwhite(lhs_end);
if (*rhs_start != NUL) {
size_t rhs_len = strlen(rhs_start);
ADD_C(args, STRING_OBJ(cstrn_as_string(rhs_start, rhs_len)));
}
return args;
}
/// Parse command line.
///
/// Doesn't check the validity of command arguments.
@@ -121,9 +147,15 @@ Dict(cmd) nvim_parse_cmd(String str, Dict(empty) *opts, Arena *arena, Error *err
Array args = ARRAY_DICT_INIT;
size_t length = strlen(ea.arg);
// For nargs = 1 or '?', pass the entire argument list as a single argument,
// otherwise split arguments by whitespace.
if (ea.argt & EX_NOSPC) {
// Check if this is a mapping command that needs special handling
// like mapping commands need special argument parsing to preserve whitespace in RHS:
// "map a b c" => { args=["a", "b c"], ... }
if (is_map_cmd(ea.cmdidx) && *ea.arg != NUL) {
// For mapping commands, split differently to preserve whitespace
args = parse_map_cmd(ea.arg, arena);
} else if (ea.argt & EX_NOSPC) {
// For nargs = 1 or '?', pass the entire argument list as a single argument,
// otherwise split arguments by whitespace.
if (*ea.arg != NUL) {
args = arena_array(arena, 1);
ADD_C(args, STRING_OBJ(cstrn_as_string(ea.arg, length)));