patch 8.2.2141: a user command with try/catch may not catch an expression errorv8.2.2141

Problem:    A user command with try/catch may not catch an expression error.
Solution:   When an expression fails check for following "|". (closes #7469)

4 files changed, 34 insertions, 4 deletions

diff --git a/src/eval.c b/src/eval.c
index 47aaaad23..6ce2ebf68 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2158,7 +2158,10 @@ eval0(
 	    semsg(_(e_invexpr2), arg);
 
 	// Some of the expression may not have been consumed.  Do not check for
-	// a next command to avoid more errors.
+	// a next command to avoid more errors, unless "|" is following, which
+	// could only be a command separator.
+	if (eap != NULL && skipwhite(p)[0] == '|' && skipwhite(p)[1] != '|')
+	    eap->nextcmd = check_nextcmd(p);
 	return FAIL;
     }
 
diff --git a/src/testdir/test_trycatch.vim b/src/testdir/test_trycatch.vim
index 9f670f7ae..b5ad14c2a 100644
--- a/src/testdir/test_trycatch.vim
+++ b/src/testdir/test_trycatch.vim
@@ -2199,5 +2199,30 @@ func Test_BufEnter_exception()
   %bwipe!
 endfunc
 
+" Test for using try/catch in a user command with a failing expression    {{{1
+func Test_user_command_try_catch()
+  let lines =<< trim END
+      function s:throw() abort
+        throw 'error'
+      endfunction
+
+      command! Execute
+      \   try
+      \ |   let s:x = s:throw()
+      \ | catch
+      \ |   let g:caught = 'caught'
+      \ | endtry
+
+      let g:caught = 'no'
+      Execute
+      call assert_equal('caught', g:caught)
+  END
+  call writefile(lines, 'XtestTryCatch')
+  source XtestTryCatch
+
+  call delete('XtestTryCatch')
+  unlet g:caught
+endfunc
+
 " Modeline								    {{{1
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index 8c9319924..e50e4d5fa 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -6825,7 +6825,7 @@ func Test_script_lines()
 		    \ ])
 	call assert_report("Shouldn't be able to define function")
     catch
-	call assert_exception('Vim(function):E126: Missing :endfunction')
+	call assert_exception('Vim(function):E1145: Missing heredoc end marker: .')
     endtry
 
     " :change
@@ -6845,7 +6845,7 @@ func Test_script_lines()
 		    \ ])
 	call assert_report("Shouldn't be able to define function")
     catch
-	call assert_exception('Vim(function):E126: Missing :endfunction')
+	call assert_exception('Vim(function):E1145: Missing heredoc end marker: .')
     endtry
 
     " :insert
@@ -6865,7 +6865,7 @@ func Test_script_lines()
 		    \ ])
 	call assert_report("Shouldn't be able to define function")
     catch
-	call assert_exception('Vim(function):E126: Missing :endfunction')
+	call assert_exception('Vim(function):E1145: Missing heredoc end marker: .')
     endtry
 endfunc
 
diff --git a/src/version.c b/src/version.c
index cf9fbc3d5..3aec81b4b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2141,
+/**/
     2140,
 /**/
     2139,