diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-05-03 00:05:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-03 00:05:46 +0800 |
| commit | bff3f4fa8bbadf7494bcf3098eee8da39cc2c436 (patch) | |
| tree | d6c2d32147af87f7ac7146c39d2e2c7f68afd88c /src | |
| parent | f186224dfcf86678b6e5ee126d6b9a393f02f634 (diff) | |
| download | rneovim-bff3f4fa8bbadf7494bcf3098eee8da39cc2c436.tar.gz rneovim-bff3f4fa8bbadf7494bcf3098eee8da39cc2c436.tar.bz2 rneovim-bff3f4fa8bbadf7494bcf3098eee8da39cc2c436.zip | |
vim-patch:9.0.1505: error when heredoc content looks like heredoc (#23446)
Problem: Error when heredoc content looks like heredoc.
Solution: Handle curly expressions. (closes vim/vim#12325)
https://github.com/vim/vim/commit/a93d9cdc74f70ca2c85781496ffae4ca738fcd88
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/userfunc.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index 1f5a6eaec4..bfda2c4b9b 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -2587,19 +2587,13 @@ void ex_function(exarg_T *eap) // Check for ":let v =<< [trim] EOF" // and ":let [a, b] =<< [trim] EOF" - arg = skipwhite(skiptowhite(p)); - if (*arg == '[') { - arg = vim_strchr(arg, ']'); - } - if (arg != NULL) { - arg = skipwhite(skiptowhite(arg)); - if (arg[0] == '=' - && arg[1] == '<' - && arg[2] == '<' - && (p[0] == 'l' - && p[1] == 'e' - && (!ASCII_ISALNUM(p[2]) - || (p[2] == 't' && !ASCII_ISALNUM(p[3]))))) { + arg = p; + if (checkforcmd(&arg, "let", 2)) { + while (vim_strchr("$@&", *arg) != NULL) { + arg++; + } + arg = skipwhite(find_name_end(arg, NULL, NULL, FNE_INCL_BR)); + if (arg[0] == '=' && arg[1] == '<' && arg[2] == '<') { p = skipwhite(arg + 3); while (true) { if (strncmp(p, "trim", 4) == 0) { |