Mercurial > vim

changeset 25632:c204815f3058 v8.2.3352

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3352: Vim9: error for nested :enddef has wrong line number Commit: https://github.com/vim/vim/commit/4bba16d252da6f072d311f9b3ebb50101d6d2eaf Author: Bram Moolenaar <Bram@vim.org> Date: Sun Aug 15 19:28:05 2021 +0200 patch 8.2.3352: Vim9: error for nested :enddef has wrong line number Problem: Vim9: error for nested :enddef has wrong line number. Solution: Compute the line number.
author Bram Moolenaar <Bram@vim.org>
date Sun, 15 Aug 2021 19:30:03 +0200
parents 592a92a4d221
children 4b6c030bda5c
files src/testdir/test_vim9_func.vim src/userfunc.c src/version.c
diffstat 3 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -630,6 +630,17 @@ def Test_nested_function()
       assert_equal(2, Test())
   END
   CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
+      def Outer()
+        def Inner()
+          echo 'hello'
+        enddef burp
+      enddef
+      defcompile
+  END
+  CheckScriptFailure(lines, 'E1173: Text found after enddef: burp', 3)
 enddef
 
 def Test_not_nested_function()
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -822,6 +822,8 @@ get_function_body(
 		    else if (*p != NUL && *p != (vim9_function ? '#' : '"')
 					   && (vim9_function || p_verbose > 0))
 		    {
+			SOURCING_LNUM = sourcing_lnum_top
+							+ newlines->ga_len + 1;
 			if (eap->cmdidx == CMD_def)
 			    semsg(_(e_text_found_after_enddef_str), p);
 			else
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3352,
+/**/
     3351,
 /**/
     3350,