From 9af8cd768d79e226d494d9387463cf9d8c35e0af Mon Sep 17 00:00:00 2001 From: Michael Ennen Date: Fri, 2 Dec 2016 16:04:47 -0700 Subject: vim-patch:7.4.1835 Problem: When splitting and closing a window the status height changes. Solution: Compute the frame height correctly. (Hirohito Higashi) https://github.com/vim/vim/commit/991dea3ab185fb35e577ab0bdfd443cd4b43ccc6 --- src/nvim/testdir/test_alot.vim | 1 + src/nvim/testdir/test_window_cmd.vim | 37 ++++++++++++++++++++++++++++++++++++ src/nvim/version.c | 2 +- src/nvim/window.c | 26 ++++++++++++------------- 4 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 src/nvim/testdir/test_window_cmd.vim (limited to 'src') diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim index 083f57aec1..9681982d14 100644 --- a/src/nvim/testdir/test_alot.vim +++ b/src/nvim/testdir/test_alot.vim @@ -18,4 +18,5 @@ source test_syn_attr.vim source test_tabline.vim source test_tabpage.vim source test_unlet.vim +source test_window_cmd.vim source test_matchadd_conceal_utf8.vim diff --git a/src/nvim/testdir/test_window_cmd.vim b/src/nvim/testdir/test_window_cmd.vim new file mode 100644 index 0000000000..d2e42720d2 --- /dev/null +++ b/src/nvim/testdir/test_window_cmd.vim @@ -0,0 +1,37 @@ +" Tests for window cmd (:wincmd, :split, :vsplit, :resize and etc...) + +func Test_window_cmd_ls0_with_split() + set ls=0 + set splitbelow + split + quit + call assert_equal(0, &lines - &cmdheight - winheight(0)) + new | only! + " + set splitbelow&vim + botright split + quit + call assert_equal(0, &lines - &cmdheight - winheight(0)) + new | only! + set ls&vim +endfunc + +func Test_window_cmd_cmdwin_with_vsp() + let efmt='Expected 0 but got %d (in ls=%d, %s window)' + for v in range(0, 2) + exec "set ls=" . v + vsplit + call feedkeys("q:\") + let ac = &lines - (&cmdheight + winheight(0) + !!v) + let emsg = printf(efmt, ac, v, 'left') + call assert_equal(0, ac, emsg) + wincmd w + let ac = &lines - (&cmdheight + winheight(0) + !!v) + let emsg = printf(efmt, ac, v, 'right') + call assert_equal(0, ac, emsg) + new | only! + endfor + set ls&vim +endfunc + +" vim: sw=2 et diff --git a/src/nvim/version.c b/src/nvim/version.c index 05855ee385..b60cecf7f9 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -607,7 +607,7 @@ static int included_patches[] = { // 1838, // 1837, // 1836, - // 1835, + 1835, // 1834, 1833, 1832, diff --git a/src/nvim/window.c b/src/nvim/window.c index 8512556c0a..dac3c1614a 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -894,31 +894,31 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir) /* "new_size" of the current window goes to the new window, use * one row for the status line */ win_new_height(wp, new_size); - if (flags & (WSP_TOP | WSP_BOT)) - frame_new_height(curfrp, curfrp->fr_height - - (new_size + STATUS_HEIGHT), flags & WSP_TOP, FALSE); - else + if (flags & (WSP_TOP | WSP_BOT)) { + int new_fr_height = curfrp->fr_height - new_size; + + if (!((flags & WSP_BOT) && p_ls == 0)) { + new_fr_height -= STATUS_HEIGHT; + } + frame_new_height(curfrp, new_fr_height, flags & WSP_TOP, false); + } else { win_new_height(oldwin, oldwin_height - (new_size + STATUS_HEIGHT)); - if (before) { /* new window above current one */ + } + if (before) { // new window above current one wp->w_winrow = oldwin->w_winrow; wp->w_status_height = STATUS_HEIGHT; oldwin->w_winrow += wp->w_height + STATUS_HEIGHT; } else { /* new window below current one */ wp->w_winrow = oldwin->w_winrow + oldwin->w_height + STATUS_HEIGHT; wp->w_status_height = oldwin->w_status_height; - // Don't set the status_height for oldwin yet, this might break - // frame_fix_height(oldwin), therefore will be set below. + if (!(flags & WSP_BOT)) { + oldwin->w_status_height = STATUS_HEIGHT; + } } if (flags & WSP_BOT) frame_add_statusline(curfrp); frame_fix_height(wp); frame_fix_height(oldwin); - - if (!before) { - // New window above current one, set the status_height after - // frame_fix_height(oldwin) - oldwin->w_status_height = STATUS_HEIGHT; - } } if (flags & (WSP_TOP | WSP_BOT)) -- cgit From 34efe443acf06a63c6521cd0c6b19bcbb9cc44ac Mon Sep 17 00:00:00 2001 From: Michael Ennen Date: Fri, 2 Dec 2016 17:28:54 -0700 Subject: vim-patch:7.4.1956 Problem: When using CTRL-W f and pressing "q" at the ATTENTION dialog the newly opened window is not closed. Solution: Close the window and go back to the original one. (Norio Takagi, Hirohito Higashi) https://github.com/vim/vim/commit/5d2ca0402954ff79b73d9c86cc16c8a6454b75a7 --- src/nvim/testdir/test_window_cmd.vim | 33 +++++++++++++++++++++++++++++++++ src/nvim/version.c | 2 +- src/nvim/window.c | 10 +++++++--- 3 files changed, 41 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/nvim/testdir/test_window_cmd.vim b/src/nvim/testdir/test_window_cmd.vim index d2e42720d2..b7f41a711b 100644 --- a/src/nvim/testdir/test_window_cmd.vim +++ b/src/nvim/testdir/test_window_cmd.vim @@ -34,4 +34,37 @@ func Test_window_cmd_cmdwin_with_vsp() set ls&vim endfunc +function Test_window_cmd_wincmd_gf() + let fname = 'test_gf.txt' + let swp_fname = '.' . fname . '.swp' + call writefile([], fname) + call writefile([], swp_fname) + function s:swap_exists() + let v:swapchoice = s:swap_choice + endfunc + augroup test_window_cmd_wincmd_gf + autocmd! + exec "autocmd SwapExists " . fname . " call s:swap_exists()" + augroup END + + call setline(1, fname) + " (E)dit anyway + let s:swap_choice = 'e' + wincmd gf + call assert_equal(2, tabpagenr()) + call assert_equal(fname, bufname("%")) + quit! + + " (Q)uit + let s:swap_choice = 'q' + wincmd gf + call assert_equal(1, tabpagenr()) + call assert_notequal(fname, bufname("%")) + new | only! + + call delete(fname) + call delete(swp_fname) + augroup! test_window_cmd_wincmd_gf +endfunc + " vim: sw=2 et diff --git a/src/nvim/version.c b/src/nvim/version.c index b60cecf7f9..431c92d436 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -486,7 +486,7 @@ static int included_patches[] = { // 1959 NA // 1958 NA // 1957 NA - // 1956, + 1956, // 1955, // 1954, // 1953, diff --git a/src/nvim/window.c b/src/nvim/window.c index dac3c1614a..3e7aed7867 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -385,12 +385,16 @@ wingotofile: ptr = grab_file_name(Prenum1, &lnum); if (ptr != NULL) { + tabpage_T *oldtab = curtab; + win_T *oldwin = curwin; setpcmark(); if (win_split(0, 0) == OK) { RESET_BINDING(curwin); - (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, - ECMD_HIDE, NULL); - if (nchar == 'F' && lnum >= 0) { + if (do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, ECMD_HIDE, NULL) == FAIL) { + // Failed to open the file, close the window opened for it. + win_close(curwin, false); + goto_tabpage_win(oldtab, oldwin); + } else if (nchar == 'F' && lnum >= 0) { curwin->w_cursor.lnum = lnum; check_cursor_lnum(); beginline(BL_SOL | BL_FIX); -- cgit From 652f15aaa51652b83b7ef3d2984c236678424bdf Mon Sep 17 00:00:00 2001 From: Michael Ennen Date: Tue, 6 Dec 2016 12:56:42 -0700 Subject: Add vim defaults to runtest.vim. --- src/nvim/testdir/runtest.vim | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index d1857565a4..ac9774abc3 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -62,6 +62,10 @@ set shellslash " Make sure $HOME does not get read or written. let $HOME = '/does/not/exist' +" Align with vim defaults. +set directory^=. +set nohidden + function RunTheTest(test) echo 'Executing ' . a:test if exists("*SetUp") -- cgit