[vim/vim] Fix concealed text wrapping at conceallevel 3 (PR #20472)

1 view

Skip to first unread message

Samuel Roeca

unread,

10:35 AM (3 hours ago) 10:35 AM

to vim/vim, Subscribed

Add regression coverage for concealed text that starts before the wrap column.

Caveat: I verified the logic and local tests on this Linux build, not Windows gvim specifically. The affected draw/redraw code path is shared, so this is still appropriate to mark as fixing #9443.

Known follow-up: screenline movement can still account for hidden columns. For example, with a long concealed prefix at 'conceallevel' 3, gj/gk may move through positions in the concealed text before reaching the next visible buffer line, even though the line no longer appears visually wrapped. I did not verify whether that behavior predates this PR, but it is separate from the wrapping/rendering bug fixed here.

This PR was prepared with assistance from OpenAI Codex.

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

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

Commit Summary

a9f0ddb Fix concealed text wrapping at conceallevel 3

File Changes

(5 files)

M src/drawline.c (3)
M src/screen.c (3)
M src/testdir/dumps/Test_conceal_double_width_wrap_3.dump (4)
M src/testdir/dumps/Test_conceal_double_width_wrap_4.dump (4)
M src/testdir/test_conceal.vim (39)

Patch Links:

—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.

zeertzjq

unread,

10:46 AM (3 hours ago) 10:46 AM

to vim/vim, Subscribed

zeertzjq left a comment (vim/vim#20472)