To: vim_dev@googlegroups.com Subject: Patch 9.0.1306 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1306 Problem: No regression test for solved problem of #11959. Solution: Add a test, also with 'list' set. (closes #11959) Files: src/testdir/test_textprop.vim, src/testdir/dumps/Test_prop_above_empty_2.dump *** ../vim-9.0.1305/src/testdir/test_textprop.vim 2023-02-12 14:41:58.060651001 +0000 --- src/testdir/test_textprop.vim 2023-02-12 18:08:10.318391766 +0000 *************** *** 2804,2809 **** --- 2804,2834 ---- call StopVimInTerminal(buf) endfunc + func Test_prop_with_text_above_empty() + CheckRunVimInTerminal + + " check the cursor is in the correct line + let lines =<< trim END + setlocal number + call setline(1, ['11111111', '', '333333333', '', '55555555555']) + + let vt = 'test' + call prop_type_add(vt, {'highlight': 'ToDo'}) + for ln in range(1, line('$')) + call prop_add(ln, 0, {'type': vt, 'text': '---', 'text_align': 'above'}) + endfor + normal G + END + call writefile(lines, 'XscriptPropAboveEmpty', 'D') + let buf = RunVimInTerminal('-S XscriptPropAboveEmpty', #{rows: 16, cols: 60}) + call VerifyScreenDump(buf, 'Test_prop_above_empty_1', {}) + + call term_sendkeys(buf, ":set list\") + call VerifyScreenDump(buf, 'Test_prop_above_empty_2', {}) + + call StopVimInTerminal(buf) + endfunc + func Test_prop_with_text_below_after_match() CheckRunVimInTerminal *** ../vim-9.0.1305/src/testdir/dumps/Test_prop_above_empty_2.dump 2023-02-12 18:10:51.782421225 +0000 --- src/testdir/dumps/Test_prop_above_empty_2.dump 2023-02-12 18:08:18.306393494 +0000 *************** *** 0 **** --- 1,16 ---- + | +0#af5f00255#ffffff0@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 + | +0#af5f00255&@1|1| |1+0#0000000&@7|$+0#4040ff13&| +0#0000000&@46 + | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 + | +0#af5f00255&@1|2| |$+0#4040ff13&| +0#0000000&@54 + | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 + | +0#af5f00255&@1|3| |3+0#0000000&@8|$+0#4040ff13&| +0#0000000&@45 + | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 + | +0#af5f00255&@1|4| |$+0#4040ff13&| +0#0000000&@54 + | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 + | +0#af5f00255&@1|5| >5+0#0000000&@10|$+0#4040ff13&| +0#0000000&@43 + |~+0#4040ff13&| @58 + |~| @58 + |~| @58 + |~| @58 + |~| @58 + |:+0#0000000&|s|e|t| |l|i|s|t| @32|5|,|1|-|5|7| @7|A|l@1| *** ../vim-9.0.1305/src/version.c 2023-02-12 18:03:39.162310876 +0000 --- src/version.c 2023-02-12 18:10:16.982415793 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1306, /**/ -- hundred-and-one symptoms of being an internet addict: 119. You are reading a book and look for the scroll bar to get to the next page. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///