Merge pull request #21274 from zeertzjq/vim-8.2.3992

vim-patch:8.2.{3992,4261,4262},9.0.{0110,0577}

runtime/doc/builtin.txt

@@ -8003,7 +8003,7 @@ stridx({haystack}, {needle} [, {start}])		*stridx()*
 
 		Can also be used as a |method|: >
 			GetHaystack()->stridx(needle)
-
+<
 							*string()*
 string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
 		Float, String, Blob or a composition of them, then the result

runtime/doc/eval.txt

@@ -1780,7 +1780,7 @@ v:exiting	Exit code, or |v:null| before invoking the |VimLeavePre|
 		and |VimLeave| autocmds.  See |:q|, |:x| and |:cquit|.
 		Example: >
 			:au VimLeave * echo "Exit value is " .. v:exiting
-
+<
 					*v:echospace* *echospace-variable*
 v:echospace	Number of screen cells that can be used for an `:echo` message
 		in the last screen line before causing the |hit-enter-prompt|.

src/nvim/ex_eval.c

@@ -1420,22 +1420,22 @@ void ex_finally(exarg_T *eap)
   int pending = CSTP_NONE;
   cstack_T *const cstack = eap->cstack;
 
-  if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) {
+  for (idx = cstack->cs_idx; idx >= 0; idx--) {
-    eap->errmsg = _("E606: :finally without :try");
-  } else {
-    if (!(cstack->cs_flags[cstack->cs_idx] & CSF_TRY)) {
-      eap->errmsg = get_end_emsg(cstack);
-      for (idx = cstack->cs_idx - 1; idx > 0; idx--) {
     if (cstack->cs_flags[idx] & CSF_TRY) {
       break;
     }
   }
+  if (cstack->cs_trylevel <= 0 || idx < 0) {
+    eap->errmsg = _("E606: :finally without :try");
+    return;
+  }
+
+  if (!(cstack->cs_flags[cstack->cs_idx] & CSF_TRY)) {
+    eap->errmsg = get_end_emsg(cstack);
     // Make this error pending, so that the commands in the following
     // finally clause can be executed.  This overrules also a pending
     // ":continue", ":break", ":return", or ":finish".
     pending = CSTP_ERROR;
-    } else {
-      idx = cstack->cs_idx;
   }
 
   if (cstack->cs_flags[idx] & CSF_FINALLY) {
@@ -1522,7 +1522,6 @@ void ex_finally(exarg_T *eap)
     // that the following finally clause will be executed even then.
     cstack->cs_lflags |= CSL_HAD_FINA;
   }
-  }
 }
 
 /// Handle ":endtry"
@@ -1534,9 +1533,16 @@ void ex_endtry(exarg_T *eap)
   void *rettv = NULL;
   cstack_T *const cstack = eap->cstack;
 
-  if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) {
+  for (idx = cstack->cs_idx; idx >= 0; idx--) {
+    if (cstack->cs_flags[idx] & CSF_TRY) {
+      break;
+    }
+  }
+  if (cstack->cs_trylevel <= 0 || idx < 0) {
     eap->errmsg = _("E602: :endtry without :try");
-  } else {
+    return;
+  }
+
   // Don't do something after an error, interrupt or throw in the try
   // block, catch clause, or finally clause preceding this ":endtry" or
   // when an error or interrupt occurred after a ":continue", ":break",
@@ -1553,10 +1559,6 @@ void ex_endtry(exarg_T *eap)
     eap->errmsg = get_end_emsg(cstack);
 
     // Find the matching ":try" and report what's missing.
-      idx = cstack->cs_idx;
-      do {
-        idx--;
-      } while (idx > 0 && !(cstack->cs_flags[idx] & CSF_TRY));
     rewind_conditionals(cstack, idx, CSF_WHILE | CSF_FOR,
                         &cstack->cs_looplevel);
     skip = true;
@@ -1693,7 +1695,6 @@ void ex_endtry(exarg_T *eap)
     // Rethrow the current exception (within this cstack).
     do_throw(cstack);
   }
-  }
 }
 
 // enter_cleanup() and leave_cleanup()

src/nvim/help.c

