From 5a7cf85c2c7e452563a4bce9195e9a3426ca3050 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 4 Feb 2025 07:44:41 +0800
Subject: vim-patch:9.1.1074: Strange error when heredoc marker starts with
 "trim" (#32317)

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

https://github.com/vim/vim/commit/449c2e5454735fe1cfc8c21b2c6880d6bdf4cd6e
---
 src/nvim/eval/userfunc.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/nvim/eval/userfunc.c')

diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 68bbf76043..f386dd28b9 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -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;
-- 
cgit