[vim/vim] Port the NeoVim changes to add foldopen, foldclose and foldsep chars to 'fillchars' (#7860)

52 views
Skip to first unread message

Yegappan Lakshmanan

unread,
Feb 16, 2021, 10:36:46 PM2/16/21
to vim/vim, Subscribed

Port the following:
neovim/neovim#11568


You can view, comment on, or merge this pull request online at:

  https://github.com/vim/vim/pull/7860

Commit Summary

  • Port the NeoVim changes to add foldopen, foldclose and foldsep chars to 'fillchars'

File Changes

Patch Links:


You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.

codecov[bot]

unread,
Feb 16, 2021, 10:39:11 PM2/16/21
to vim/vim, Subscribed

Codecov Report

Merging #7860 (9a0a71c) into master (333bd56) will decrease coverage by 86.53%.
The diff coverage is 42.85%.

Impacted file tree graph

@@             Coverage Diff             @@

##           master    #7860       +/-   ##

===========================================

- Coverage   89.03%    2.49%   -86.54%     

===========================================

  Files         148      146        -2     

  Lines      164960   159843     -5117     

===========================================

- Hits       146871     3989   -142882     

- Misses      18089   155854   +137765     
Flag Coverage Δ
huge-clang-none ?
huge-gcc-none ?
huge-gcc-testgui ?
huge-gcc-unittests 2.49% <42.85%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/mouse.c 0.00% <0.00%> (-87.73%) ⬇️
src/screen.c 2.99% <50.00%> (-83.02%) ⬇️
src/sha256.c 0.00% <0.00%> (-97.96%) ⬇️
src/digraph.c 0.00% <0.00%> (-97.78%) ⬇️
src/gui_gtk_f.c 0.00% <0.00%> (-97.54%) ⬇️
src/crypt_zip.c 0.00% <0.00%> (-97.06%) ⬇️
src/evalbuffer.c 0.00% <0.00%> (-96.81%) ⬇️
src/debugger.c 0.00% <0.00%> (-96.62%) ⬇️
src/libvterm/src/rect.h 0.00% <0.00%> (-96.56%) ⬇️
src/cmdhist.c 0.00% <0.00%> (-96.07%) ⬇️
... and 136 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 333bd56...32091b2. Read the comment docs.

Bram Moolenaar

unread,
Feb 17, 2021, 7:14:54 AM2/17/21
to vim/vim, Subscribed

Closed #7860 via 3aca5a6.

Nick Jensen

unread,
Feb 17, 2021, 4:51:00 PM2/17/21
to vim/vim, Subscribed

Unfortunately, this does not work with multi-byte characters, which is the only real use-case I can see for the feature. If I try with the example given in the neovim PR (set fillchars+=foldopen:▾,foldsep:│,foldclose:▸), terminal vim displays � for the foldopen and foldclose characters, and nothing for the foldsep char.

vim -Nu NONE -S <(cat <<'EOF'

    set fillchars+=foldopen:▾,foldsep:│,foldclose:▸

    set foldmethod=marker foldcolumn=3 foldlevel=1

    setf vim

EOF

) <(cat <<'EOF'

    " a: {{{

    " b: {{{

    " }}}

    " }}}

EOF

)

Displays the following in termite:
screenshot-2021-02-18_104225

And in xterm:
screenshot-2021-02-18_104801

I am testing in linux, I don't have the environment to build on windows but can test a nightly release when it becomes available.

Yegappan Lakshmanan

unread,
Feb 19, 2021, 12:07:50 PM2/19/21
to vim/vim, Subscribed

Currently multibyte character is not supported for the foldopen, foldclose and foldsep items in
the 'fillchars' option. I will look into porting that support from NeoVim.

Yegappan Lakshmanan

unread,
Mar 3, 2021, 11:12:32 AM3/3/21
to vim_dev, reply+ACY5DGAVZ2T5MDTXVA...@reply.github.com, vim/vim, Subscribed
Hi,

On Wed, Feb 17, 2021 at 1:50 PM Nick Jensen <vim-dev...@256bit.org> wrote:

Unfortunately, this does not work with multi-byte characters, which is the only real use-case I can see for the feature. If I try with the example given in the neovim PR (set fillchars+=foldopen:▾,foldsep:│,foldclose:▸), terminal vim displays � for the foldopen and foldclose characters, and nothing for the foldsep char.

I am testing in linux, I don't have the environment to build on windows but can test a nightly release when it becomes available.



The support for using multibyte characters for 'foldopen', 'foldclose' and
'foldsep' items in 'fillchars' has now been added (8.2.2563).
Can you try the latest build?

Thanks,
Yegappan

vim-dev ML

unread,
Mar 3, 2021, 11:12:52 AM3/3/21
to vim/vim, vim-dev ML, Your activity

Hi,

On Wed, Feb 17, 2021 at 1:50 PM Nick Jensen <vim-dev...@256bit.org>
wrote:

> Unfortunately, this does not work with multi-byte characters, which is the
> only real use-case I can see for the feature. If I try with the example
> given in the neovim PR (set fillchars+=foldopen:▾,foldsep:│,foldclose:▸),
> terminal vim displays � for the foldopen and foldclose characters, and
> nothing for the foldsep char.
>
> I am testing in linux, I don't have the environment to build on windows but can test a nightly release <https://github.com/vim/vim-win32-installer/releases> when it becomes available.

>
>
>
The support for using multibyte characters for 'foldopen', 'foldclose' and
'foldsep' items in 'fillchars' has now been added (8.2.2563).
Can you try the latest build?

Thanks,
Yegappan

Nick Jensen

unread,
Mar 3, 2021, 3:44:22 PM3/3/21
to vim/vim, vim-dev ML, Comment

screenshot-2021-03-04_094318

Looks great! Thanks Yegappan ❤️


You are receiving this because you commented.

Reply all
Reply to author
Forward
0 new messages