mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-04 17:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2177: pattern "^" does not match if first character is combining

Browse Source 
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)
ef2dff52de
This commit is contained in:
Jan Edmund Lazo
2020-12-21 19:11:09 -05:00
parent 5e80b90ef4
commit 1eab3584ba
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/regexp_nfa.c
View File

@@ -5243,9 +5243,12 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
switch (t->state->c) { switch (t->state->c) {
case NFA_MATCH: case NFA_MATCH:
{ {
// If the match ends before a composing characters and // If the match is not at the start of the line, ends before a
// rex.reg_icombine is not set, that is not really a match. // composing characters and rex.reg_icombine is not set, that
if (!rex.reg_icombine && utf_iscomposing(curc)) { // is not really a match.
if (!rex.reg_icombine
&& rex.input != rex.line
&& utf_iscomposing(curc)) {
break; break;
} }
nfa_match = true; nfa_match = true;

11
src/nvim/testdir/test_regexp_utf8.vim
View File

@@ -533,4 +533,15 @@ func Test_search_with_end_offset()
close! close!
endfunc 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 " vim: shiftwidth=2 sts=2 expandtab