patch 8.2.1657: Vim9: no proper error for nested ":def!"

Problem:    Vim9: no proper error for nested ":def!".
Solution:   Check for "!". (closes #6920)

diff --git a/src/errors.h b/src/errors.h
index 659619944d84f8773eeb5edd6c20a1b41cc89592..c76afbc839d20052047ed583a7a9fa40352468b3 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -256,4 +256,6 @@ EXTERN char e_assert_fails_fourth_argument[]
        INIT(= N_("E1115: assert_fails() fourth argument must be a number"));
 EXTERN char e_assert_fails_fifth_argument[]
        INIT(= N_("E1116: assert_fails() fifth argument must be a string"));
+EXTERN char e_cannot_use_bang_with_nested_def[]
+       INIT(= N_("E1117: Cannot use ! with nested :def"));
 #endif

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 4e79c89deaadfc03187becc69036e536cdf8f223..e0b43aec47c2e21df7d498b313d690f47ef7a5f3 100644 (file)
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -134,6 +134,23 @@ def Test_nested_function()
   CheckDefFailure(['func Nested()', 'endfunc'], 'E1086:')
   CheckDefFailure(['def s:Nested()', 'enddef'], 'E1075:')
   CheckDefFailure(['def b:Nested()', 'enddef'], 'E1075:')
+
+  CheckDefFailure([
+        'def Outer()',
+        '  def Inner()',
+        '    # comment',
+        '  enddef',
+        '  def Inner()',
+        '  enddef',
+        'enddef'], 'E1073:')
+  CheckDefFailure([
+        'def Outer()',
+        '  def Inner()',
+        '    # comment',
+        '  enddef',
+        '  def! Inner()',
+        '  enddef',
+        'enddef'], 'E1117:')
 enddef
 
 func Test_call_default_args_from_func()

diff --git a/src/version.c b/src/version.c
index 7aa35c2e52ae1298e7dc87736d4dd21a7b183a66..53868220345aa0349d1438e7618c7b50ce8730a9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1657,
 /**/
     1656,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 7199e85774e38f37132793c57c9d85bd20c63212..43d994e1a078a51ada5dba529a21c5a7cabdded7 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -4320,6 +4320,12 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx)
     ufunc_T    *ufunc;
     int                r;
 
+    if (*name_start == '!')
+    {
+       emsg(_(e_cannot_use_bang_with_nested_def));
+       return NULL;
+    }
+
     // Only g:Func() can use a namespace.
     if (name_start[1] == ':' && !is_global)
     {