aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer.c
diff options
context:
space:
mode:
authorLewis Russell <lewis6991@gmail.com>2022-02-20 17:26:39 +0000
committerLewis Russell <lewis6991@gmail.com>2022-02-24 22:35:59 +0000
commite67cd22c38493d4dff90f6afa17bfeacd0ba953d (patch)
tree16629d4a7023183adf9d190674f99d027d7ef1e0 /src/nvim/buffer.c
parentfdea15723fab6a3ee96218f13669d9f2e0a6d6d7 (diff)
downloadrneovim-e67cd22c38493d4dff90f6afa17bfeacd0ba953d.tar.gz
rneovim-e67cd22c38493d4dff90f6afa17bfeacd0ba953d.tar.bz2
rneovim-e67cd22c38493d4dff90f6afa17bfeacd0ba953d.zip
fix(signcol): handle edge case with maximum value
50250542 failed to consider that the maximum passed to buf_signcols is window scoped whereas the signcols value is buffer scoped. This can lead to a bug where the signcolumn becomes incorrect if: - global signcolumn is set to auto:N - signcolumn in a window is changed locally to auto:M where M > N - the buffer has a line with M or greater signs.
Diffstat (limited to 'src/nvim/buffer.c')
-rw-r--r--src/nvim/buffer.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index dd40623af2..9e82b4e80b 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -5495,11 +5495,19 @@ static int buf_signcols_inner(buf_T *buf, int maximum)
int buf_signcols(buf_T *buf, int maximum)
{
+ // The maximum can be determined from 'signcolumn' which is window scoped so
+ // need to invalidate signcols if the maximum is greater than the previous
+ // maximum.
+ if (maximum > buf->b_signcols_max) {
+ buf->b_signcols_valid = false;
+ }
+
if (!buf->b_signcols_valid) {
int signcols = buf_signcols_inner(buf, maximum);
// Check if we need to redraw
if (signcols != buf->b_signcols) {
buf->b_signcols = signcols;
+ buf->b_signcols_max = maximum;
redraw_buf_later(buf, NOT_VALID);
}