From d0afb2dc4eb8e70942441b3c9a551dcccd6806cd Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 11 Apr 2024 07:40:16 +0800 Subject: vim-patch:9.1.0297: Patch 9.1.0296 causes too many issues (#28263) Problem: Patch 9.1.0296 causes too many issues (Tony Mechelynck, chdiza, CI) Solution: Back out the change for now Revert "patch 9.1.0296: regexp: engines do not handle case-folding well" This reverts commit 7a27c108e0509f3255ebdcb6558e896c223e4d23 it causes issues with syntax highlighting and breaks the FreeBSD and MacOS CI. It needs more work. fixes: vim/vim#14487 https://github.com/vim/vim/commit/c97f4d61cde24030f2f7d2318e1b409a0ccc3e43 Co-authored-by: Christian Brabandt --- test/old/testdir/test_regexp_utf8.vim | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'test') diff --git a/test/old/testdir/test_regexp_utf8.vim b/test/old/testdir/test_regexp_utf8.vim index b3f5e346a0..97f48a0c09 100644 --- a/test/old/testdir/test_regexp_utf8.vim +++ b/test/old/testdir/test_regexp_utf8.vim @@ -611,32 +611,4 @@ func Test_combining_chars_in_collection() bw! endfunc -func Test_search_multibyte_match_ascii() - new - " Match single 'ſ' and 's' - call setline(1, 'das abc heraus abc ſich abc ſind') - for i in range(0, 2) - exe "set re="..i - let ic_match = matchbufline('%', '\c\%u17f', 1, '$')->mapnew({idx, val -> val.text}) - let noic_match = matchbufline('%', '\C\%u17f', 1, '$')->mapnew({idx, val -> val.text}) - call assert_equal(['s', 's', 'ſ','ſ'], ic_match, "Ignorecase Regex-engine: " .. &re) - call assert_equal(['ſ','ſ'], noic_match, "No-Ignorecase Regex-engine: " .. &re) - endfor - " Match several 'ſſ' and 'ss' - call setline(1, 'das abc herauss abc ſſich abc ſind') - for i in range(0, 2) - exe "set re="..i - let ic_match = matchbufline('%', '\c\%u17f\%u17f', 1, '$')->mapnew({idx, val -> val.text}) - let noic_match = matchbufline('%', '\C\%u17f\%u17f', 1, '$')->mapnew({idx, val -> val.text}) - let ic_match2 = matchbufline('%', '\c\%u17f\+', 1, '$')->mapnew({idx, val -> val.text}) - let noic_match2 = matchbufline('%', '\C\%u17f\+', 1, '$')->mapnew({idx, val -> val.text}) - - call assert_equal(['ss', 'ſſ'], ic_match, "Ignorecase Regex-engine: " .. &re) - call assert_equal(['ſſ'], noic_match, "No-Ignorecase Regex-engine: " .. &re) - call assert_equal(['s', 'ss', 'ſſ', 'ſ'], ic_match2, "Ignorecase Regex-engine: " .. &re) - call assert_equal(['ſſ','ſ'], noic_match2, "No-Ignorecase Regex-engine: " .. &re) - endfor - bw! -endfunc - " vim: shiftwidth=2 sts=2 expandtab -- cgit