diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-01-29 10:59:53 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-29 10:59:53 +0000 |
| commit | a0c4e2f2d7aa164d9d7692702c752ea063bd3a8c (patch) | |
| tree | 3537a2b9dd2fe0308c33c23ecfc1fbb3111afc26 | |
| parent | 06f15416bb8d5636200a10776f1752c4d6e49f31 (diff) | |
| download | vim-git-8.2.4248.tar.gz | |
patch 8.2.4248: no proper test for moving the window separatorv8.2.4248
Problem: No proper test for moving the window separator.
Solution: Add a test. Add comment in code. (closes #9656)
| -rw-r--r-- | src/testdir/test_window_cmd.vim | 19 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/window.c | 4 |
3 files changed, 24 insertions, 1 deletions
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim index e04216025..19b4466b9 100644 --- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -1424,6 +1424,12 @@ func Test_win_move_separator() call assert_true(id->win_move_separator(-offset)) call assert_equal(w, winwidth(id)) endfor + " check win_move_separator from right window on right window is no-op + let w0 = winwidth(0) + call assert_true(win_move_separator(0, 1)) + call assert_equal(w0, winwidth(0)) + call assert_true(win_move_separator(0, -1)) + call assert_equal(w0, winwidth(0)) " check that win_move_separator doesn't error with offsets beyond moving " possibility call assert_true(win_move_separator(id, 5000)) @@ -1465,6 +1471,19 @@ func Test_win_move_statusline() call assert_true(win_move_statusline(1, -offset)) call assert_equal(h, winheight(1)) endfor + " check win_move_statusline from bottom window on bottom window + let h0 = winheight(0) + for offset in range(5) + call assert_true(0->win_move_statusline(-offset)) + call assert_equal(h0 - offset, winheight(0)) + call assert_equal(1 + offset, &cmdheight) + call assert_true(win_move_statusline(0, offset)) + call assert_equal(h0, winheight(0)) + call assert_equal(1, &cmdheight) + endfor + call assert_true(win_move_statusline(0, 1)) + call assert_equal(h0, winheight(0)) + call assert_equal(1, &cmdheight) " check win_move_statusline from bottom window on top window ID let id = win_getid(1) for offset in range(5) diff --git a/src/version.c b/src/version.c index 005a394ab..13de4a434 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4248, +/**/ 4247, /**/ 4246, diff --git a/src/window.c b/src/window.c index c77149f97..f80334d72 100644 --- a/src/window.c +++ b/src/window.c @@ -6187,7 +6187,9 @@ win_drag_vsep_line(win_T *dragwin, int offset) if (offset <= 0) // No room at all, quit. return; if (fr == NULL) - return; // Safety check, should not happen. + // This can happen when calling win_move_separator() on the rightmost + // window. Just don't do anything. + return; // grow frame fr by offset lines frame_new_width(fr, fr->fr_width + offset, left, FALSE); |