From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 21 Jun 2021 18:48:58 +0000 (+0200)
Subject: patch 8.2.3031: no error if a function name starts with an underscore
X-Git-Tag: v8.2.3031
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22f17a29cd0b0cc3107dc6cd1d96c62eee52a7d9;p=vim

patch 8.2.3031: no error if a function name starts with an underscore

Problem:    No error if a function name starts with an underscore. (Naohiro
            Ono)
Solution:   In Vim9 script disallow a function name starting with an
            underscore, as is mentioned in the help. (closes #8414)
---

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 925e7c82a..de09baaf6 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -90,6 +90,24 @@ def Test_compile_error_in_called_function()
   CheckScriptFailureList(lines, ['E1012:', 'E1191:'])
 enddef
 
+def Test_wrong_function_name()
+  var lines =<< trim END
+      vim9script
+      func _Foo()
+        echo 'foo'
+      endfunc
+  END
+  CheckScriptFailure(lines, 'E128:')
+
+  lines =<< trim END
+      vim9script
+      def _Foo()
+        echo 'foo'
+      enddef
+  END
+  CheckScriptFailure(lines, 'E128:')
+enddef
+
 def Test_autoload_name_mismatch()
   var dir = 'Xdir/autoload'
   mkdir(dir, 'p')
diff --git a/src/userfunc.c b/src/userfunc.c
index 56b7df32f..e2e745c33 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3595,7 +3595,8 @@ trans_function_name(
 		lead += (int)STRLEN(sid_buf);
 	}
     }
-    else if (!(flags & TFN_INT) && builtin_function(lv.ll_name, len))
+    else if (!(flags & TFN_INT) && (builtin_function(lv.ll_name, len)
+				   || (in_vim9script() && *lv.ll_name == '_')))
     {
 	semsg(_("E128: Function name must start with a capital or \"s:\": %s"),
 								       start);
diff --git a/src/version.c b/src/version.c
index 0c3c887d1..77456bbbb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3031,
 /**/
     3030,
 /**/