diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-21 19:11:09 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-21 21:27:13 -0500 |
| commit | 1eab3584ba087b9de52624fc632ccde5943811c3 (patch) | |
| tree | d47f4789f98c93d0b1aa79bd8077fc117356a76b | |
| parent | 5e80b90ef46cdd316b9da9543cd6a80a92259ffb (diff) | |
| download | rneovim-1eab3584ba087b9de52624fc632ccde5943811c3.tar.gz rneovim-1eab3584ba087b9de52624fc632ccde5943811c3.tar.bz2 rneovim-1eab3584ba087b9de52624fc632ccde5943811c3.zip | |
vim-patch:8.2.2177: pattern "^" does not match if first character is combining
Problem: Pattern "^" does not match if the first character in the line is
combining. (Rene Kita)
Solution: Do accept a match at the start of the line. (closes vim/vim#6963)
https://github.com/vim/vim/commit/ef2dff52de52c17fe1bd7c06cbb32d8955901f5a
| -rw-r--r-- | src/nvim/regexp_nfa.c | 9 | ||||
| -rw-r--r-- | src/nvim/testdir/test_regexp_utf8.vim | 11 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 22cd6baf6e..feb118833d 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -5243,9 +5243,12 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, switch (t->state->c) { case NFA_MATCH: { - // If the match ends before a composing characters and - // rex.reg_icombine is not set, that is not really a match. - if (!rex.reg_icombine && utf_iscomposing(curc)) { + // If the match is not at the start of the line, ends before a + // composing characters and rex.reg_icombine is not set, that + // is not really a match. + if (!rex.reg_icombine + && rex.input != rex.line + && utf_iscomposing(curc)) { break; } nfa_match = true; diff --git a/src/nvim/testdir/test_regexp_utf8.vim b/src/nvim/testdir/test_regexp_utf8.vim index 4466ad436a..513780938e 100644 --- a/src/nvim/testdir/test_regexp_utf8.vim +++ b/src/nvim/testdir/test_regexp_utf8.vim @@ -533,4 +533,15 @@ func Test_search_with_end_offset() close! endfunc +" Check that "^" matches even when the line starts with a combining char +func Test_match_start_of_line_combining() + new + call setline(1, ['', "\u05ae", '']) + exe "normal gg/^\<CR>" + call assert_equal(2, getcurpos()[1]) + bwipe! +endfunc + + + " vim: shiftwidth=2 sts=2 expandtab |