changeset 15363:45f36b66a032 v8.1.0689

patch 8.1.0689: undo with text properties not tested commit https://github.com/vim/vim/commit/7f1664e392388fd38c8b154389167ad1bdedff66 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 4 17:21:24 2019 +0100 patch 8.1.0689: undo with text properties not tested Problem: Undo with text properties not tested. Solution: Add a test function.
author Bram Moolenaar <Bram@vim.org>
date Fri, 04 Jan 2019 17:30:06 +0100
parents 53eeac478ff7
children 08a7f9533397
files src/testdir/test_textprop.vim src/version.c
diffstat 2 files changed, 55 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -348,6 +348,59 @@ func Test_prop_byteoff()
   call prop_type_delete('comment')
 endfunc
 
+func Test_prop_undo()
+  new
+  call prop_type_add('comment', {'highlight': 'Directory'})
+  call setline(1, ['oneone', 'twotwo', 'three'])
+  " Set 'undolevels' to break changes into undo-able pieces.
+  set ul&
+
+  call prop_add(1, 3, {'end_col': 5, 'type': 'comment'})
+  let expected = [{'col': 3, 'length': 2, 'id': 0, 'type': 'comment', 'start': 1, 'end': 1} ]
+  call assert_equal(expected, prop_list(1))
+
+  " Insert a character, then undo.
+  exe "normal 0lllix\<Esc>"
+  set ul&
+  let expected[0].length = 3
+  call assert_equal(expected, prop_list(1))
+  undo
+  let expected[0].length = 2
+  call assert_equal(expected, prop_list(1))
+
+  " Delete a character, then undo
+  exe "normal 0lllx"
+  set ul&
+  let expected[0].length = 1
+  call assert_equal(expected, prop_list(1))
+  undo
+  let expected[0].length = 2
+  call assert_equal(expected, prop_list(1))
+
+  " Delete the line, then undo
+  1d
+  set ul&
+  call assert_equal([], prop_list(1))
+  undo
+  call assert_equal(expected, prop_list(1))
+
+  " Insert a character, delete two characters, then undo with "U"
+  exe "normal 0lllix\<Esc>"
+  set ul&
+  let expected[0].length = 3
+  call assert_equal(expected, prop_list(1))
+  exe "normal 0lllxx"
+  set ul&
+  let expected[0].length = 1
+  call assert_equal(expected, prop_list(1))
+  normal U
+  let expected[0].length = 2
+  call assert_equal(expected, prop_list(1))
+
+  bwipe!
+  call prop_type_delete('comment')
+endfunc
+
 " screenshot test with textprop highlighting
 funct Test_textprop_screenshots()
   if !CanRunVimInTerminal() || &encoding != 'utf-8'
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    689,
+/**/
     688,
 /**/
     687,