diff options
author | Dominique Pelle <dominique.pelle@gmail.com> | 2021-05-31 20:04:07 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-05-31 20:04:07 +0200 |
commit | bb162367ac77db877586086d7456685f2aeb8754 (patch) | |
tree | 7e311da412e523c2c3c0942ad11107060a06d188 | |
parent | 2ac7184d34cd01e2b76bd1f704fd6a4b4af10239 (diff) | |
download | vim-git-bb162367ac77db877586086d7456685f2aeb8754.tar.gz |
patch 8.2.2917: spellfile functionality not fully testedv8.2.2917
Problem: Spellfile functionality not fully tested.
Solution: Add tests for SFX with removal of characters, spelling
suggestions with NOBREAK and others. (Dominique Pellé,
closes #8293)
-rw-r--r-- | src/testdir/test_spellfile.vim | 56 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 58 insertions, 0 deletions
diff --git a/src/testdir/test_spellfile.vim b/src/testdir/test_spellfile.vim index 40c9a0693..b7bb50198 100644 --- a/src/testdir/test_spellfile.vim +++ b/src/testdir/test_spellfile.vim @@ -681,6 +681,11 @@ func Test_aff_file_format_error() let output = execute('mkspell! Xtest.spl Xtest') call assert_match('Wrong CHECKCOMPOUNDPATTERN value in Xtest.aff line 1: 0', output) + " Both compounding and NOBREAK specified + call writefile(['COMPOUNDFLAG c', 'NOBREAK'], 'Xtest.aff') + let output = execute('mkspell! Xtest.spl Xtest') + call assert_match('Warning: both compounding and NOBREAK specified', output) + " Duplicate affix entry in an affix file call writefile(['PFX L Y 1', 'PFX L 0 re x', 'PFX L Y 1', 'PFX L 0 re x'], \ 'Xtest.aff') @@ -884,6 +889,15 @@ func Test_NOBREAK() call assert_equal(['z', 'bad'], spellbadword('onez')) call assert_equal(['zero', 'bad'], spellbadword('Onetwozerothree')) + new + call setline(1, 'Onetwwothree') + norm! fw1z= + call assert_equal('Onetwothree', getline(1)) + call setline(1, 'Onetwothre') + norm! fh1z= + call assert_equal('Onetwothree', getline(1)) + + bw! set spell& spelllang& call delete('XtestNOBREAK.dic') call delete('XtestNOBREAK.aff') @@ -999,6 +1013,48 @@ func Test_spellfile_CIRCUMFIX() call delete('XtestCIRCUMFIX-utf8.spl') endfunc +" Test SFX that strips/chops characters +func Test_spellfile_SFX_strip() + " Simplified conjugation of Italian verbs ending in -are (first conjugation). + call writefile(['SFX A Y 4', + \ 'SFX A are iamo [^icg]are', + \ 'SFX A are hiamo [cg]are', + \ 'SFX A re mo iare', + \ 'SFX A re vamo are'], + \ 'XtestSFX.aff') + " Examples of Italian verbs: + " - cantare = to sing + " - cercare = to search + " - odiare = to hate + call writefile(['3', 'cantare/A', 'cercare/A', 'odiare/A'], 'XtestSFX.dic') + + mkspell! XtestSFX-utf8.spl XtestSFX + set spell spelllang=XtestSFX-utf8.spl + + " To sing, we're singing, we were singing. + call assert_equal(['', ''], spellbadword('cantare cantiamo cantavamo')) + + " To search, we're searching, we were searching. + call assert_equal(['', ''], spellbadword('cercare cerchiamo cercavamo')) + + " To hate, we hate, we were hating. + call assert_equal(['', ''], spellbadword('odiare odiamo odiavamo')) + + for badword in ['canthiamo', 'cerciamo', 'cantarevamo', 'odiiamo'] + call assert_equal([badword, 'bad'], spellbadword(badword)) + endfor + + call assert_equal(['cantiamo'], spellsuggest('canthiamo', 1)) + call assert_equal(['cerchiamo'], spellsuggest('cerciamo', 1)) + call assert_equal(['cantavamo'], spellsuggest('cantarevamo', 1)) + call assert_equal(['odiamo'], spellsuggest('odiiamo', 1)) + + set spell& spelllang& + call delete('XtestSFX.dic') + call delete('XtestSFX.aff') + call delete('XtestSFX-utf8.spl') +endfunc + " When 'spellfile' is not set, adding a new good word will automatically set " the 'spellfile' func Test_init_spellfile() diff --git a/src/version.c b/src/version.c index 87eb48430..099d05a56 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2917, +/**/ 2916, /**/ 2915, |