diff options
author | zeertzjq <zeertzjq@outlook.com> | 2024-04-16 10:18:24 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-16 10:18:24 +0800 |
commit | e3c083832c77eb7c24442bd10bbb718599a764d9 (patch) | |
tree | 14fe2dfcfd05b95d57a01f2603f5d8760935fd52 /src/nvim/eval.c | |
parent | b1e8b799a58f2b984b18940bb134996651aac248 (diff) | |
download | rneovim-e3c083832c77eb7c24442bd10bbb718599a764d9.tar.gz rneovim-e3c083832c77eb7c24442bd10bbb718599a764d9.tar.bz2 rneovim-e3c083832c77eb7c24442bd10bbb718599a764d9.zip |
vim-patch:9.1.0335: String interpolation fails for List type (#28364)
Problem: String interpolation fails for List type
Solution: use implicit string(list) for string interpolation and :put =
(Yegappan Lakshmanan)
related: vim/vim#14529
closes: vim/vim#14556
https://github.com/vim/vim/commit/bce51d9005dd1c5bc002acbac2e12b649abcb013
Cherry-pick eval_to_string_eap() from patch 8.2.1914.
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r-- | src/nvim/eval.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 6480d6e305..213948a028 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -969,13 +969,12 @@ int skip_expr(char **pp, evalarg_T *const evalarg) /// Convert "tv" to a string. /// -/// @param convert when true convert a List into a sequence of lines -/// and a Dict into a textual representation of the Dict. +/// @param join_list when true convert a List into a sequence of lines. /// /// @return an allocated string. -static char *typval2string(typval_T *tv, bool convert) +static char *typval2string(typval_T *tv, bool join_list) { - if (convert && tv->v_type == VAR_LIST) { + if (join_list && tv->v_type == VAR_LIST) { garray_T ga; ga_init(&ga, (int)sizeof(char), 80); if (tv->vval.v_list != NULL) { @@ -986,7 +985,7 @@ static char *typval2string(typval_T *tv, bool convert) } ga_append(&ga, NUL); return (char *)ga.ga_data; - } else if (convert && tv->v_type == VAR_DICT) { + } else if (tv->v_type == VAR_LIST || tv->v_type == VAR_DICT) { return encode_tv2string(tv, NULL); } return xstrdup(tv_get_string(tv)); @@ -994,18 +993,20 @@ static char *typval2string(typval_T *tv, bool convert) /// Top level evaluation function, returning a string. /// -/// @param convert when true convert a List into a sequence of lines. +/// @param join_list when true convert a List into a sequence of lines. /// /// @return pointer to allocated memory, or NULL for failure. -char *eval_to_string(char *arg, bool convert) +char *eval_to_string_eap(char *arg, bool join_list, exarg_T *eap) { typval_T tv; char *retval; - if (eval0(arg, &tv, NULL, &EVALARG_EVALUATE) == FAIL) { + evalarg_T evalarg; + fill_evalarg_from_eap(&evalarg, eap, eap != NULL && eap->skip); + if (eval0(arg, &tv, NULL, &evalarg) == FAIL) { retval = NULL; } else { - retval = typval2string(&tv, convert); + retval = typval2string(&tv, join_list); tv_clear(&tv); } clear_evalarg(&EVALARG_EVALUATE, NULL); @@ -1013,6 +1014,11 @@ char *eval_to_string(char *arg, bool convert) return retval; } +char *eval_to_string(char *arg, bool join_list) +{ + return eval_to_string_eap(arg, join_list, NULL); +} + /// Call eval_to_string() without using current local variables and using /// textlock. /// |