neovim

commit f34b849a22044874d8be0afe7fd455e45246740e
parent bc96bda5a2d69d995f193297fd25ec4ef7c1b97e
Author: bfredl <bjorn.linse@gmail.com>
Date:   Mon,  3 Apr 2023 16:02:44 +0200

Merge pull request #22847 from luukvbaal/redrstatus

fix(ui): ruler is not redrawn in cmdline with redrawstatus
Diffstat:
M
runtime/doc/various.txt
 | 
3
++-
M
src/nvim/drawscreen.c
 | 
5
+++++
M
test/functional/ui/statusline_spec.lua
 | 
17
+++++++++++++++++

3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
@@ -32,7 +32,8 @@ CTRL-L			Clears and redraws the screen.  The redraw may happen
 						*:redraws* *:redrawstatus*
 :redraws[tatus][!]	Redraws the status line and window bar of the current
 			window, or all status lines and window bars if "!" is
-			included. Useful if 'statusline' or 'winbar' includes
+			included. Redraws the commandline instead if it contains
+			the 'ruler'. Useful if 'statusline' or 'winbar' includes
 			an item that doesn't cause automatic updating.
 
 						*:redrawt* *:redrawtabline*
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
@@ -2683,6 +2683,11 @@ void status_redraw_buf(buf_T *buf)
       redraw_later(wp, UPD_VALID);
     }
   }
+  // Redraw the ruler if it is in the command line and was not marked for redraw above
+  if (p_ru && !curwin->w_status_height && !curwin->w_redr_status) {
+    redraw_cmdline = true;
+    redraw_later(curwin, UPD_VALID);
+  }
 }
 
 /// Redraw all status lines that need to be redrawn.
diff --git a/test/functional/ui/statusline_spec.lua b/test/functional/ui/statusline_spec.lua
@@ -636,3 +636,20 @@ it('statusline is redrawn on recording state change #22683', function()
     recording @Q                            |
   ]])
 end)
+
+it('ruler is redrawn in cmdline with redrawstatus #22804', function()
+  clear()
+  local screen = Screen.new(40, 2)
+  screen:attach()
+  command([[
+    let g:n = 'initial value'
+    set ls=1 ru ruf=%{g:n}
+    redraw
+    let g:n = 'other value'
+    redrawstatus
+  ]])
+  screen:expect([[
+    ^                                        |
+                          other value       |
+  ]])
+end)