From 9f15a18fa57f540cb3d0d9d2f45d872038e6f990 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 31 Jan 2024 08:48:52 +0800
Subject: [PATCH] fix(statusline): missing offset when showing 'keymap'
 (#27270)

---
 src/nvim/statusline.c                  | 16 ++++----
 test/functional/ui/statusline_spec.lua | 55 ++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/src/nvim/statusline.c b/src/nvim/statusline.c
index dac3354f90..f79e829a7f 100644
--- a/src/nvim/statusline.c
+++ b/src/nvim/statusline.c
@@ -151,14 +151,14 @@ void win_redr_status(win_T *wp)
     }
 
     grid_line_start(&default_grid, is_stl_global ? (Rows - (int)p_ch - 1) : W_ENDROW(wp));
-    int col = is_stl_global ? 0 : wp->w_wincol;
+    const int off = is_stl_global ? 0 : wp->w_wincol;
 
-    int width = grid_line_puts(col, p, -1, attr);
-    grid_line_fill(width + col, this_ru_col + col, fillchar, attr);
+    int width = grid_line_puts(off, p, -1, attr);
+    grid_line_fill(off + width, off + this_ru_col, fillchar, attr);
 
     if (get_keymap_str(wp, "<%s>", NameBuff, MAXPATHL)
-        && this_ru_col - len > (int)(strlen(NameBuff) + 1)) {
-      grid_line_puts((int)((size_t)this_ru_col - strlen(NameBuff) - 1), NameBuff, -1, attr);
+        && this_ru_col - len > (int)strlen(NameBuff) + 1) {
+      grid_line_puts(off + this_ru_col - (int)strlen(NameBuff) - 1, NameBuff, -1, attr);
     }
 
     win_redr_ruler(wp);
@@ -168,7 +168,7 @@ void win_redr_status(win_T *wp)
       const int sc_width = MIN(10, this_ru_col - len - 2);
 
       if (sc_width > 0) {
-        grid_line_puts(wp->w_wincol + this_ru_col - sc_width - 1, showcmd_buf, sc_width, attr);
+        grid_line_puts(off + this_ru_col - sc_width - 1, showcmd_buf, sc_width, attr);
       }
     }
 
@@ -615,8 +615,8 @@ void win_redr_ruler(win_T *wp)
       }
     }
 
-    int w = grid_line_puts(this_ru_col + off, buffer, -1, attr);
-    grid_line_fill(this_ru_col + off + w, off + width, fillchar, attr);
+    int w = grid_line_puts(off + this_ru_col, buffer, -1, attr);
+    grid_line_fill(off + this_ru_col + w, off + width, fillchar, attr);
   }
 }
 
diff --git a/test/functional/ui/statusline_spec.lua b/test/functional/ui/statusline_spec.lua
index 711e056376..fee4b64d44 100644
--- a/test/functional/ui/statusline_spec.lua
+++ b/test/functional/ui/statusline_spec.lua
@@ -720,3 +720,58 @@ it('uses "stl" and "stlnc" fillchars even if they are the same #19803', function
   ]],
   }
 end)
+
+it('showcmdloc=statusline works with vertical splits', function()
+  clear()
+  local screen = Screen.new(53, 4)
+  screen:set_default_attr_ids {
+    [1] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
+    [2] = { bold = true, reverse = true }, -- StatusLine
+    [3] = { reverse = true }, -- StatusLineNC
+  }
+  screen:attach()
+  command('rightbelow vsplit')
+  command('set showcmd showcmdloc=statusline')
+  feed('1234')
+  screen:expect([[
+                              │^                          |
+    {1:~                         }│{1:~                         }|
+    {3:[No Name]                  }{2:[No Name]      1234       }|
+                                                         |
+  ]])
+  feed('<Esc>')
+  command('set laststatus=3')
+  feed('1234')
+  screen:expect([[
+                              │^                          |
+    {1:~                         }│{1:~                         }|
+    {2:[No Name]                                 1234       }|
+                                                         |
+  ]])
+end)
+
+it('keymap is shown with vertical splits #27269', function()
+  clear()
+  local screen = Screen.new(53, 4)
+  screen:set_default_attr_ids {
+    [1] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
+    [2] = { bold = true, reverse = true }, -- StatusLine
+    [3] = { reverse = true }, -- StatusLineNC
+  }
+  screen:attach()
+  command('setlocal keymap=dvorak')
+  command('rightbelow vsplit')
+  screen:expect([[
+                              │^                          |
+    {1:~                         }│{1:~                         }|
+    {3:[No Name]         <en-dv>  }{2:[No Name]         <en-dv> }|
+                                                         |
+  ]])
+  command('set laststatus=3')
+  screen:expect([[
+                              │^                          |
+    {1:~                         }│{1:~                         }|
+    {2:[No Name]                                    <en-dv> }|
+                                                         |
+  ]])
+end)