Wrong display with 'smoothscroll' when emptying quickfix list

Problem: Wrong display with 'smoothscroll' when emptying quickfix list. Solution: Reset w_skipcol when w_topline is changed.
vim · May 8, 2024 · d337559 · d337559
1 parent fb74575
commit d337559
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 8 deletions.
diff --git a/src/autocmd.c b/src/autocmd.c
@@ -2393,7 +2393,7 @@ apply_autocmds_group(
 	// values are saved, restored by reset_lnums().  When nested only the
 	// values are corrected when needed.
 	if (nesting == 1)
-	    check_lnums(TRUE);
+	    check_lnums(TRUE, FALSE);
 	else
 	    check_lnums_nested(TRUE);
 

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
@@ -3200,7 +3200,7 @@ do_ecmd(
     }
 
     // Check if cursors in other windows on the same buffer are still valid
-    check_lnums(FALSE);
+    check_lnums(FALSE, TRUE);
 
     /*
      * Did not read the file, need to show some info about the file.

diff --git a/src/move.c b/src/move.c
@@ -319,6 +319,7 @@ update_topline(void)
 	    redraw_later(UPD_NOT_VALID);
 	curwin->w_topline = 1;
 	curwin->w_botline = 2;
+	curwin->w_skipcol = 0;
 	curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
 	curwin->w_scbind_pos = 1;
     }

diff --git a/src/proto/window.pro b/src/proto/window.pro
@@ -90,7 +90,7 @@ int tabline_height(void);
 int last_stl_height(int morewin);
 int min_rows(void);
 int only_one_window(void);
-void check_lnums(int do_curwin);
+void check_lnums(int do_curwin, int adjust_skipcol);
 void check_lnums_nested(int do_curwin);
 void reset_lnums(void);
 int make_snapshot(int idx);

diff --git a/src/quickfix.c b/src/quickfix.c
@@ -4952,7 +4952,7 @@ qf_fill_buffer(qf_list_T *qfl, buf_T *buf, qfline_T *old_last, int qf_winid)
     }
 
     // correct cursor position
-    check_lnums(TRUE);
+    check_lnums(TRUE, TRUE);
 
     if (old_last == NULL)
     {

diff --git a/src/testdir/dumps/Test_smoothscroll_in_qf_window_1.dump b/src/testdir/dumps/Test_smoothscroll_in_qf_window_1.dump
@@ -0,0 +1,20 @@
+> +0&#ffffff0@59
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|[+3#0000000&|N|o| |N|a|m|e|]| @50
+|<+0#4040ff13&@2| +0#af5f00255&|2+0#0000000&|1| |2@1| |2|3| |2|4| |2|5| |2|6| |2|7| |2|8| |2|9| @29
+| +0#af5f00255&@1|8| ||+0#0000000&@1| |0| |1| |2| |3| |4| |5| |6| |7| |8| |9| |1|0| |1@1| |1|2| |1|3| |1|4| |1|5| |1|6| |1|7| |1|8| |1|9| |2|0| 
+| +0#af5f00255&@3|2+0#0000000&|1| |2@1| |2|3| |2|4| |2|5| |2|6| |2|7| |2|8| |2|9| @29
+| +0#af5f00255&@1|9| ||+0#0000000&@1| |0| |1| |2| |3| |4| |5| |6| |7| |8| |9| |1|0| |1@1| |1|2| |1|3| |1|4| |1|5| |1|6| |1|7| |1|8| |1|9| |2|0| 
+| +0#af5f00255&@3|2+0#0000000&|1| |2@1| |2|3| |2|4| |2|5| |2|6| |2|7| |2|8| |2|9| @29
+| +0#af5f00255&|1|0| ||+0#0000000&@1| |0| |1| |2| |3| |4| |5| |6| |7| |8| |9| |1|0| |1@1| |1|2| |1|3| |1|4| |1|5| |1|6| |1|7| |1|8| |1|9| |2|0| 
+| +0#af5f00255&@3|2+0#0000000&|1| |2@1| |2|3| |2|4| |2|5| |2|6| |2|7| |2|8| |2|9| @29
+| +0#af5f00255&|1@1| ||+0#0000000&@1| |0| |1| |2| |3| |4| |5| |6| |7| |8| |9| |1|0| |1@1| |1|2| |1|3| |1|4| |1|5| |1|6| |1|7| |1|8| |1|9| |2|0| 
+| +0#af5f00255&@3|2+0#0000000&|1| |2@1| |2|3| |2|4| |2|5| |2|6| |2|7| |2|8| |2|9| @29
+| +0#af5f00255&|1|2| ||+0#0000000&@1| |b|a|r| @49
+|[+1&&|Q|u|i|c|k|f|i|x| |L|i|s|t|]| @44
+| +0&&@59
diff --git a/src/testdir/dumps/Test_smoothscroll_in_qf_window_2.dump b/src/testdir/dumps/Test_smoothscroll_in_qf_window_2.dump
@@ -0,0 +1,20 @@
+> +0&#ffffff0@59
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|[+3#0000000&|N|o| |N|a|m|e|]| @50
+| +0#af5f00255&@1|1| | +0#0000000&@55
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|[+1#0000000&|Q|u|i|c|k|f|i|x| |L|i|s|t|]| @44
+|:+0&&|c|a|l@1| |s|e|t|q|f|l|i|s|t|(|[|]|,| |'|r|'|)| @35
diff --git a/src/testdir/dumps/Test_smoothscroll_in_qf_window_3.dump b/src/testdir/dumps/Test_smoothscroll_in_qf_window_3.dump
@@ -0,0 +1,20 @@
+> +0&#ffffff0@59
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|[+3#0000000&|N|o| |N|a|m|e|]| @50
+| +0#af5f00255&@1|1| ||+0#0000000#ffff4012@1| |f|o@1| @49
+| +0#af5f00255#ffffff0@1|2| ||+0#0000000&@1| |0| |1| |2| |3| |4| |5| |6| |7| |8| |9| |1|0| |1@1| |1|2| |1|3| |1|4| |1|5| |1|6| |1|7| |1|8| |1|9| |2|0| 
+| +0#af5f00255&@3|2+0#0000000&|1| |2@1| |2|3| |2|4| |2|5| |2|6| |2|7| |2|8| |2|9| @29
+| +0#af5f00255&@1|3| ||+0#0000000&@1| |0| |1| |2| |3| |4| |5| |6| |7| |8| |9| |1|0| |1@1| |1|2| |1|3| |1|4| |1|5| |1|6| |1|7| |1|8| |1|9| |2|0| 
+| +0#af5f00255&@3|2+0#0000000&|1| |2@1| |2|3| |2|4| |2|5| |2|6| |2|7| |2|8| |2|9| @29
+| +0#af5f00255&@1|4| ||+0#0000000&@1| |0| |1| |2| |3| |4| |5| |6| |7| |8| |9| |1|0| |1@1| |1|2| |1|3| |1|4| |1|5| |1|6| |1|7| |1|8| |1|9| |2|0| 
+| +0#af5f00255&@3|2+0#0000000&|1| |2@1| |2|3| |2|4| |2|5| |2|6| |2|7| |2|8| |2|9| @29
+| +0#af5f00255&@1|5| ||+0#0000000&@1| |0| |1| |2| |3| |4| |5| |6| |7| |8| |9| |1|0| |1@1| |1|2| |1|3| |1|4| |1|5| |1|6| |1|7| |1|8| |1|9| |2|0| 
+| +0#af5f00255&@3|2+0#0000000&|1| |2@1| |2|3| |2|4| |2|5| |2|6| |2|7| |2|8| |2|9| @29
+| +0#af5f00255&@1|6| ||+0#0000000&@1| |0| |1| |2| |3| |4| |5| |6| |7| |8| |9| |1|0| |1@1| |1|2| |1|3| |1|4| |1|5| |1|6| |1|7| |1|8| |1|9| |@+0#4040ff13&@2
+|[+1#0000000&|Q|u|i|c|k|f|i|x| |L|i|s|t|]| @44
+|:+0&&|c|a|l@1| |s|e|t|q|f|l|i|s|t|(|g|:|l|,| |'|r|'|)| @34
diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim
@@ -961,6 +961,33 @@ func Test_smoothscroll_insert_bottom()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_smoothscroll_in_qf_window()
+  CheckScreendump
+
+  let lines =<< trim END
+    set nocompatible display=lastline
+    copen
+    setlocal number smoothscroll
+    let g:l = [{'text': 'foo'}]
+          \ + repeat([{'text': join(range(30))}], 10)
+          \ + [{'text': 'bar'}]
+    call setqflist(g:l, 'r')
+    normal! G
+    wincmd t
+  END
+  call writefile(lines, 'XSmoothScrollInQfWindow', 'D')
+  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollInQfWindow', #{rows: 20, cols: 60})
+  call VerifyScreenDump(buf, 'Test_smoothscroll_in_qf_window_1', {})
+
+  call term_sendkeys(buf, ":call setqflist([], 'r')\<CR>")
+  call VerifyScreenDump(buf, 'Test_smoothscroll_in_qf_window_2', {})
+
+  call term_sendkeys(buf, ":call setqflist(g:l, 'r')\<CR>")
+  call VerifyScreenDump(buf, 'Test_smoothscroll_in_qf_window_3', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
 func Test_smoothscroll_in_zero_width_window()
   set cpo+=n number smoothscroll
   set winwidth=99999 winminwidth=0

diff --git a/src/window.c b/src/window.c
@@ -7540,7 +7540,7 @@ only_one_window(void)
  * Implementation of check_lnums() and check_lnums_nested().
  */
     static void
-check_lnums_both(int do_curwin, int nested)
+check_lnums_both(int do_curwin, int nested, int adjust_skipcol)
 {
     win_T	*wp;
     tabpage_T	*tp;
@@ -7566,7 +7566,11 @@ check_lnums_both(int do_curwin, int nested)
 
 	    need_adjust = wp->w_topline > curbuf->b_ml.ml_line_count;
 	    if (need_adjust)
+	    {
 		wp->w_topline = curbuf->b_ml.ml_line_count;
+		if (adjust_skipcol)
+		    wp->w_skipcol = 0;
+	    }
 	    if (need_adjust || !nested)
 		// save the (corrected) topline
 		wp->w_save_cursor.w_topline_corr = wp->w_topline;
@@ -7577,11 +7581,12 @@ check_lnums_both(int do_curwin, int nested)
  * Correct the cursor line number in other windows.  Used after changing the
  * current buffer, and before applying autocommands.
  * When "do_curwin" is TRUE, also check current window.
+ * When "adjust_skipcol" is TRUE, reset w_skipcol if w_topline changes.
  */
     void
-check_lnums(int do_curwin)
+check_lnums(int do_curwin, int adjust_skipcol)
 {
-    check_lnums_both(do_curwin, FALSE);
+    check_lnums_both(do_curwin, FALSE, adjust_skipcol);
 }
 
 /*
@@ -7590,7 +7595,7 @@ check_lnums(int do_curwin)
     void
 check_lnums_nested(int do_curwin)
 {
-    check_lnums_both(do_curwin, TRUE);
+    check_lnums_both(do_curwin, TRUE, FALSE);
 }
 
 /*