mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-13 01:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1074: Strange error when heredoc marker starts with "trim" (#32317)

Browse Source 
Problem:  Strange error when heredoc marker starts with "trim".
Solution: Check for whitespace after "trim" or "eval" (zeertzjq)

For :python3 etc., a heredoc marker that starts with a lower-case letter
is valid, and when it starts with "trim" it works in a script but not in
a function, and this PR makes it works in a function.
For :let, a heredoc marker that starts with a lower-case letter is not
valid, but when it starts with "trim" or "eval" the error can be a bit
confusing in a function, and this PR make it less confusing.

closes: vim/vim#16574

449c2e5454
This commit is contained in:
zeertzjq
2025-02-04 07:44:41 +08:00
committed by GitHub
parent f618cdf9c4
commit 5a7cf85c2c
6 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/eval/userfunc.c
View File

@@ -2456,7 +2456,8 @@ static int get_function_body(exarg_T *eap, garray_T *newlines, char *line_arg_in
&& (!ASCII_ISALPHA(p[2]) || p[2] == 's')))) {
// ":python <<" continues until a dot, like ":append"
p = skipwhite(arg + 2);
if (strncmp(p, "trim", 4) == 0) {
if (strncmp(p, "trim", 4) == 0
&& (p[4] == NUL || ascii_iswhite(p[4]))) {
// Ignore leading white space.
p = skipwhite(p + 4);
heredoc_trimmedlen = (size_t)(skipwhite(theline) - theline);
@@ -2484,21 +2485,27 @@ static int get_function_body(exarg_T *eap, garray_T *newlines, char *line_arg_in
}
if (arg != NULL && strncmp(arg, "=<<", 3) == 0) {
p = skipwhite(arg + 3);
bool has_trim = false;
while (true) {
if (strncmp(p, "trim", 4) == 0) {
if (strncmp(p, "trim", 4) == 0
&& (p[4] == NUL || ascii_iswhite(p[4]))) {
// Ignore leading white space.
p = skipwhite(p + 4);
heredoc_trimmedlen = (size_t)(skipwhite(theline) - theline);
heredoc_trimmed = xmemdupz(theline, heredoc_trimmedlen);
has_trim = true;
continue;
}
if (strncmp(p, "eval", 4) == 0) {
if (strncmp(p, "eval", 4) == 0
&& (p[4] == NUL || ascii_iswhite(p[4]))) {
// Ignore leading white space.
p = skipwhite(p + 4);
continue;
}
break;
}
if (has_trim) {
heredoc_trimmedlen = (size_t)(skipwhite(theline) - theline);
heredoc_trimmed = xmemdupz(theline, heredoc_trimmedlen);
}
skip_until = xmemdupz(p, (size_t)(skiptowhite(p) - p));
do_concat = false;
is_heredoc = true;