diff options
| author | Aufar Gilbran <aufargilbran@gmail.com> | 2020-08-19 00:54:41 +0800 |
|---|---|---|
| committer | Aufar Gilbran <aufargilbran@gmail.com> | 2020-09-11 10:33:20 +0800 |
| commit | c0102c140cb6d0e2be37c583d34f8ecdf7228f3a (patch) | |
| tree | 03fe59a940fd81cb3a6c46a6835d999a0f83a7bc /src | |
| parent | 68f6abef1697d6879b76b515b1b2f67fa59dad1a (diff) | |
| download | rneovim-c0102c140cb6d0e2be37c583d34f8ecdf7228f3a.tar.gz rneovim-c0102c140cb6d0e2be37c583d34f8ecdf7228f3a.tar.bz2 rneovim-c0102c140cb6d0e2be37c583d34f8ecdf7228f3a.zip | |
vim-patch:8.1.0286: 'incsearch' does not apply to :smagic and :snomagic
Problem: 'incsearch' does not apply to :smagic and :snomagic.
Solution: Add support. (Hirohito Higashi)
https://github.com/vim/vim/commit/167ae42685dcd430800c51ac7339f7f0938a3e70
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_getln.c | 12 | ||||
| -rw-r--r-- | src/nvim/testdir/test_search.vim | 8 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index c3e40c95a8..37816e9ff3 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -157,6 +157,7 @@ typedef struct { pos_T match_end; bool did_incsearch; bool incsearch_postponed; + int magic_save; } incsearch_state_T; typedef struct command_line_state { @@ -263,6 +264,7 @@ static void init_incsearch_state(incsearch_state_T *s) s->match_start = curwin->w_cursor; s->did_incsearch = false; s->incsearch_postponed = false; + s->magic_save = p_magic; clearpos(&s->match_end); s->save_cursor = curwin->w_cursor; // may be restored later s->search_start = curwin->w_cursor; @@ -310,8 +312,17 @@ static bool do_incsearch_highlighting(int firstc, incsearch_state_T *s, for (p = cmd; ASCII_ISALPHA(*p); p++) {} if (*skipwhite(p) != NUL && (STRNCMP(cmd, "substitute", p - cmd) == 0 + || STRNCMP(cmd, "smagic", p - cmd) == 0 + || STRNCMP(cmd, "snomagic", MAX(p - cmd, 3)) == 0 || STRNCMP(cmd, "global", p - cmd) == 0 || STRNCMP(cmd, "vglobal", p - cmd) == 0)) { + if (*cmd == 's' && cmd[1] == 'm') { + p_magic = true; + } + else if (*cmd == 's' && cmd[1] == 'n') { + p_magic = false; + } + // Check for "global!/". if (*cmd == 'g' && *p == '!') { p++; @@ -557,6 +568,7 @@ static void finish_incsearch_highlighting(int gotesc, incsearch_state_T *s, } else { redraw_all_later(SOME_VALID); } + p_magic = s->magic_save; } } diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim index 5f421aad3c..9c7b654e06 100644 --- a/src/nvim/testdir/test_search.vim +++ b/src/nvim/testdir/test_search.vim @@ -392,6 +392,14 @@ func Test_search_cmdline3s() undo call feedkeys(":%substitute/the\<c-l>/xxx\<cr>", 'tx') call assert_equal(' 2 xxxe', getline('.')) + undo + call feedkeys(":%smagic/the.e/xxx\<cr>", 'tx') + call assert_equal(' 2 xxx', getline('.')) + undo + call assert_fails(":%snomagic/the.e/xxx\<cr>", 'E486') + " + call feedkeys(":%snomagic/the\\.e/xxx\<cr>", 'tx') + call assert_equal(' 2 xxx', getline('.')) call Incsearch_cleanup() endfunc |