aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.1718: dict-completion does not respect region

Browse Source 
Problem: dict-completion does not respect region
Solution: respect selected region in dict completion

Set do_region to zero as we don't want a complete dump of the matching
words, we want the code to filter them according to the user's selected
region.

closes: #12792
closes: #7025

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: LemonBoy <thatlemon@gmail.com>
This commit is contained in:
LemonBoy
2023-08-15 23:07:55 +02:00
committed by Christian Brabandt
parent 636d32b327
commit e98fb643ec
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/spell.c
View File

@@ -3942,13 +3942,10 @@ spell_dump_compl(
} }
} }
if (do_region && region_names != NULL) if (do_region && region_names != NULL && pat == NULL)
{ {
if (pat == NULL) vim_snprintf((char *)IObuff, IOSIZE, "/regions=%s", region_names);
{ ml_append(lnum++, IObuff, (colnr_T)0, FALSE);
vim_snprintf((char *)IObuff, IOSIZE, "/regions=%s", region_names);
ml_append(lnum++, IObuff, (colnr_T)0, FALSE);
}
} }
else else
do_region = FALSE; do_region = FALSE;

3
src/testdir/test_spell.vim
View File

@@ -274,8 +274,7 @@ func Test_compl_with_CTRL_X_CTRL_K_using_spell()
call assert_equal(['theater'], getline(1, '$')) call assert_equal(['theater'], getline(1, '$'))
set spelllang=en_gb set spelllang=en_gb
call feedkeys("Stheat\<c-x>\<c-k>\<esc>", 'tnx') call feedkeys("Stheat\<c-x>\<c-k>\<esc>", 'tnx')
" FIXME: commented out, expected theatre bug got theater. See issue #7025. call assert_equal(['theatre'], getline(1, '$'))
" call assert_equal(['theatre'], getline(1, '$'))
bwipe! bwipe!
set spell& spelllang& dictionary& ignorecase& set spell& spelllang& dictionary& ignorecase&

2
src/version.c
View File

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