aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-06-18 21:12:14 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-06-27 05:33:54 +0800
commitf0d4007f620d0d1aa9f0f051d83030112c4c66f1 (patch)
treefa4633cff203dca0f9522cad69e841793b986342
parent80af2c6055cbc393ee73a8a38cef1e498aaae41d (diff)
downloadrneovim-f0d4007f620d0d1aa9f0f051d83030112c4c66f1.tar.gz
rneovim-f0d4007f620d0d1aa9f0f051d83030112c4c66f1.tar.bz2
rneovim-f0d4007f620d0d1aa9f0f051d83030112c4c66f1.zip
vim-patch:8.2.5123: using invalid index when looking for spell suggestions
Problem: Using invalid index when looking for spell suggestions. Solution: Do not decrement the index when it is zero. https://github.com/vim/vim/commit/156d3911952d73b03d7420dc3540215247db0fe8
-rw-r--r--src/nvim/spell.c2
-rw-r--r--src/nvim/testdir/test_spell.vim10
2 files changed, 11 insertions, 1 deletions
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index e597877a52..8ae846e074 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -4399,7 +4399,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
sp->ts_fcharstart = sp->ts_fidx - 1;
sp->ts_isdiff = (newscore != 0)
? DIFF_YES : DIFF_NONE;
- } else if (sp->ts_isdiff == DIFF_INSERT) {
+ } else if (sp->ts_isdiff == DIFF_INSERT && sp->ts_fidx > 0) {
// When inserting trail bytes don't advance in the
// bad word.
sp->ts_fidx--;
diff --git a/src/nvim/testdir/test_spell.vim b/src/nvim/testdir/test_spell.vim
index ce21b8bdc9..215d4387d6 100644
--- a/src/nvim/testdir/test_spell.vim
+++ b/src/nvim/testdir/test_spell.vim
@@ -72,6 +72,16 @@ func Test_z_equal_on_invalid_utf8_word()
bwipe!
endfunc
+func Test_z_equal_on_single_character()
+ " this was decrementing the index below zero
+ new
+ norm a0\Ê
+ norm zW
+ norm z=
+
+ bwipe!
+endfunc
+
" Test spellbadword() with argument
func Test_spellbadword()
set spell