patch 8.2.0378: prop_find() does not find all props
Problem: prop_find() does not find all props.
Solution: Check being in the start line. (Axel Forsman, closes #5776)
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 6d3aaa3..692b0c4 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -213,6 +213,17 @@
call prop_type_delete('prop_name')
endfunc
+func Test_prop_find_smaller_len_than_match_col()
+ new
+ call prop_type_add('test', {'highlight': 'ErrorMsg'})
+ call setline(1, ['xxxx', 'x'])
+ call prop_add(1, 4, {'type': 'test'})
+ call assert_equal({'id': 0, 'lnum': 1, 'col': 4, 'type': 'test', 'length': 0, 'start': 1, 'end': 1},
+ \ prop_find({'type': 'test', 'lnum': 2, 'col': 1}, 'b'))
+ bwipe!
+ call prop_type_delete('test')
+endfunc
+
func Test_prop_add()
new
call AddPropTypes()
diff --git a/src/textprop.c b/src/textprop.c
index 4f5329e..6e3ed5f 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -663,13 +663,14 @@
mch_memmove(&prop, text + textlen + i * sizeof(textprop_T),
sizeof(textprop_T));
- if (dir < 0)
- {
- if (col < prop.tp_col)
- break;
- }
- else if (prop.tp_col + prop.tp_len - (prop.tp_len != 0) < col)
- continue;
+ if (lnum == lnum_start)
+ if (dir < 0)
+ {
+ if (col < prop.tp_col)
+ break;
+ }
+ else if (prop.tp_col + prop.tp_len - (prop.tp_len != 0) < col)
+ continue;
if (prop.tp_id == id || prop.tp_type == type_id)
{
diff --git a/src/version.c b/src/version.c
index 1408142..303f7ec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 378,
+/**/
377,
/**/
376,