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

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".

diff --git a/src/errors.h b/src/errors.h
index 5f0fdcb8a845492ccdae0fb1f932b005e3405e05..944dc43c5d09df48cc3338706f074db3c0d73e93 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -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[]
        INIT(= N_("E1304: Cannot use type with this variable: %s"));
 #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

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 1c32cbcd067ead7649195767ca98ee3cfab442f8..a807db6cef3a73070d2364f8e196a4ebab2e50d1 100644 (file)
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -2578,13 +2578,22 @@ func Test_prop_inserts_text_highlight()
   call delete('XscriptPropsWithHighlight')
 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()
   CheckRunVimInTerminal
 
   let lines =<< trim END
       call setline(1, ["some text some text some text some text", 'line two'])
-      call prop_type_add('MyErrorText', #{ highlight: 'ErrorMsg'})
-      call prop_type_add('MyPadding', #{ highlight: 'DiffChange'})
+      call prop_type_add('MyErrorText', #{highlight: 'ErrorMsg'})
+      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: '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'})

diff --git a/src/textprop.c b/src/textprop.c
index 6e5c1447fff9b3b07ae0fa156a8fe4fa7de90884..4153e3f45335e85559ba444b1a28fb9fc078f846 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -488,6 +488,14 @@ prop_add_common(
 
     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);
        if (text == NULL)
            goto theend;

diff --git a/src/version.c b/src/version.c
index 93e706d9eefdc1864c1bc1b403c17ea7bd5c6407..f4c5fb4a893801cf7a488a9fabc25e67e257742c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -703,6 +703,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    489,
 /**/
     488,
 /**/