Mercurial > vim
changeset 16113:9994c50f7879 v8.1.1061
patch 8.1.1061: when substitute string throws error, substitute happens anyway
commit https://github.com/vim/vim/commit/0e97b9487571cf725a9cb28fe4dcefc800415f69
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Mar 27 22:53:53 2019 +0100
patch 8.1.1061: when substitute string throws error, substitute happens anyway
Problem: When substitute string throws error, substitute happens anyway.
Solution: Skip substitution when aborting. (closes https://github.com/vim/vim/issues/4161)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 27 Mar 2019 23:00:05 +0100 |
| parents | 58f1e71bc938 |
| children | 27b5c0cf863c |
| files | src/ex_cmds.c src/testdir/test_substitute.vim src/version.c |
| diffstat | 3 files changed, 38 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -5574,7 +5574,12 @@ do_sub(exarg_T *eap) sub_firstlnum - regmatch.startpos[0].lnum, sub, sub_firstline, FALSE, p_magic, TRUE); #ifdef FEAT_EVAL - /* Don't keep flags set by a recursive call. */ + // If getting the substitute string caused an error, don't do + // the replacement. + if (aborting()) + goto skip; + + // Don't keep flags set by a recursive call. subflags = subflags_save; if (subflags.do_count) {
--- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -610,3 +610,33 @@ func Test_sub_cmd_8() enew! set titlestring& endfunc + +func Test_nocatch_sub_failure_handling() + " normal error results in all replacements + func! Foo() + foobar + endfunc + new + call setline(1, ['1 aaa', '2 aaa', '3 aaa']) + %s/aaa/\=Foo()/g + call assert_equal(['1 0', '2 0', '3 0'], getline(1, 3)) + + " Trow without try-catch causes abort after the first line. + " We cannot test this, since it would stop executing the test script. + + " try/catch does not result in any changes + func! Foo() + throw 'error' + endfunc + call setline(1, ['1 aaa', '2 aaa', '3 aaa']) + let error_caught = 0 + try + %s/aaa/\=Foo()/g + catch + let error_caught = 1 + endtry + call assert_equal(1, error_caught) + call assert_equal(['1 aaa', '2 aaa', '3 aaa'], getline(1, 3)) + + bwipe! +endfunc