patch 8.1.1388: errors when calling prop_remove() for an unloaded buffer
Problem: Errors when calling prop_remove() for an unloaded buffer.
Solution: Bail out when the buffer is not loaded. Add a few more tests for
failing when the buffer number is invalid.
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 4d620ea..811ddf4 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -69,6 +69,8 @@
call assert_equal(1, len(prop_type_list({'bufnr': bufnr})))
call prop_type_delete('two', {'bufnr': bufnr})
call assert_equal(0, len(prop_type_list({'bufnr': bufnr})))
+
+ call assert_fails("call prop_type_add('one', {'bufnr': 98764})", "E158:")
endfunc
func AddPropTypes()
@@ -124,6 +126,8 @@
let expected = [{'col': 5, 'length': 0, 'type': 'two', 'id': 0, 'start': 1, 'end': 1}]
call assert_equal(expected, prop_list(1))
+ call assert_fails("call prop_add(1, 5, {'type': 'two', 'bufnr': 234343})", 'E158:')
+
call DeletePropTypes()
bwipe!
endfunc
@@ -136,15 +140,18 @@
call assert_equal(props, prop_list(1))
" remove by id
- call prop_remove({'id': 12}, 1)
+ call assert_equal(1, prop_remove({'id': 12}, 1))
unlet props[2]
call assert_equal(props, prop_list(1))
" remove by type
- call prop_remove({'type': 'one'}, 1)
+ call assert_equal(1, prop_remove({'type': 'one'}, 1))
unlet props[1]
call assert_equal(props, prop_list(1))
+ " remove from unknown buffer
+ call assert_fails("call prop_remove({'type': 'one', 'bufnr': 123456}, 1)", 'E158:')
+
call DeletePropTypes()
bwipe!
endfunc
@@ -760,3 +767,16 @@
call prop_add(1, 1, {'type': 'comment'})
close
endfunc
+
+func Test_textprop_remove_from_buf()
+ new
+ let buf = bufnr('')
+ call prop_type_add('one', {'bufnr': buf})
+ call prop_add(1, 1, {'type': 'one', 'id': 234})
+ file x
+ edit y
+ call prop_remove({'id': 234, 'bufnr': buf}, 1)
+ call prop_type_delete('one', {'bufnr': buf})
+ bwipe! x
+ close
+endfunc