adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.0.1595: line pointer becomes invalid when using spell checking

Browse Source 
Problem:    Line pointer becomes invalid when using spell checking.
Solution:   Call ml_get() at the right places. (Luuk van Baal, closes #12456)
This commit is contained in:
Luuk van Baal
2023-05-31 18:57:36 +01:00
committed by Bram Moolenaar
parent 68ebcee023
commit e84c773d42
6 changed files with 61 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/drawline.c
View File

@ -1449,9 +1449,6 @@ win_line(
area_highlighting = TRUE;
#endif
line = ml_get_buf(wp->w_buffer, lnum, FALSE);
ptr = line;
#ifdef FEAT_SPELL
if (spv->spv_has_spell && !number_only)
{
@ -1462,28 +1459,36 @@ win_line(
// current line is valid.
if (lnum == spv->spv_checked_lnum)
cur_checked_col = spv->spv_checked_col;
if (lnum != spv->spv_capcol_lnum)
// Previous line was not spell checked, check for capital. This happens
// for the first line in an updated region or after a closed fold.
if (spv->spv_capcol_lnum == 0 && check_need_cap(wp, lnum, 0))
spv->spv_cap_col = 0;
else if (lnum != spv->spv_capcol_lnum)
spv->spv_cap_col = -1;
spv->spv_checked_lnum = 0;
// For checking first word with a capital skip white space.
if (spv->spv_cap_col == 0)
spv->spv_cap_col = getwhitecols(line);
// If current line is empty, check first word in next line for capital.
else if (*skipwhite(line) == NUL)
{
spv->spv_cap_col = 0;
spv->spv_capcol_lnum = lnum + 1;
}
// Get the start of the next line, so that words that wrap to the
// next line are found too: "et<line-break>al.".
// Trick: skip a few chars for C/shell/Vim comments
nextline[SPWORDLEN] = NUL;
if (lnum < wp->w_buffer->b_ml.ml_line_count)
spell_cat_line(nextline + SPWORDLEN,
ml_get_buf(wp->w_buffer, lnum + 1, FALSE), SPWORDLEN);
{
line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE);
spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN);
}
line = ml_get_buf(wp->w_buffer, lnum, FALSE);
// If current line is empty, check first word in next line for capital.
ptr = skipwhite(line);
if (*ptr == NUL)
{
spv->spv_cap_col = 0;
spv->spv_capcol_lnum = lnum + 1;
}
// For checking first word with a capital skip white space.
else if (spv->spv_cap_col == 0)
spv->spv_cap_col = ptr - line;
// Copy the end of the current line into nextline[].
if (nextline[SPWORDLEN] == NUL)
{
@ -1514,6 +1519,9 @@ win_line(
}
#endif
line = ml_get_buf(wp->w_buffer, lnum, FALSE);
ptr = line;
if (wp->w_p_list)
{
if (wp->w_lcs_chars.space

19
src/drawscreen.c
View File

@ -2197,12 +2197,10 @@ win_update(win_T *wp)
#ifdef FEAT_SPELL
// Initialize spell related variables for the first drawn line.
CLEAR_FIELD(spv);
spv.spv_has_spell = spell_check_window(wp);
if (spv.spv_has_spell)
if (spell_check_window(wp))
{
spv.spv_has_spell = TRUE;
spv.spv_unchanged = mod_top == 0;
spv.spv_capcol_lnum = mod_top ? mod_top : lnum;
spv.spv_cap_col = check_need_cap(wp, spv.spv_capcol_lnum, 0) ? 0 : - 1;
}
#endif
@ -2464,19 +2462,13 @@ win_update(win_T *wp)
fold_line(wp, fold_count, &win_foldinfo, lnum, row);
++row;
--fold_count;
linenr_T lnume = lnum + fold_count;
wp->w_lines[idx].wl_folded = TRUE;
wp->w_lines[idx].wl_lastlnum = lnume;
wp->w_lines[idx].wl_lastlnum = lnum + fold_count;
# ifdef FEAT_SYN_HL
did_update = DID_FOLD;
# endif
# ifdef FEAT_SPELL
// Check if the line after this fold requires a capital.
if (spv.spv_has_spell && check_need_cap(wp, lnume + 1, 0))
{
spv.spv_cap_col = 0;
spv.spv_capcol_lnum = lnume + 1;
}
spv.spv_capcol_lnum = 0;
# endif
}
else
@ -2571,6 +2563,9 @@ win_update(win_T *wp)
#endif
#ifdef FEAT_SYN_HL
did_update = DID_NONE;
#endif
#ifdef FEAT_SPELL
spv.spv_capcol_lnum = 0;
#endif
}

8
src/testdir/dumps/Test_spell_10.dump Normal file
View File

@ -0,0 +1,8 @@
| +0&#ffffff0@2|T|h|i|s| |l|i|n|e| |h|a|s| |a| |s+0&#ffd7d7255|e|p|l@1| +0&#ffffff0|e|r@1|o|r|.| |a+0&#5fd7ff255|n|d| +0&#ffffff0|m|i|s@1|i|n|g| |c|a|p|s| |a|n|d| |t|r|a|i|l|i|n|g| |s|p|a|c|e|s|.| @5
|a+0&#5fd7ff255|n|o|t|h|e|r| +0&#ffffff0|m|i|s@1|i|n|g| |c|a|p| |h|e|r|e| @50
|++0#0000e05#a8a8a8255|-@1| @1|2| |l|i|n|e|s|:| |N|o|t|-@57
> +0#0000000#ffffff0@74
@75
|a+0&#5fd7ff255|n|d| +0&#ffffff0|h|e|r|e|.| @65
|~+0#4040ff13&| @73
| +0#0000000&@56|5|,|0|-|1| @8|A|l@1|

8
src/testdir/dumps/Test_spell_9.dump Normal file
View File

@ -0,0 +1,8 @@
| +0&#ffffff0@2|T|h|i|s| |l|i|n|e| |h|a|s| |a| |s+0&#ffd7d7255|e|p|l@1| +0&#ffffff0|e|r@1|o|r|.| |a+0&#5fd7ff255|n|d| +0&#ffffff0|m|i|s@1|i|n|g| |c|a|p|s| |a|n|d| |t|r|a|i|l|i|n|g| |s|p|a|c|e|s|.| @5
|a+0&#5fd7ff255|n|o|t|h|e|r| +0&#ffffff0|m|i|s@1|i|n|g| |c|a|p| |h|e|r|e| @50
|++0#0000e05#a8a8a8255|-@1| @1|2| |l|i|n|e|s|:| |N|o|t|-@57
> +0#0000000#ffffff0@74
|a+0&#5fd7ff255|n|d| +0&#ffffff0|h|e|r|e|.| @65
|~+0#4040ff13&| @73
|~| @73
| +0#0000000&@56|5|,|0|-|1| @8|A|l@1|

11
src/testdir/test_spell.vim
View File

@ -958,6 +958,7 @@ func Test_spell_screendump()
CheckScreendump
let lines =<< trim END
call test_override('alloc_lines', 1)
call setline(1, [
\ "This is some text without any spell errors. Everything",
\ "should just be black, nothing wrong here.",
@ -980,6 +981,7 @@ func Test_spell_screendump_spellcap()
CheckScreendump
let lines =<< trim END
call test_override('alloc_lines', 1)
call setline(1, [
\ " This line has a sepll error. and missing caps and trailing spaces. ",
\ "another missing cap here.",
@ -1019,6 +1021,14 @@ func Test_spell_screendump_spellcap()
call term_sendkeys(buf, "\<C-E>\<C-L>")
call VerifyScreenDump(buf, 'Test_spell_8', {})
" Adding an empty line does not remove Cap in "mod_bot" area
call term_sendkeys(buf, "zbO\<Esc>")
call VerifyScreenDump(buf, 'Test_spell_9', {})
" Multiple empty lines does not remove Cap in the line after
call term_sendkeys(buf, "O\<Esc>\<C-L>")
call VerifyScreenDump(buf, 'Test_spell_10', {})
" clean up
call StopVimInTerminal(buf)
endfunc
@ -1027,6 +1037,7 @@ func Test_spell_compatible()
CheckScreendump
let lines =<< trim END
call test_override('alloc_lines', 1)
call setline(1, [
\ "test "->repeat(20),
\ "",

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1595,
/**/
1594,
/**/