vim-patch:9.1.0320: Wrong cursor position after using setcellwidths() (#28334)

Problem:  Wrong cursor position after using setcellwidths().
Solution: Invalidate cursor position in addition to redrawing.
          (zeertzjq)

closes: vim/vim#14545

https://github.com/vim/vim/commit/05aacec6ab5c7ed8a13bbdca2f0005d6a1816230

Reorder functions in test_utf8.vim to match upstream.

3 files changed, 71 insertions, 47 deletions

diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index c7a56209e4..a345795bbe 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -59,6 +59,7 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
+#include "nvim/move.h"
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/os.h"
@@ -2878,6 +2879,7 @@ void f_setcellwidths(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
   }
 
   xfree(cw_table_save);
+  changed_window_setting_all();
   redraw_all_later(UPD_NOT_VALID);
 }
 
diff --git a/src/nvim/move.c b/src/nvim/move.c
index 9de86e5aeb..3615959a02 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -546,6 +546,14 @@ void changed_window_setting(win_T *wp)
   redraw_later(wp, UPD_NOT_VALID);
 }
 
+/// Call changed_window_setting() for every window.
+void changed_window_setting_all(void)
+{
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    changed_window_setting(wp);
+  }
+}
+
 // Set wp->w_topline to a certain number.
 void set_topline(win_T *wp, linenr_T lnum)
 {
diff --git a/test/old/testdir/test_utf8.vim b/test/old/testdir/test_utf8.vim
index 920000e2c7..dd7b2c5a09 100644
--- a/test/old/testdir/test_utf8.vim
+++ b/test/old/testdir/test_utf8.vim
@@ -75,53 +75,6 @@ func Test_getvcol()
   call assert_equal(2, virtcol("']"))
 endfunc
 
-func Test_screenchar_utf8()
-  new
-
-  " 1-cell, with composing characters 
-  call setline(1, ["ABC\u0308"])
-  redraw
-  call assert_equal([0x0041], screenchars(1, 1))
-  call assert_equal([0x0042], 1->screenchars(2))
-  call assert_equal([0x0043, 0x0308], screenchars(1, 3))
-  call assert_equal("A", screenstring(1, 1))
-  call assert_equal("B", screenstring(1, 2))
-  call assert_equal("C\u0308", screenstring(1, 3))
-
-  " 1-cell, with 6 composing characters
-  set maxcombine=6
-  call setline(1, ["ABC" .. repeat("\u0308", 6)])
-  redraw
-  call assert_equal([0x0041], screenchars(1, 1))
-  call assert_equal([0x0042], 1->screenchars(2))
-  " This should not use uninitialized memory
-  call assert_equal([0x0043] + repeat([0x0308], 6), screenchars(1, 3))
-  call assert_equal("A", screenstring(1, 1))
-  call assert_equal("B", screenstring(1, 2))
-  call assert_equal("C" .. repeat("\u0308", 6), screenstring(1, 3))
-  set maxcombine&
-
-  " 2-cells, with composing characters
-  let text = "\u3042\u3044\u3046\u3099"
-  call setline(1, text)
-  redraw
-  call assert_equal([0x3042], screenchars(1, 1))
-  call assert_equal([0], screenchars(1, 2))
-  call assert_equal([0x3044], screenchars(1, 3))
-  call assert_equal([0], screenchars(1, 4))
-  call assert_equal([0x3046, 0x3099], screenchars(1, 5))
-
-  call assert_equal("\u3042", screenstring(1, 1))
-  call assert_equal("", screenstring(1, 2))
-  call assert_equal("\u3044", screenstring(1, 3))
-  call assert_equal("", screenstring(1, 4))
-  call assert_equal("\u3046\u3099", screenstring(1, 5))
-
-  call assert_equal([text . '  '], ScreenLines(1, 8))
-
-  bwipe!
-endfunc
-
 func Test_list2str_str2list_utf8()
   " One Unicode codepoint
   let s = "\u3042\u3044"
@@ -169,7 +122,55 @@ func Test_list2str_str2list_latin1()
   call assert_equal(s, sres)
 endfunc
 
+func Test_screenchar_utf8()
+  new
+
+  " 1-cell, with composing characters
+  call setline(1, ["ABC\u0308"])
+  redraw
+  call assert_equal([0x0041], screenchars(1, 1))
+  call assert_equal([0x0042], 1->screenchars(2))
+  call assert_equal([0x0043, 0x0308], screenchars(1, 3))
+  call assert_equal("A", screenstring(1, 1))
+  call assert_equal("B", screenstring(1, 2))
+  call assert_equal("C\u0308", screenstring(1, 3))
+
+  " 1-cell, with 6 composing characters
+  set maxcombine=6
+  call setline(1, ["ABC" .. repeat("\u0308", 6)])
+  redraw
+  call assert_equal([0x0041], screenchars(1, 1))
+  call assert_equal([0x0042], 1->screenchars(2))
+  " This should not use uninitialized memory
+  call assert_equal([0x0043] + repeat([0x0308], 6), screenchars(1, 3))
+  call assert_equal("A", screenstring(1, 1))
+  call assert_equal("B", screenstring(1, 2))
+  call assert_equal("C" .. repeat("\u0308", 6), screenstring(1, 3))
+  set maxcombine&
+
+  " 2-cells, with composing characters
+  let text = "\u3042\u3044\u3046\u3099"
+  call setline(1, text)
+  redraw
+  call assert_equal([0x3042], screenchars(1, 1))
+  call assert_equal([0], screenchars(1, 2))
+  call assert_equal([0x3044], screenchars(1, 3))
+  call assert_equal([0], screenchars(1, 4))
+  call assert_equal([0x3046, 0x3099], screenchars(1, 5))
+
+  call assert_equal("\u3042", screenstring(1, 1))
+  call assert_equal("", screenstring(1, 2))
+  call assert_equal("\u3044", screenstring(1, 3))
+  call assert_equal("", screenstring(1, 4))
+  call assert_equal("\u3046\u3099", screenstring(1, 5))
+
+  call assert_equal([text . '  '], ScreenLines(1, 8))
+
+  bwipe!
+endfunc
+
 func Test_setcellwidths()
+  new
   call setcellwidths([
         \ [0x1330, 0x1330, 2],
         \ [9999, 10000, 1],
@@ -212,6 +213,18 @@ func Test_setcellwidths()
     " Ambiguous width chars
     call assert_equal(2, strwidth("\u00A1"))
     call assert_equal(2, strwidth("\u2010"))
+
+    call setcellwidths([])
+    call setline(1, repeat("\u2103", 10))
+    normal! $
+    redraw
+    call assert_equal((aw == 'single') ? 10 : 19, wincol())
+    call setcellwidths([[0x2103, 0x2103, 1]])
+    redraw
+    call assert_equal(10, wincol())
+    call setcellwidths([[0x2103, 0x2103, 2]])
+    redraw
+    call assert_equal(19, wincol())
   endfor
   set ambiwidth& isprint&
 
@@ -245,6 +258,7 @@ func Test_setcellwidths()
   set listchars&
   set fillchars&
   call setcellwidths([])
+  bwipe!
 endfunc
 
 func Test_getcellwidths()