diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2017-03-12 11:35:30 +0800 |
|---|---|---|
| committer | lonerover <pathfinder1644@yahoo.com> | 2017-03-12 11:36:12 +0800 |
| commit | 9f13983de280c53971a8997ead0d6e9d4e3d3e42 (patch) | |
| tree | 92af36904f8bed8415df75fc32eed97cc92b591a /src | |
| parent | ce6d2fbb613843afe9068f9f3738f2dc47adbe76 (diff) | |
| download | rneovim-9f13983de280c53971a8997ead0d6e9d4e3d3e42.tar.gz rneovim-9f13983de280c53971a8997ead0d6e9d4e3d3e42.tar.bz2 rneovim-9f13983de280c53971a8997ead0d6e9d4e3d3e42.zip | |
vim-patch:7.4.2185
Problem: Test glob2regpat does not test much.
Solution: Add a few more test cases. (Dominique Pelle)
https://github.com/vim/vim/commit/71dd9744cf3842cd45295010d2e5692da1651537
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_glob2regpat.vim | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_glob2regpat.vim b/src/nvim/testdir/test_glob2regpat.vim index 250ab2746c..52d8a33279 100644 --- a/src/nvim/testdir/test_glob2regpat.vim +++ b/src/nvim/testdir/test_glob2regpat.vim @@ -2,9 +2,21 @@ func Test_invalid() call assert_fails('call glob2regpat(1.33)', 'E806:') + call assert_fails('call glob2regpat("}")', 'E219:') + call assert_fails('call glob2regpat("{")', 'E220:') endfunc func Test_valid() call assert_equal('^foo\.', glob2regpat('foo.*')) + call assert_equal('^foo.$', glob2regpat('foo?')) + call assert_equal('^foo?$', glob2regpat('foo\?')) call assert_equal('\.vim$', glob2regpat('*.vim')) + call assert_equal('^[abc]$', glob2regpat('[abc]')) + call assert_equal('^foo bar$', glob2regpat('foo\ bar')) + call assert_equal('^foo,bar$', glob2regpat('foo,bar')) + call assert_equal('^\(foo\|bar\)$', glob2regpat('{foo,bar}')) + call assert_equal('^\(foo,bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}')) + call assert_equal('^{foo,bar}$', glob2regpat('\{foo,bar\}')) + call assert_equal('^\\\(foo\|bar\\\)$', glob2regpat('\\{foo,bar\\}')) + call assert_equal('.*', glob2regpat('**')) endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index c4d31c4abe..37a91a3933 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -255,7 +255,7 @@ static int included_patches[] = { 2188, // 2187, // 2186 NA - // 2185, + 2185, // 2184, 2183, // 2182 NA |