[vim/vim] Fix color column position when 'linebreak' is set (PR #17477)
Matthias
As reported in #16837 the 'colorcolumn' option does not behave as
expected, when the 'linebreak' option is set. Instead of always
highlighting the same character independent of the window's width, the
highlighted character changes with changing window sizes.
Furthermore, the color column ignored the inserted "virtual text" that
comes with the 'showbreak' option. This resulted in the color column
possibly highlighting the text inserted by the 'showbreak' option
instead of actual, user inserted text. Now, this "virtual text" is
ignored when determining the color column's position.
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/17477
Commit Summary
- 8b068a1 Fix `colorcolumn` when `linebreak` is on
- be04aa0 Fix color column for leading tabs
- ee2e6eb Fix `linebreak` + `colorcolumn` edge case
- f76e1d0 Fix showbreak and cursorcolumn
File Changes
(1 file)
- M src/drawline.c (49)
Patch Links:
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Matthias
matrdr left a comment (vim/vim#17477)I still need to add at least one new test, fix the old tests and touch up the code a bit. So, please do not merge yet.
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Matthias
@matrdr pushed 1 commit.
- f1642f8 Change expected 'conceal' test results
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maxim Kim
habamax left a comment (vim/vim#17477)Could you show a screenshot with several long lines (~200 chars) and set colorcolumn=20,40,60,80,100,120?
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Maxim Kim
habamax left a comment (vim/vim#17477)oh, nevermind I see what you try to fix now!
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
chrisbra left a comment (vim/vim#17477)converting to draft for now. Thanks
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Matthias
@matrdr pushed 6 commits.
- 5712911 Fix `colorcolumn` when `linebreak` is on
- 1fa3429 Fix color column for leading tabs
- b291fcd Fix `linebreak` + `colorcolumn` edge case
- 9d20f13 Fix showbreak and cursorcolumn
- 7537365 Change expected 'conceal' test results
- 74763a7 Change expectation in color column test
You are receiving this because you are subscribed to this thread.
Matthias
@matrdr pushed 6 commits.
- 05adff9 Fix `colorcolumn` when `linebreak` is on
- ad3c26d Fix color column for leading tabs
- aa8a928 Fix `linebreak` + `colorcolumn` edge case
- 6499a35 Fix showbreak and cursorcolumn
- 0312275 Change expected 'conceal' test results
- 5008cf0 Change expectation in color column test
You are receiving this because you are subscribed to this thread.
Matthias
@matrdr pushed 6 commits.
- 36fffda Fix `colorcolumn` when `linebreak` is on
- 50442da Fix color column for leading tabs
- 2796a81 Fix `linebreak` + `colorcolumn` edge case
- 36edd39 Fix showbreak and cursorcolumn
- d67c08a Change expected 'conceal' test results
- 8e2b16e Change expectation in color column test
You are receiving this because you are subscribed to this thread.
Matthias
matrdr left a comment (vim/vim#17477)Getting back to this PR again. It seems like I need to change a few existing test cases, as their behaviour does not match the one I would expect. For example, the test case Test_colorcolumn_sbr expects the color columns to be on the showbreak characters, as seen in the upper output. With this fix, the behaviour is the one seen in the lower output, which I think is more in line with how a color column shall work, when the line is wrapped.
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Matthias
@matrdr pushed 9 commits.
- 5a3015a Fix `colorcolumn` when `linebreak` is on
- b4cc11f Fix color column for leading tabs
- 5980809 Fix `linebreak` + `colorcolumn` edge case
- 04ab76c Fix showbreak and cursorcolumn
- 9fc85bb Change expected 'conceal' test results
- 005d3bc Change expectation in color column test
- 1812524 Fix showbreak text being "colorcolumned"
- 50bf0cb Fix indentation
- 2e60952 Change expected result in colorcolumn test case
You are receiving this because you are subscribed to this thread.
Christian Brabandt
chrisbra left a comment (vim/vim#17477)this has stalled, so closing
—
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.