diff options
| author | altermo <107814000+altermo@users.noreply.github.com> | 2024-07-16 05:09:24 +0200 |
|---|---|---|
| committer | Lewis Russell <me@lewisr.dev> | 2024-07-16 08:11:26 +0100 |
| commit | 25db0a1385377ec28fd6e4ca3553c79ce5cb80e4 (patch) | |
| tree | a23999d8500a5f11eb6a842a73320a7b98092662 | |
| parent | 598fd77d952364d4dd3433425afe9798dac15206 (diff) | |
| download | rneovim-25db0a1385377ec28fd6e4ca3553c79ce5cb80e4.tar.gz rneovim-25db0a1385377ec28fd6e4ca3553c79ce5cb80e4.tar.bz2 rneovim-25db0a1385377ec28fd6e4ca3553c79ce5cb80e4.zip | |
fix(tohtml): extmark text may be out of bounds
| -rw-r--r-- | runtime/lua/tohtml.lua | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/runtime/lua/tohtml.lua b/runtime/lua/tohtml.lua index 37ad60b436..7bb4a26ad6 100644 --- a/runtime/lua/tohtml.lua +++ b/runtime/lua/tohtml.lua @@ -519,9 +519,12 @@ local function _styletable_extmarks_virt_text(state, extmark, namespaces) --- @type integer,integer local row, col = extmark[2], extmark[3] if - extmark[4].virt_text_pos == 'inline' - or extmark[4].virt_text_pos == 'eol' - or extmark[4].virt_text_pos == 'overlay' + row < state.buflen + and ( + extmark[4].virt_text_pos == 'inline' + or extmark[4].virt_text_pos == 'eol' + or extmark[4].virt_text_pos == 'overlay' + ) then if extmark[4].virt_text_pos == 'eol' then style_line_insert_virt_text(styletable[row + 1], #vim.fn.getline(row + 1) + 1, { ' ' }) @@ -1144,7 +1147,13 @@ local function extend_pre(out, state) local line = vim.api.nvim_buf_get_lines(state.bufnr, row - 1, row, false)[1] or '' local s = '' s = s .. _pre_text_to_html(state, row) - for col = 1, #line + 1 do + local true_line_len = #line + 1 + for k in pairs(style_line) do + if type(k) == 'number' and k > true_line_len then + true_line_len = k + end + end + for col = 1, true_line_len do local cell = style_line[col] --- @type table? local char @@ -1191,7 +1200,7 @@ local function extend_pre(out, state) char = cell[4][#cell[4]] end - if col == #line + 1 and not char then + if col == true_line_len and not char then break end |