mirror of
https://github.com/vim/vim.git
synced 2025-10-16 07:24:23 -04:00
patch 9.1.1824: tests: no test for displaying 'foldcolumn' with Unicode "foldinner"
Problem: tests: no test for displaying 'foldcolumn' with Unicode "foldinner" in 'fillchars'. Solution: Add a few more test cases. Also fix misplaced "foldinner" entry in version9.txt (zeertzjq). closes: #18483 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
dd9ed46a39
commit
bcf44668f6
@@ -1,4 +1,4 @@
|
|||||||
*version9.txt* For Vim version 9.1. Last change: 2025 Oct 03
|
*version9.txt* For Vim version 9.1. Last change: 2025 Oct 04
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@@ -322,8 +322,6 @@ Improvements in 'fillchars':
|
|||||||
"eob" in 'fillchars'.
|
"eob" in 'fillchars'.
|
||||||
- Support for using multibyte items with the "stl", "stlnc", "foldopen",
|
- Support for using multibyte items with the "stl", "stlnc", "foldopen",
|
||||||
"foldclose" and "foldsep" items in the 'fillchars' option.
|
"foldclose" and "foldsep" items in the 'fillchars' option.
|
||||||
- Support for configuring the character used inside a fold level region using
|
|
||||||
"foldinner" in 'fillchars'.
|
|
||||||
|
|
||||||
Support for the XChaCha20 encryption method. 'cryptmethod'
|
Support for the XChaCha20 encryption method. 'cryptmethod'
|
||||||
|
|
||||||
|
@@ -340,7 +340,6 @@ func Test_fold_fillchars()
|
|||||||
\ ]
|
\ ]
|
||||||
call assert_equal(expected, lines)
|
call assert_equal(expected, lines)
|
||||||
|
|
||||||
" check setting foldinner
|
|
||||||
set fdc=1 foldmethod=indent foldlevel=10
|
set fdc=1 foldmethod=indent foldlevel=10
|
||||||
call setline(1, ['one', ' two', ' two', ' three', ' three', 'four'])
|
call setline(1, ['one', ' two', ' two', ' three', ' three', 'four'])
|
||||||
let lines = ScreenLines([1, 6], 22)
|
let lines = ScreenLines([1, 6], 22)
|
||||||
@@ -354,6 +353,7 @@ func Test_fold_fillchars()
|
|||||||
\ ]
|
\ ]
|
||||||
call assert_equal(expected, lines)
|
call assert_equal(expected, lines)
|
||||||
|
|
||||||
|
" check setting foldinner
|
||||||
set fillchars+=foldinner:\
|
set fillchars+=foldinner:\
|
||||||
let lines = ScreenLines([1, 6], 22)
|
let lines = ScreenLines([1, 6], 22)
|
||||||
let expected = [
|
let expected = [
|
||||||
@@ -366,6 +366,42 @@ func Test_fold_fillchars()
|
|||||||
\ ]
|
\ ]
|
||||||
call assert_equal(expected, lines)
|
call assert_equal(expected, lines)
|
||||||
|
|
||||||
|
" check Unicode chars
|
||||||
|
set fillchars=foldopen:▼,foldclose:▶,fold:⋯,foldsep:‖,foldinner:⋮
|
||||||
|
let lines = ScreenLines([1, 6], 22)
|
||||||
|
let expected = [
|
||||||
|
\ ' one ',
|
||||||
|
\ '▼ two ',
|
||||||
|
\ '‖ two ',
|
||||||
|
\ '▼ three',
|
||||||
|
\ '⋮ three',
|
||||||
|
\ ' four ',
|
||||||
|
\ ]
|
||||||
|
call assert_equal(expected, lines)
|
||||||
|
|
||||||
|
set fillchars-=foldinner:⋮
|
||||||
|
let lines = ScreenLines([1, 6], 22)
|
||||||
|
let expected = [
|
||||||
|
\ ' one ',
|
||||||
|
\ '▼ two ',
|
||||||
|
\ '‖ two ',
|
||||||
|
\ '▼ three',
|
||||||
|
\ '2 three',
|
||||||
|
\ ' four ',
|
||||||
|
\ ]
|
||||||
|
call assert_equal(expected, lines)
|
||||||
|
|
||||||
|
normal! 5ggzc
|
||||||
|
let lines = ScreenLines([1, 5], 24)
|
||||||
|
let expected = [
|
||||||
|
\ ' one ',
|
||||||
|
\ '▼ two ',
|
||||||
|
\ '‖ two ',
|
||||||
|
\ '▶+--- 2 lines: three⋯⋯⋯',
|
||||||
|
\ ' four ',
|
||||||
|
\ ]
|
||||||
|
call assert_equal(expected, lines)
|
||||||
|
|
||||||
%bw!
|
%bw!
|
||||||
set fillchars& fdc& foldmethod& foldenable&
|
set fillchars& fdc& foldmethod& foldenable&
|
||||||
endfunc
|
endfunc
|
||||||
|
@@ -729,6 +729,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1824,
|
||||||
/**/
|
/**/
|
||||||
1823,
|
1823,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user