Patch 8.2.2917

7 views
Skip to first unread message

Bram Moolenaar

unread,
May 31, 2021, 2:04:45 PM5/31/21
to vim...@googlegroups.com

Patch 8.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)
Files: src/testdir/test_spellfile.vim


*** ../vim-8.2.2916/src/testdir/test_spellfile.vim 2021-05-29 17:29:29.697467482 +0200
--- src/testdir/test_spellfile.vim 2021-05-31 20:01:28.945550999 +0200
***************
*** 681,686 ****
--- 681,691 ----
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,889 ****
--- 889,903 ----
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,1004 ****
--- 1013,1060 ----
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()
*** ../vim-8.2.2916/src/version.c 2021-05-31 19:22:58.583454940 +0200
--- src/version.c 2021-05-31 20:03:02.449316429 +0200
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2917,
/**/

--
An indication you must be a manager:
You believe you never have any problems in your life, just
"issues" and "improvement opportunities".

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages