diff options
| author | bfredl <bjorn.linse@gmail.com> | 2022-03-06 14:09:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-06 14:09:01 +0100 |
| commit | 72a04bda90ddb1a333727926f74d0721a7fb45e7 (patch) | |
| tree | e6b77c87115314f4f92899e207b5fda6d8c549bf /src/nvim/buffer.c | |
| parent | 8ed9c84481a7d0df0708d11ffa538f832591240f (diff) | |
| parent | 30e4cc3b3f2133e9a7170da9da8175832681f39a (diff) | |
| download | rneovim-72a04bda90ddb1a333727926f74d0721a7fb45e7.tar.gz rneovim-72a04bda90ddb1a333727926f74d0721a7fb45e7.tar.bz2 rneovim-72a04bda90ddb1a333727926f74d0721a7fb45e7.zip | |
Merge pull request #16897 from lewis6991/signs
feat(decorations): support signs
Diffstat (limited to 'src/nvim/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 9e82b4e80b..084e18c6cb 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -36,6 +36,7 @@ #include "nvim/cursor.h" #include "nvim/diff.h" #include "nvim/digraph.h" +#include "nvim/decoration.h" #include "nvim/eval.h" #include "nvim/ex_cmds.h" #include "nvim/ex_cmds2.h" @@ -5469,6 +5470,11 @@ static int buf_signcols_inner(buf_T *buf, int maximum) FOR_ALL_SIGNS_IN_BUF(buf, sign) { if (sign->se_lnum > curline) { + // Counted all signs, now add extmark signs + if (curline > 0) { + linesum += decor_signcols(buf, &decor_state, (int)curline-1, (int)curline-1, + maximum-linesum); + } if (linesum > signcols) { signcols = linesum; if (signcols >= maximum) { @@ -5483,6 +5489,19 @@ static int buf_signcols_inner(buf_T *buf, int maximum) } } + if (curline > 0) { + linesum += decor_signcols(buf, &decor_state, (int)curline-1, (int)curline-1, maximum-linesum); + } + if (linesum > signcols) { + signcols = linesum; + if (signcols >= maximum) { + return maximum; + } + } + + // Check extmarks between signs + linesum = decor_signcols(buf, &decor_state, 0, (int)buf->b_ml.ml_line_count-1, maximum); + if (linesum > signcols) { signcols = linesum; if (signcols >= maximum) { |