aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 9.0.0489: using "end_lnum" with virtual text causes problems

Browse Source 
Problem:    Using "end_lnum" with virtual text causes problems.
Solution:   Disallow using "end_lnum" with virtual text. (closes #11151)
            Also disallow "end_col" and "length".
This commit is contained in:
Bram Moolenaar
2022-09-17 18:57:36 +01:00
parent 4c7fd4d68f
commit fb593c5350
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/errors.h
View File

@@ -3338,3 +3338,7 @@ EXTERN char e_custom_list_completion_function_does_not_return_list_but_str[]
EXTERN char e_cannot_use_type_with_this_variable_str[] EXTERN char e_cannot_use_type_with_this_variable_str[]
INIT(= N_("E1304: Cannot use type with this variable: %s")); INIT(= N_("E1304: Cannot use type with this variable: %s"));
#endif #endif
#ifdef FEAT_PROP_POPUP
EXTERN char e_cannot_use_length_endcol_and_endlnum_with_text[]
INIT(= N_("E1305: Cannot use \"length\", \"end_col\" and \"end_lnum\" with \"text\""));
#endif

13
src/testdir/test_textprop.vim
View File

@@ -2578,13 +2578,22 @@ func Test_prop_inserts_text_highlight()
call delete('XscriptPropsWithHighlight') call delete('XscriptPropsWithHighlight')
endfunc endfunc
func Test_prop_add_with_text_fails()
call prop_type_add('failing', #{highlight: 'ErrorMsg'})
call assert_fails("call prop_add(1, 0, #{type: 'failing', text: 'X', end_lnum: 1})", 'E1305:')
call assert_fails("call prop_add(1, 0, #{type: 'failing', text: 'X', end_col: 1})", 'E1305:')
call assert_fails("call prop_add(1, 0, #{type: 'failing', text: 'X', length: 1})", 'E1305:')
call prop_type_delete('failing')
endfunc
func Test_props_with_text_right_align_twice() func Test_props_with_text_right_align_twice()
CheckRunVimInTerminal CheckRunVimInTerminal
let lines =<< trim END let lines =<< trim END
call setline(1, ["some text some text some text some text", 'line two']) call setline(1, ["some text some text some text some text", 'line two'])
call prop_type_add('MyErrorText', #{ highlight: 'ErrorMsg'}) call prop_type_add('MyErrorText', #{highlight: 'ErrorMsg'})
call prop_type_add('MyPadding', #{ highlight: 'DiffChange'}) call prop_type_add('MyPadding', #{highlight: 'DiffChange'})
call prop_add(1, 0, #{type: 'MyPadding', text: ' nothing here', text_wrap: 'wrap'}) call prop_add(1, 0, #{type: 'MyPadding', text: ' nothing here', text_wrap: 'wrap'})
call prop_add(1, 0, #{type: 'MyErrorText', text: 'Some error', text_wrap: 'wrap', text_align: 'right'}) call prop_add(1, 0, #{type: 'MyErrorText', text: 'Some error', text_wrap: 'wrap', text_align: 'right'})
call prop_add(1, 0, #{type: 'MyErrorText', text: 'Another error', text_wrap: 'wrap', text_align: 'right'}) call prop_add(1, 0, #{type: 'MyErrorText', text: 'Another error', text_wrap: 'wrap', text_align: 'right'})

8
src/textprop.c
View File

@@ -488,6 +488,14 @@ prop_add_common(
if (dict_has_key(dict, "text")) if (dict_has_key(dict, "text"))
{ {
if (dict_has_key(dict, "length")
|| dict_has_key(dict, "end_col")
|| dict_has_key(dict, "end_lnum"))
{
emsg(_(e_cannot_use_length_endcol_and_endlnum_with_text));
goto theend;
}
text = dict_get_string(dict, "text", TRUE); text = dict_get_string(dict, "text", TRUE);
if (text == NULL) if (text == NULL)
goto theend; goto theend;

2
src/version.c
View File

@@ -703,6 +703,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 */
/**/
489,
/**/ /**/
488, 488,
/**/ /**/