From eb6e5d09910dc80932f91135f83957bd96efc3a9 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 20 Feb 2022 17:34:10 +0000
Subject: [PATCH] refactor(signcol): store signcol in win_T

---
 src/nvim/buffer_defs.h |  1 +
 src/nvim/screen.c      | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 5d4f8d112c..1e0c837056 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -1354,6 +1354,7 @@ struct window_S {
                                     // recomputed
   int w_nrwidth;                    // width of 'number' and 'relativenumber'
                                     // column being used
+  int w_scwidth;                    // width of 'signcolumn'
 
   /*
    * === end of cached values ===
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 15fb6901cc..dcc4722b0d 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -794,7 +794,7 @@ static void win_update(win_T *wp, Providers *providers)
   // If we can compute a change in the automatic sizing of the sign column
   // under 'signcolumn=auto:X' and signs currently placed in the buffer, better
   // figuring it out here so we can redraw the entire screen for it.
-  win_signcol_count(wp);
+  wp->w_scwidth = win_signcol_count(wp);
 
   type = wp->w_redr_type;
 
@@ -1846,7 +1846,7 @@ static void win_draw_end(win_T *wp, int c1, int c2, bool draw_margin, int row, i
                        win_hl_attr(wp, HLF_FC));
     }
     // draw the sign column
-    int count = win_signcol_count(wp);
+    int count = wp->w_scwidth;
     if (count > 0) {
       n = win_fill_end(wp, ' ', ' ', n, win_signcol_width(wp) * count, row,
                        endrow, win_hl_attr(wp, HLF_SC));
@@ -2792,10 +2792,9 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
         draw_state = WL_SIGN;
         /* Show the sign column when there are any signs in this
          * buffer or when using Netbeans. */
-        int count = win_signcol_count(wp);
-        if (count > 0) {
+        if (wp->w_scwidth > 0) {
           get_sign_display_info(false, wp, lnum, sattrs, row,
-                                startrow, filler_lines, filler_todo, count,
+                                startrow, filler_lines, filler_todo,
                                 &c_extra, &c_final, extra, sizeof(extra),
                                 &p_extra, &n_extra,
                                 &char_attr, &draw_state, &sign_idx);
@@ -2814,9 +2813,8 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
           // number.
           if (*wp->w_p_scl == 'n' && *(wp->w_p_scl + 1) == 'u'
               && num_signs > 0 && sign_get_attr(SIGN_TEXT, sattrs, 0, 1)) {
-            int count = win_signcol_count(wp);
             get_sign_display_info(true, wp, lnum, sattrs, row,
-                                  startrow, filler_lines, filler_todo, count,
+                                  startrow, filler_lines, filler_todo,
                                   &c_extra, &c_final, extra, sizeof(extra),
                                   &p_extra, &n_extra,
                                   &char_attr, &draw_state, &sign_idx);
@@ -4674,10 +4672,11 @@ static bool use_cursor_line_sign(win_T *wp, linenr_T lnum)
 // @param[in, out] sign_idxp Index of the displayed sign
 static void get_sign_display_info(bool nrcol, win_T *wp, linenr_T lnum, sign_attrs_T sattrs[],
                                   int row, int startrow, int filler_lines, int filler_todo,
-                                  int count, int *c_extrap, int *c_finalp, char_u *extra,
+                                  int *c_extrap, int *c_finalp, char_u *extra,
                                   size_t extra_size, char_u **pp_extra, int *n_extrap,
                                   int *char_attrp, int *draw_statep, int *sign_idxp)
 {
+  int count = wp->w_scwidth;
   // Draw cells with the sign value or blank.
   *c_extrap = ' ';
   *c_finalp = NUL;