Mercurial > vim
diff src/vim9compile.c @ 25469:dcd45fe7fe2e v8.2.3271
patch 8.2.3271: Vim9: cannot use :command or :au with block in :def function
Commit: https://github.com/vim/vim/commit/e4db17fb6e2d029aa2dddfca703ace9bcf0d85fd
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 1 21:19:43 2021 +0200
patch 8.2.3271: Vim9: cannot use :command or :au with block in :def function
Problem: Vim9: cannot use :command or :au with a block in a :def function.
Solution: Recognize the start of the block.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 01 Aug 2021 21:30:03 +0200 |
| parents | 9adaa0c056c7 |
| children | a8f526c9b172 |
line wrap: on
line diff
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -8861,11 +8861,13 @@ compile_put(char_u *arg, exarg_T *eap, c * A command that is not compiled, execute with legacy code. */ static char_u * -compile_exec(char_u *line, exarg_T *eap, cctx_T *cctx) -{ +compile_exec(char_u *line_arg, exarg_T *eap, cctx_T *cctx) +{ + char_u *line = line_arg; char_u *p; int has_expr = FALSE; char_u *nextcmd = (char_u *)""; + char_u *tofree = NULL; if (cctx->ctx_skip == SKIP_YES) goto theend; @@ -8922,6 +8924,34 @@ compile_exec(char_u *line, exarg_T *eap, nextcmd = p + 1; } } + else if (eap->cmdidx == CMD_command || eap->cmdidx == CMD_autocmd) + { + // If there is a trailing '{' read lines until the '}' + p = eap->arg + STRLEN(eap->arg) - 1; + while (p > eap->arg && VIM_ISWHITE(*p)) + --p; + if (*p == '{') + { + exarg_T ea; + int flags; // unused + int start_lnum = SOURCING_LNUM; + + CLEAR_FIELD(ea); + ea.arg = eap->arg; + fill_exarg_from_cctx(&ea, cctx); + (void)may_get_cmd_block(&ea, p, &tofree, &flags); + if (tofree != NULL) + { + *p = NUL; + line = concat_str(line, tofree); + if (line == NULL) + goto theend; + vim_free(tofree); + tofree = line; + SOURCING_LNUM = start_lnum; + } + } + } } if (eap->cmdidx == CMD_syntax && STRNCMP(eap->arg, "include ", 8) == 0) @@ -9008,6 +9038,7 @@ theend: --nextcmd; *nextcmd = '|'; } + vim_free(tofree); return nextcmd; }