@@ -743,28 +743,26 @@ void fix_help_buffer(void)
             // If foo.abx is found use it instead of foo.txt in
             // the same directory.
             for (int i1 = 0; i1 < fcount; i1++) {
-              for (int i2 = 0; i2 < fcount; i2++) {
-                if (i1 == i2) {
-                  continue;
-                }
-                if (fnames[i1] == NULL || fnames[i2] == NULL) {
-                  continue;
-                }
               const char *const f1 = fnames[i1];
-                const char *const f2 = fnames[i2];
               const char *const t1 = path_tail(f1);
-                const char *const t2 = path_tail(f2);
               const char *const e1 = strrchr(t1, '.');
-                const char *const e2 = strrchr(t2, '.');
-                if (e1 == NULL || e2 == NULL) {
-                  continue;
-                }
               if (path_fnamecmp(e1, ".txt") != 0
                   && path_fnamecmp(e1, fname + 4) != 0) {
                 // Not .txt and not .abx, remove it.
                 XFREE_CLEAR(fnames[i1]);
                 continue;
               }
+
+              for (int i2 = i1 + 1; i2 < fcount; i2++) {
+                const char *const f2 = fnames[i2];
+                if (f2 == NULL) {
+                  continue;
+                }
+                const char *const t2 = path_tail(f2);
+                const char *const e2 = strrchr(t2, '.');
+                if (e1 == NULL || e2 == NULL) {
+                  continue;
+                }
                 if (e1 - f1 != e2 - f2
                     || path_fnamencmp(f1, f2, (size_t)(e1 - f1)) != 0) {
                   continue;
@@ -943,6 +941,7 @@ static void helptags_one(char *dir, const char *ext, const char *tagfname, bool
     }
     const char *const fname = files[fi] + dirlen + 1;
 
+    bool in_example = false;
     bool firstline = true;
     while (!vim_fgets(IObuff, IOSIZE, fd) && !got_int) {
       if (firstline) {
@@ -973,6 +972,13 @@ static void helptags_one(char *dir, const char *ext, const char *tagfname, bool
         }
         firstline = false;
       }
+      if (in_example) {
+        // skip over example; a non-white in the first column ends it
+        if (vim_strchr(" \t\n\r", IObuff[0])) {
+          continue;
+        }
+        in_example = false;
+      }
       p1 = vim_strchr((char *)IObuff, '*');       // find first '*'
       while (p1 != NULL) {
         p2 = strchr((const char *)p1 + 1, '*');  // Find second '*'.
@@ -992,7 +998,7 @@ static void helptags_one(char *dir, const char *ext, const char *tagfname, bool
                   || s[1] == '\0')) {
             *p2 = '\0';
             p1++;
-            size_t s_len= (size_t)(p2 - p1) + strlen(fname) + 2;
+            size_t s_len = (size_t)(p2 - p1) + strlen(fname) + 2;
             s = xmalloc(s_len);
             GA_APPEND(char *, &ga, s);
             snprintf(s, s_len, "%s\t%s", p1, fname);
@@ -1003,6 +1009,11 @@ static void helptags_one(char *dir, const char *ext, const char *tagfname, bool
         }
         p1 = p2;
       }
+      size_t len = strlen(IObuff);
+      if ((len == 2 && strcmp(&IObuff[len - 2], ">\n") == 0)
+          || (len >= 3 && strcmp(&IObuff[len - 3], " >\n") == 0)) {
+        in_example = true;
+      }
       line_breakcheck();
     }
 

src/nvim/regexp.c

@@ -1094,8 +1094,8 @@ static bool reg_match_visual(void)
   colnr_T start2, end2;
   colnr_T curswant;
 
-  // Check if the buffer is the current buffer.
+  // Check if the buffer is the current buffer and not using a string.
-  if (rex.reg_buf != curbuf || VIsual.lnum == 0) {
+  if (rex.reg_buf != curbuf || VIsual.lnum == 0 || !REG_MULTI) {
     return false;
   }
 

src/nvim/testdir/runtest.vim

@@ -105,7 +105,7 @@ set nomore
 lang mess C
 
 " Nvim: append runtime from build dir, which contains the generated doc/tags.
-let &runtimepath .= ','.expand($BUILD_DIR).'/runtime/'
+let &runtimepath ..= ',' .. expand($BUILD_DIR) .. '/runtime/'
 
 let s:t_bold = &t_md
 let s:t_normal = &t_me

src/nvim/testdir/test_functions.vim

@@ -2,6 +2,9 @@
 
 source shared.vim
 source check.vim
+source term_util.vim
+source screendump.vim
+source vim9.vim
 
 " Must be done first, since the alternate buffer must be unset.
 func Test_00_bufexists()
@@ -2518,7 +2521,7 @@ func Test_builtin_check()
     vim9script
     var s:trim = (x) => " " .. x
   END
-  " call CheckScriptFailure(lines, 'E704:')
+  call CheckScriptFailure(lines, 'E704:')
 
   call assert_fails('call extend(g:, #{foo: { -> "foo" }})', 'E704:')
   let g:bar = 123

src/nvim/testdir/test_help.vim

@@ -1,6 +1,22 @@
 " Tests for :help
 
 source check.vim
+source vim9.vim
+
+func SetUp()
+  let s:vimruntime = $VIMRUNTIME
+  let s:runtimepath = &runtimepath
+  " Set $VIMRUNTIME to $BUILD_DIR/runtime and remove the original $VIMRUNTIME
+  " path from &runtimepath so that ":h local-additions" won't pick up builtin
+  " help files.
+  let $VIMRUNTIME = expand($BUILD_DIR) .. '/runtime'
+  set runtimepath-=../../../runtime
+endfunc
+
+func TearDown()
+  let $VIMRUNTIME = s:vimruntime
+  let &runtimepath = s:runtimepath
+endfunc
 
 func Test_help_restore_snapshot()
   help
@@ -81,16 +97,42 @@ func Test_help_local_additions()
   call writefile(['*mydoc-ext.txt* my extended awesome doc'], 'Xruntime/doc/mydoc-ext.txt')
   let rtp_save = &rtp
   set rtp+=./Xruntime
-  help
+  help local-additions
-  1
+  let lines = getline(line(".") + 1, search("^$") - 1)
-  call search('mydoc.txt')
+  call assert_equal([
-  call assert_equal('|mydoc.txt| my awesome doc', getline('.'))
+  \ '|mydoc-ext.txt| my extended awesome doc',
-  1
+  \ '|mydoc.txt| my awesome doc'
-  call search('mydoc-ext.txt')
+  \ ], lines)
-  call assert_equal('|mydoc-ext.txt| my extended awesome doc', getline('.'))
+  call delete('Xruntime/doc/mydoc-ext.txt')
+  close
+
+  call mkdir('Xruntime-ja/doc', 'p')
+  call writefile(["local-additions\thelp.jax\t/*local-additions*"], 'Xruntime-ja/doc/tags-ja')
+  call writefile(['*help.txt* This is jax file', '',
+  \ 'LOCAL ADDITIONS: *local-additions*', ''], 'Xruntime-ja/doc/help.jax')
+  call writefile(['*work.txt* This is jax file'], 'Xruntime-ja/doc/work.jax')
+  call writefile(['*work2.txt* This is jax file'], 'Xruntime-ja/doc/work2.jax')
+  set rtp+=./Xruntime-ja
+
+  help local-additions@en
+  let lines = getline(line(".") + 1, search("^$") - 1)
+  call assert_equal([
+  \ '|mydoc.txt| my awesome doc'
+  \ ], lines)
+  close
+
+  help local-additions@ja
+  let lines = getline(line(".") + 1, search("^$") - 1)
+  call assert_equal([
+  \ '|mydoc.txt| my awesome doc',
+  \ '|help.txt| This is jax file',
+  \ '|work.txt| This is jax file',
+  \ '|work2.txt| This is jax file',
+  \ ], lines)
   close
 
   call delete('Xruntime', 'rf')
+  call delete('Xruntime-ja', 'rf')
   let &rtp = rtp_save
 endfunc
 
@@ -114,6 +156,13 @@ func Test_helptag_cmd()
   call assert_equal(["help-tags\ttags\t1"], readfile('Xdir/tags'))
   call delete('Xdir/tags')
 
+  " Test parsing tags
+  call writefile(['*tag1*', 'Example: >', '  *notag*', 'Example end: *tag2*'],
+    \ 'Xdir/a/doc/sample.txt')
+  helptags Xdir
+  call assert_equal(["tag1\ta/doc/sample.txt\t/*tag1*",
+                  \  "tag2\ta/doc/sample.txt\t/*tag2*"], readfile('Xdir/tags'))
+
   " Duplicate tags in the help file
   call writefile(['*tag1*', '*tag1*', '*tag2*'], 'Xdir/a/doc/sample.txt')
   call assert_fails('helptags Xdir', 'E154:')
@@ -166,5 +215,15 @@ func Test_help_long_argument()
   endtry
 endfunc
 
+func Test_help_using_visual_match()
+  let lines =<< trim END
+      call setline(1, ' ')
+      /^
+      exe "normal \<C-V>\<C-V>"
+      h5\%V€]
+  END
+  call CheckScriptFailure(lines, 'E149:')
+endfunc
+
 
 " vim: shiftwidth=2 sts=2 expandtab

src/nvim/testdir/test_help_tagjump.vim

@@ -1,17 +1,5 @@
 " Tests for :help! {subject}
 
-func SetUp()
-  " v:progpath is …/build/bin/nvim and we need …/build/runtime
-  " to be added to &rtp
-  let builddir = fnamemodify(exepath(v:progpath), ':h:h')
-  let s:rtp = &rtp
-  let &rtp .= printf(',%s/runtime', builddir)
-endfunc
-
-func TearDown()
-  let &rtp = s:rtp
-endfunc
-
 func Test_help_tagjump()
   help
   call assert_equal("help", &filetype)

src/nvim/testdir/test_ins_complete.vim

@@ -1535,7 +1535,7 @@ func Test_completefunc_callback()
     assert_equal([[1, ''], [0, 'three']], g:LocalCompleteFuncArgs)
     bw!
   END
-  " call CheckScriptSuccess(lines)
+  call CheckScriptSuccess(lines)
 
   " cleanup
   set completefunc&
@@ -1792,7 +1792,7 @@ func Test_omnifunc_callback()
     assert_equal([[1, ''], [0, 'three']], g:LocalOmniFuncArgs)
     bw!
   END
-  " call CheckScriptSuccess(lines)
+  call CheckScriptSuccess(lines)
 
   " cleanup
   set omnifunc&
@@ -2085,7 +2085,7 @@ func Test_thesaurusfunc_callback()
     assert_equal([[1, ''], [0, 'three']], g:LocalTsrFuncArgs)
     bw!
   END
-  " call CheckScriptSuccess(lines)
+  call CheckScriptSuccess(lines)
 
   " cleanup
   set thesaurusfunc&

src/nvim/testdir/test_normal.vim

@@ -695,7 +695,7 @@ func Test_opfunc_callback()
     assert_equal(['char'], g:LocalOpFuncArgs)
     bw!
   END
-  " call CheckScriptSuccess(lines)
+  call CheckScriptSuccess(lines)
 
   " setting 'opfunc' to a script local function outside of a script context
   " should fail

src/nvim/testdir/test_tagfunc.vim

@@ -380,7 +380,7 @@ func Test_tagfunc_callback()
     assert_equal(['a12', '', {}], g:LocalTagFuncArgs)
     bw!
   END
-  " call CheckScriptSuccess(lines)
+  call CheckScriptSuccess(lines)
 
   " cleanup
   delfunc TagFunc1

src/nvim/testdir/test_trycatch.vim

@@ -3,6 +3,7 @@
 
 source check.vim
 source shared.vim
+source vim9.vim
 
 "-------------------------------------------------------------------------------
 " Test environment							    {{{1
@@ -2007,6 +2008,27 @@ func Test_try_catch_errors()
   call assert_fails('try | for i in range(5) | endif | endtry', 'E580:')
   call assert_fails('try | while v:true | endtry', 'E170:')
   call assert_fails('try | if v:true | endtry', 'E171:')
+
+  " this was using a negative index in cstack[]
+  let lines =<< trim END
+      try
+      for
+      if
+      endwhile
+      if
+      finally
+  END
+  call CheckScriptFailure(lines, 'E690:')
+
+  let lines =<< trim END
+      try
+      for
+      if
+      endwhile
+      if
+      endtry
+  END
+  call CheckScriptFailure(lines, 'E690:')
 endfunc
 
 " Test for verbose messages with :try :catch, and :finally                 {{{1

src/nvim/testdir/vim9.vim

@@ -2,6 +2,38 @@
 " Use a different file name for each run.
 let s:sequence = 1
 
+func CheckScriptFailure(lines, error, lnum = -3)
+  if get(a:lines, 0, '') ==# 'vim9script'
+    return
+  endif
+  let cwd = getcwd()
+  let fname = 'XScriptFailure' .. s:sequence
+  let s:sequence += 1
+  call writefile(a:lines, fname)
+  try
+    call assert_fails('so ' .. fname, a:error, a:lines, a:lnum)
+  finally
+    call chdir(cwd)
+    call delete(fname)
+  endtry
+endfunc
+
+func CheckScriptSuccess(lines)
+  if get(a:lines, 0, '') ==# 'vim9script'
+    return
+  endif
+  let cwd = getcwd()
+  let fname = 'XScriptSuccess' .. s:sequence
+  let s:sequence += 1
+  call writefile(a:lines, fname)
+  try
+    exe 'so ' .. fname
+  finally
+    call chdir(cwd)
+    call delete(fname)
+  endtry
+endfunc
+
 " Check that "lines" inside a legacy function has no error.
 func CheckLegacySuccess(lines)
   let cwd = getcwd()