Mercurial > vim
changeset 19183:1168c53d1b49 v8.2.0150
patch 8.2.0150: cannot define python function when using :execute
Commit: https://github.com/vim/vim/commit/673660ab00d808d1e96e7181a60c5c8545c0ee75
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 26 16:50:05 2020 +0100
patch 8.2.0150: cannot define python function when using :execute
Problem: Cannot define python function when using :execute. (Yasuhiro
Matsumoto)
Solution: Do not recognize "def" inside "function.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 26 Jan 2020 17:00:04 +0100 |
| parents | 418299e3f4a7 |
| children | 070b75b91465 |
| files | src/testdir/test_vim9_script.vim src/userfunc.c src/version.c |
| diffstat | 3 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1,5 +1,7 @@ " Test various aspects of the Vim9 script language. +source check.vim + " Check that "lines" inside ":def" results in an "error" message. func CheckDefFailure(lines, error) call writefile(['def! Func()'] + a:lines + ['enddef'], 'Xdef') @@ -355,5 +357,16 @@ def Test_fixed_size_list() call assert_equal([2, 99, 3, 4, 5], l) enddef +" Test that inside :function a Python function can be defined, :def is not +" recognized. +func Test_function_python() + CheckFeature python3 + let py = 'python3' + execute py "<< EOF" +def do_something(): + return 1 +EOF +endfunc + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -2667,8 +2667,11 @@ ex_function(exarg_T *eap) indent += 2; // Check for defining a function inside this function. + // Only recognize "def" inside "def", not inside "function", + // For backwards compatibility, see Test_function_python(). c = *p; - if (checkforcmd(&p, "function", 2) || checkforcmd(&p, "def", 3)) + if (checkforcmd(&p, "function", 2) + || (eap->cmdidx == CMD_def && checkforcmd(&p, "def", 3))) { if (*p == '!') p = skipwhite(p + 1);