diff options
| -rw-r--r-- | src/nvim/drawline.c | 6 | ||||
| -rw-r--r-- | test/functional/ui/decorations_spec.lua | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index f25da1794c..0988f668d5 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -914,10 +914,10 @@ static void handle_inline_virtual_text(win_T *wp, winlinevars_T *wlv, ptrdiff_t int cells_to_skip = wlv->skip_cells; // Skip cells in the text. while (cells_to_skip > 0) { - int clen = utf_ptr2len(wlv->p_extra); + int c_len = utfc_ptr2len(wlv->p_extra); cells_to_skip -= utf_ptr2cells(wlv->p_extra); - wlv->p_extra += clen; - wlv->n_extra -= clen; + wlv->p_extra += c_len; + wlv->n_extra -= c_len; wlv->n_attr--; } // If a double-width char doesn't fit, pad with space. diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua index fb2e6ea65f..2f83e7b97a 100644 --- a/test/functional/ui/decorations_spec.lua +++ b/test/functional/ui/decorations_spec.lua @@ -3379,59 +3379,59 @@ describe('decorations: inline virtual text', function() insert('12345678') command('set nowrap') api.nvim_buf_set_extmark(0, ns, 0, 2, { - virt_text = { { 'αβγ口=', 'Special' }, { '口', 'Special' } }, + virt_text = { { 'αβ̳γ̲口=', 'Special' }, { '❤️', 'Special' } }, virt_text_pos = 'inline', }) screen:expect([[ - 12{10:αβγ口=口}34567^8 | + 12{10:αβ̳γ̲口=❤️}34567^8 | {1:~ }| | ]]) feed('zl') screen:expect([[ - 2{10:αβγ口=口}34567^8 | + 2{10:αβ̳γ̲口=❤️}34567^8 | {1:~ }| | ]]) feed('zl') screen:expect([[ - {10:αβγ口=口}34567^8 | + {10:αβ̳γ̲口=❤️}34567^8 | {1:~ }| | ]]) feed('zl') screen:expect([[ - {10:βγ口=口}34567^8 | + {10:β̳γ̲口=❤️}34567^8 | {1:~ }| | ]]) feed('zl') screen:expect([[ - {10:γ口=口}34567^8 | + {10:γ̲口=❤️}34567^8 | {1:~ }| | ]]) feed('zl') screen:expect([[ - {10:口=口}34567^8 | + {10:口=❤️}34567^8 | {1:~ }| | ]]) feed('zl') screen:expect([[ - {10: =口}34567^8 | + {10: =❤️}34567^8 | {1:~ }| | ]]) feed('zl') screen:expect([[ - {10:=口}34567^8 | + {10:=❤️}34567^8 | {1:~ }| | ]]) feed('zl') screen:expect([[ - {10:口}34567^8 | + {10:❤️}34567^8 | {1:~ }| | ]]) |