IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7836 'session: restore same :terminal buf split windows'

Browse Source
This commit is contained in:
Justin M. Keyes 2020-01-26 19:03:43 -08:00 committed by GitHub
commit b5daee7b8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 336 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/build.ps1
View File

@ -173,6 +173,9 @@ if (-not $NoTests) {
# Functional tests # Functional tests
# The $LastExitCode from MSBuild can't be trusted # The $LastExitCode from MSBuild can't be trusted
$failed = $false $failed = $false
# Run only this test file:
# $env:TEST_FILE = "test\functional\foo.lua"
cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 | cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 |
foreach { $failed = $failed -or foreach { $failed = $failed -or
$_ -match 'functional tests failed with error'; $_ } $_ -match 'functional tests failed with error'; $_ }

15
runtime/doc/usr_21.txt
View File

@ -339,21 +339,6 @@ window, move the cursor to the filename and press "O". Double clicking with
the mouse will also do this. the mouse will also do this.
UNIX AND MS-WINDOWS
Some people have to do work on MS-Windows systems one day and on Unix another
day. If you are one of them, consider adding "slash" and "unix" to
'sessionoptions'. The session files will then be written in a format that can
be used on both systems. This is the command to put in your |init.vim| file:
>
:set sessionoptions+=unix,slash
Vim will use the Unix format then, because the MS-Windows Vim can read and
write Unix files, but Unix Vim can't read MS-Windows format session files.
Similarly, MS-Windows Vim understands file names with / to separate names, but
Unix Vim doesn't understand \.
SESSIONS AND SHADA SESSIONS AND SHADA
Sessions store many things, but not the position of marks, contents of Sessions store many things, but not the position of marks, contents of

623
src/nvim/ex_docmd.c
View File

@ -8085,19 +8085,19 @@ static void close_redir(void)
} }
} }
#ifdef USE_CRNL #define PUTLINE_FAIL(s) \
# define MKSESSION_NL do { if (FAIL == put_line(fd, (s))) { return FAIL; } } while (0)
static int mksession_nl = FALSE; /* use NL only in put_eol() */
#endif
/* /// ":mkexrc", ":mkvimrc", ":mkview", ":mksession".
* ":mkexrc", ":mkvimrc", ":mkview" and ":mksession". ///
*/ /// Legacy 'sessionoptions' flags SSOP_UNIX, SSOP_SLASH are always enabled.
/// - SSOP_UNIX: line-endings are always LF
/// - SSOP_SLASH: filenames are always written with "/" slash
static void ex_mkrc(exarg_T *eap) static void ex_mkrc(exarg_T *eap)
{ {
FILE *fd; FILE *fd;
int failed = false; int failed = false;
int view_session = false; int view_session = false; // :mkview, :mksession
int using_vdir = false; // using 'viewdir'? int using_vdir = false; // using 'viewdir'?
char *viewFile = NULL; char *viewFile = NULL;
unsigned *flagp; unsigned *flagp;
@ -8144,26 +8144,21 @@ static void ex_mkrc(exarg_T *eap)
else else
flagp = &ssop_flags; flagp = &ssop_flags;
#ifdef MKSESSION_NL // Write the version command for :mkvimrc
/* "unix" in 'sessionoptions': use NL line separator */ if (eap->cmdidx == CMD_mkvimrc) {
if (view_session && (*flagp & SSOP_UNIX))
mksession_nl = TRUE;
#endif
/* Write the version command for :mkvimrc */
if (eap->cmdidx == CMD_mkvimrc)
(void)put_line(fd, "version 6.0"); (void)put_line(fd, "version 6.0");
}
if (eap->cmdidx == CMD_mksession) { if (eap->cmdidx == CMD_mksession) {
if (put_line(fd, "let SessionLoad = 1") == FAIL) if (put_line(fd, "let SessionLoad = 1") == FAIL)
failed = TRUE; failed = TRUE;
} }
if (!view_session if (!view_session || (eap->cmdidx == CMD_mksession
|| (eap->cmdidx == CMD_mksession && (*flagp & SSOP_OPTIONS))) {
&& (*flagp & SSOP_OPTIONS)))
failed |= (makemap(fd, NULL) == FAIL failed |= (makemap(fd, NULL) == FAIL
|| makeset(fd, OPT_GLOBAL, FALSE) == FAIL); || makeset(fd, OPT_GLOBAL, false) == FAIL);
}
if (!failed && view_session) { if (!failed && view_session) {
if (put_line(fd, if (put_line(fd,
@ -8213,14 +8208,17 @@ static void ex_mkrc(exarg_T *eap)
failed |= (put_view(fd, curwin, !using_vdir, flagp, failed |= (put_view(fd, curwin, !using_vdir, flagp,
-1) == FAIL); -1) == FAIL);
} }
if (put_line(fd, "let &so = s:so_save | let &siso = s:siso_save") if (fprintf(fd,
== FAIL) "%s",
failed = TRUE; "let &so = s:so_save | let &siso = s:siso_save\n"
if (put_line(fd, "doautoall SessionLoadPost") == FAIL) "doautoall SessionLoadPost\n")
failed = TRUE; < 0) {
failed = true;
}
if (eap->cmdidx == CMD_mksession) { if (eap->cmdidx == CMD_mksession) {
if (put_line(fd, "unlet SessionLoad") == FAIL) if (fprintf(fd, "unlet SessionLoad\n") < 0) {
failed = TRUE; failed = true;
}
} }
} }
if (put_line(fd, "\" vim: set ft=vim :") == FAIL) if (put_line(fd, "\" vim: set ft=vim :") == FAIL)
@ -8238,9 +8236,6 @@ static void ex_mkrc(exarg_T *eap)
} }
xfree(tbuf); xfree(tbuf);
} }
#ifdef MKSESSION_NL
mksession_nl = FALSE;
#endif
} }
xfree(viewFile); xfree(viewFile);
@ -9119,15 +9114,15 @@ char_u *expand_sfile(char_u *arg)
} }
/* /// Writes commands for restoring the current buffers, for :mksession.
* Write openfile commands for the current buffers to an .exrc file. ///
* Return FAIL on error, OK otherwise. /// Legacy 'sessionoptions' flags SSOP_UNIX, SSOP_SLASH are always enabled.
*/ ///
static int /// @param dirnow Current directory name
makeopens( /// @param fd File descriptor to write to
FILE *fd, ///
char_u *dirnow /* Current directory name */ /// @return FAIL on error, OK otherwise.
) static int makeopens(FILE *fd, char_u *dirnow)
{ {
int only_save_windows = TRUE; int only_save_windows = TRUE;
int nr; int nr;
@ -9145,60 +9140,47 @@ makeopens(
only_save_windows = FALSE; /* Save ALL buffers */ only_save_windows = FALSE; /* Save ALL buffers */
// Begin by setting v:this_session, and then other sessionable variables. // Begin by setting v:this_session, and then other sessionable variables.
if (put_line(fd, "let v:this_session=expand(\"<sfile>:p\")") == FAIL) { PUTLINE_FAIL("let v:this_session=expand(\"<sfile>:p\")");
return FAIL;
}
if (ssop_flags & SSOP_GLOBALS) { if (ssop_flags & SSOP_GLOBALS) {
if (store_session_globals(fd) == FAIL) { if (store_session_globals(fd) == FAIL) {
return FAIL; return FAIL;
} }
} }
/* // Close all windows but one.
* Close all windows but one. PUTLINE_FAIL("silent only");
*/
if (put_line(fd, "silent only") == FAIL)
return FAIL;
/* //
* Now a :cd command to the session directory or the current directory // Now a :cd command to the session directory or the current directory
*/ //
if (ssop_flags & SSOP_SESDIR) { if (ssop_flags & SSOP_SESDIR) {
if (put_line(fd, "exe \"cd \" . escape(expand(\"<sfile>:p:h\"), ' ')") PUTLINE_FAIL("exe \"cd \" . escape(expand(\"<sfile>:p:h\"), ' ')");
== FAIL)
return FAIL;
} else if (ssop_flags & SSOP_CURDIR) { } else if (ssop_flags & SSOP_CURDIR) {
sname = home_replace_save(NULL, globaldir != NULL ? globaldir : dirnow); sname = home_replace_save(NULL, globaldir != NULL ? globaldir : dirnow);
if (fputs("cd ", fd) < 0 char *fname_esc = ses_escape_fname((char *)sname, &ssop_flags);
|| ses_put_fname(fd, sname, &ssop_flags) == FAIL if (fprintf(fd, "cd %s\n", fname_esc) < 0) {
|| put_eol(fd) == FAIL) { xfree(fname_esc);
xfree(sname); xfree(sname);
return FAIL; return FAIL;
} }
xfree(fname_esc);
xfree(sname); xfree(sname);
} }
/* if (fprintf(fd,
* If there is an empty, unnamed buffer we will wipe it out later. "%s",
* Remember the buffer number. // If there is an empty, unnamed buffer we will wipe it out later.
*/ // Remember the buffer number.
if (put_line(fd, "if expand('%') == '' && !&modified && line('$') <= 1"
"if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''") " && getline(1) == ''\n"
== " let s:wipebuf = bufnr('%')\n"
FAIL) "endif\n"
return FAIL; // Now save the current files, current buffer first.
if (put_line(fd, " let s:wipebuf = bufnr('%')") == FAIL) "set shortmess=aoO\n") < 0) {
return FAIL;
if (put_line(fd, "endif") == FAIL)
return FAIL; return FAIL;
}
/* // Now put the other buffers into the buffer list.
* Now save the current files, current buffer first.
*/
if (put_line(fd, "set shortmess=aoO") == FAIL)
return FAIL;
/* Now put the other buffers into the buffer list */
FOR_ALL_BUFFERS(buf) { FOR_ALL_BUFFERS(buf) {
if (!(only_save_windows && buf->b_nwindows == 0) if (!(only_save_windows && buf->b_nwindows == 0)
&& !(buf->b_help && !(ssop_flags & SSOP_HELP)) && !(buf->b_help && !(ssop_flags & SSOP_HELP))
@ -9221,12 +9203,12 @@ makeopens(
} }
if (ssop_flags & SSOP_RESIZE) { if (ssop_flags & SSOP_RESIZE) {
/* Note: after the restore we still check it worked!*/ // Note: after the restore we still check it worked!
if (fprintf(fd, "set lines=%" PRId64 " columns=%" PRId64, if (fprintf(fd, "set lines=%" PRId64 " columns=%" PRId64 "\n",
(int64_t)Rows, (int64_t)Columns) < 0 (int64_t)Rows, (int64_t)Columns) < 0) {
|| put_eol(fd) == FAIL)
return FAIL; return FAIL;
} }
}
int restore_stal = FALSE; int restore_stal = FALSE;
// When there are two or more tabpages and 'showtabline' is 1 the tabline // When there are two or more tabpages and 'showtabline' is 1 the tabline
@ -9234,19 +9216,16 @@ makeopens(
// in the first tab, which may cause problems. Set 'showtabline' to 2 // in the first tab, which may cause problems. Set 'showtabline' to 2
// temporarily to avoid that. // temporarily to avoid that.
if (p_stal == 1 && first_tabpage->tp_next != NULL) { if (p_stal == 1 && first_tabpage->tp_next != NULL) {
if (put_line(fd, "set stal=2") == FAIL) { PUTLINE_FAIL("set stal=2");
return FAIL; restore_stal = true;
}
restore_stal = TRUE;
} }
/* //
* May repeat putting Windows for each tab, when "tabpages" is in // For each tab:
* 'sessionoptions'. // - Put windows for each tab, when "tabpages" is in 'sessionoptions'.
* Don't use goto_tabpage(), it may change directory and trigger // - Don't use goto_tabpage(), it may change CWD and trigger autocommands.
* autocommands. //
*/ tab_firstwin = firstwin; // First window in tab page "tabnr".
tab_firstwin = firstwin; /* first window in tab page "tabnr" */
tab_topframe = topframe; tab_topframe = topframe;
for (tabnr = 1;; tabnr++) { for (tabnr = 1;; tabnr++) {
tabpage_T *tp = find_tabpage(tabnr); tabpage_T *tp = find_tabpage(tabnr);
@ -9269,11 +9248,11 @@ makeopens(
need_tabnew = TRUE; need_tabnew = TRUE;
} }
/* //
* Before creating the window layout, try loading one file. If this // Before creating the window layout, try loading one file. If this
* is aborted we don't end up with a number of useless windows. // is aborted we don't end up with a number of useless windows.
* This may have side effects! (e.g., compressed or network file). // This may have side effects! (e.g., compressed or network file).
*/ //
for (wp = tab_firstwin; wp != NULL; wp = wp->w_next) { for (wp = tab_firstwin; wp != NULL; wp = wp->w_next) {
if (ses_do_win(wp) if (ses_do_win(wp)
&& wp->w_buffer->b_ffname != NULL && wp->w_buffer->b_ffname != NULL
@ -9292,26 +9271,29 @@ makeopens(
} }
} }
/* If no file got edited create an empty tab page. */ // If no file got edited create an empty tab page.
if (need_tabnew && put_line(fd, "tabnew") == FAIL) if (need_tabnew && put_line(fd, "tabnew") == FAIL) {
return FAIL; return FAIL;
}
/* //
* Save current window layout. // Save current window layout.
*/ //
if (put_line(fd, "set splitbelow splitright") == FAIL) PUTLINE_FAIL("set splitbelow splitright");
if (ses_win_rec(fd, tab_topframe) == FAIL) {
return FAIL; return FAIL;
if (ses_win_rec(fd, tab_topframe) == FAIL) }
if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL) {
return FAIL; return FAIL;
if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL) }
return FAIL; if (!p_spr && put_line(fd, "set nosplitright") == FAIL) {
if (!p_spr && put_line(fd, "set nosplitright") == FAIL)
return FAIL; return FAIL;
}
/* //
* Check if window sizes can be restored (no windows omitted). // Check if window sizes can be restored (no windows omitted).
* Remember the window number of the current window after restoring. // Remember the window number of the current window after restoring.
*/ //
nr = 0; nr = 0;
for (wp = tab_firstwin; wp != NULL; wp = wp->w_next) { for (wp = tab_firstwin; wp != NULL; wp = wp->w_next) {
if (ses_do_win(wp)) if (ses_do_win(wp))
@ -9322,9 +9304,8 @@ makeopens(
cnr = nr; cnr = nr;
} }
/* Go to the first window. */ // Go to the first window.
if (put_line(fd, "wincmd t") == FAIL) PUTLINE_FAIL("wincmd t");
return FAIL;
// If more than one window, see if sizes can be restored. // If more than one window, see if sizes can be restored.
// First set 'winheight' and 'winwidth' to 1 to avoid the windows being // First set 'winheight' and 'winwidth' to 1 to avoid the windows being
@ -9333,110 +9314,115 @@ makeopens(
// cursor can be set. This is done again below. // cursor can be set. This is done again below.
// winminheight and winminwidth need to be set to avoid an error if the // winminheight and winminwidth need to be set to avoid an error if the
// user has set winheight or winwidth. // user has set winheight or winwidth.
if (put_line(fd, "set winminheight=0") == FAIL if (fprintf(fd,
|| put_line(fd, "set winheight=1") == FAIL "set winminheight=0\n"
|| put_line(fd, "set winminwidth=0") == FAIL "set winheight=1\n"
|| put_line(fd, "set winwidth=1") == FAIL) { "set winminwidth=0\n"
"set winwidth=1\n") < 0) {
return FAIL; return FAIL;
} }
if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL) { if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL) {
return FAIL; return FAIL;
} }
/* //
* Restore the view of the window (options, file, cursor, etc.). // Restore the view of the window (options, file, cursor, etc.).
*/ //
for (wp = tab_firstwin; wp != NULL; wp = wp->w_next) { for (wp = tab_firstwin; wp != NULL; wp = wp->w_next) {
if (!ses_do_win(wp)) if (!ses_do_win(wp)) {
continue; continue;
if (put_view(fd, wp, wp != edited_win, &ssop_flags, }
cur_arg_idx) == FAIL) if (put_view(fd, wp, wp != edited_win, &ssop_flags, cur_arg_idx)
== FAIL) {
return FAIL; return FAIL;
if (nr > 1 && put_line(fd, "wincmd w") == FAIL) }
if (nr > 1 && put_line(fd, "wincmd w") == FAIL) {
return FAIL; return FAIL;
}
next_arg_idx = wp->w_arg_idx; next_arg_idx = wp->w_arg_idx;
} }
/* The argument index in the first tab page is zero, need to set it in // The argument index in the first tab page is zero, need to set it in
* each window. For further tab pages it's the window where we do // each window. For further tab pages it's the window where we do
* "tabedit". */ // "tabedit".
cur_arg_idx = next_arg_idx; cur_arg_idx = next_arg_idx;
/* //
* Restore cursor to the current window if it's not the first one. // Restore cursor to the current window if it's not the first one.
*/ //
if (cnr > 1 && (fprintf(fd, "%dwincmd w", cnr) < 0 if (cnr > 1 && (fprintf(fd, "%dwincmd w\n", cnr) < 0)) {
|| put_eol(fd) == FAIL))
return FAIL; return FAIL;
}
/* //
* Restore window sizes again after jumping around in windows, because // Restore window sizes again after jumping around in windows, because
* the current window has a minimum size while others may not. // the current window has a minimum size while others may not.
*/ //
if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL) if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL) {
return FAIL; return FAIL;
}
// Take care of tab-local working directories if applicable // Take care of tab-local working directories if applicable
if (tp->tp_localdir) { if (tp->tp_localdir) {
if (fputs("if exists(':tcd') == 2 | tcd ", fd) < 0 if (fputs("if exists(':tcd') == 2 | tcd ", fd) < 0
|| ses_put_fname(fd, tp->tp_localdir, &ssop_flags) == FAIL || ses_put_fname(fd, tp->tp_localdir, &ssop_flags) == FAIL
|| fputs(" | endif", fd) < 0 || fputs(" | endif\n", fd) < 0) {
|| put_eol(fd) == FAIL) {
return FAIL; return FAIL;
} }
did_lcd = true; did_lcd = true;
} }
/* Don't continue in another tab page when doing only the current one // Don't continue in another tab page when doing only the current one
* or when at the last tab page. */ // or when at the last tab page.
if (!(ssop_flags & SSOP_TABPAGES)) if (!(ssop_flags & SSOP_TABPAGES)) {
break; break;
} }
}
if (ssop_flags & SSOP_TABPAGES) { if (ssop_flags & SSOP_TABPAGES) {
if (fprintf(fd, "tabnext %d", tabpage_index(curtab)) < 0 if (fprintf(fd, "tabnext %d\n", tabpage_index(curtab)) < 0) {
|| put_eol(fd) == FAIL)
return FAIL; return FAIL;
} }
}
if (restore_stal && put_line(fd, "set stal=1") == FAIL) { if (restore_stal && put_line(fd, "set stal=1") == FAIL) {
return FAIL; return FAIL;
} }
/* //
* Wipe out an empty unnamed buffer we started in. // Wipe out an empty unnamed buffer we started in.
*/ //
if (put_line(fd, "if exists('s:wipebuf') " if (fprintf(fd, "%s",
"&& getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'") "if exists('s:wipebuf') "
== FAIL) "&& getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'\n"
return FAIL; " silent exe 'bwipe ' . s:wipebuf\n"
if (put_line(fd, " silent exe 'bwipe ' . s:wipebuf") == FAIL) "endif\n"
return FAIL; "unlet! s:wipebuf\n") < 0) {
if (put_line(fd, "endif") == FAIL)
return FAIL;
if (put_line(fd, "unlet! s:wipebuf") == FAIL)
return FAIL; return FAIL;
}
// Re-apply options. // Re-apply options.
if (fprintf(fd, "set winheight=%" PRId64 " winwidth=%" PRId64 if (fprintf(fd,
"set winheight=%" PRId64 " winwidth=%" PRId64
" winminheight=%" PRId64 " winminwidth=%" PRId64 " winminheight=%" PRId64 " winminwidth=%" PRId64
" shortmess=%s", " shortmess=%s\n",
(int64_t)p_wh, (int64_t)p_wh,
(int64_t)p_wiw, (int64_t)p_wiw,
(int64_t)p_wmh, (int64_t)p_wmh,
(int64_t)p_wmw, (int64_t)p_wmw,
p_shm) < 0 p_shm) < 0) {
|| put_eol(fd) == FAIL) {
return FAIL; return FAIL;
} }
/* //
* Lastly, execute the x.vim file if it exists. // Lastly, execute the x.vim file if it exists.
*/ //
if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL if (fprintf(fd, "%s",
|| put_line(fd, "if file_readable(s:sx)") == FAIL "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"\n"
|| put_line(fd, " exe \"source \" . fnameescape(s:sx)") == FAIL "if file_readable(s:sx)\n"
|| put_line(fd, "endif") == FAIL) " exe \"source \" . fnameescape(s:sx)\n"
"endif\n") < 0) {
return FAIL; return FAIL;
}
return OK; return OK;
} }
@ -9457,10 +9443,9 @@ static int ses_winsizes(FILE *fd, int restore_size, win_T *tab_firstwin)
if (wp->w_height + wp->w_status_height < topframe->fr_height if (wp->w_height + wp->w_status_height < topframe->fr_height
&& (fprintf(fd, && (fprintf(fd,
"exe '%dresize ' . ((&lines * %" PRId64 "exe '%dresize ' . ((&lines * %" PRId64
" + %" PRId64 ") / %" PRId64 ")", " + %" PRId64 ") / %" PRId64 ")\n",
n, (int64_t)wp->w_height, n, (int64_t)wp->w_height,
(int64_t)Rows / 2, (int64_t)Rows) < 0 (int64_t)Rows / 2, (int64_t)Rows) < 0)) {
|| put_eol(fd) == FAIL)) {
return FAIL; return FAIL;
} }
@ -9468,72 +9453,66 @@ static int ses_winsizes(FILE *fd, int restore_size, win_T *tab_firstwin)
if (wp->w_width < Columns if (wp->w_width < Columns
&& (fprintf(fd, && (fprintf(fd,
"exe 'vert %dresize ' . ((&columns * %" PRId64 "exe 'vert %dresize ' . ((&columns * %" PRId64
" + %" PRId64 ") / %" PRId64 ")", " + %" PRId64 ") / %" PRId64 ")\n",
n, (int64_t)wp->w_width, (int64_t)Columns / 2, n, (int64_t)wp->w_width, (int64_t)Columns / 2,
(int64_t)Columns) < 0 (int64_t)Columns) < 0)) {
|| put_eol(fd) == FAIL)) {
return FAIL; return FAIL;
} }
} }
} else { } else {
// Just equalise window sizes // Just equalize window sizes.
if (put_line(fd, "wincmd =") == FAIL) { PUTLINE_FAIL("wincmd =");
return FAIL;
}
} }
return OK; return OK;
} }
/* // Write commands to "fd" to recursively create windows for frame "fr",
* Write commands to "fd" to recursively create windows for frame "fr", // horizontally and vertically split.
* horizontally and vertically split. // After the commands the last window in the frame is the current window.
* After the commands the last window in the frame is the current window. // Returns FAIL when writing the commands to "fd" fails.
* Returns FAIL when writing the commands to "fd" fails.
*/
static int ses_win_rec(FILE *fd, frame_T *fr) static int ses_win_rec(FILE *fd, frame_T *fr)
{ {
frame_T *frc; frame_T *frc;
int count = 0; int count = 0;
if (fr->fr_layout != FR_LEAF) { if (fr->fr_layout != FR_LEAF) {
/* Find first frame that's not skipped and then create a window for // Find first frame that's not skipped and then create a window for
* each following one (first frame is already there). */ // each following one (first frame is already there).
frc = ses_skipframe(fr->fr_child); frc = ses_skipframe(fr->fr_child);
if (frc != NULL) if (frc != NULL)
while ((frc = ses_skipframe(frc->fr_next)) != NULL) { while ((frc = ses_skipframe(frc->fr_next)) != NULL) {
/* Make window as big as possible so that we have lots of room // Make window as big as possible so that we have lots of room
* to split. */ // to split.
if (put_line(fd, "wincmd _ | wincmd |") == FAIL if (fprintf(fd, "%s%s",
|| put_line(fd, fr->fr_layout == FR_COL "wincmd _ | wincmd |\n",
? "split" : "vsplit") == FAIL) (fr->fr_layout == FR_COL ? "split\n" : "vsplit\n")) < 0) {
return FAIL; return FAIL;
++count; }
count++;
} }
/* Go back to the first window. */ // Go back to the first window.
if (count > 0 && (fprintf(fd, fr->fr_layout == FR_COL if (count > 0 && (fprintf(fd, fr->fr_layout == FR_COL
? "%dwincmd k" : "%dwincmd h", count) < 0 ? "%dwincmd k\n" : "%dwincmd h\n", count) < 0)) {
|| put_eol(fd) == FAIL))
return FAIL; return FAIL;
}
/* Recursively create frames/windows in each window of this column or // Recursively create frames/windows in each window of this column or row.
* row. */
frc = ses_skipframe(fr->fr_child); frc = ses_skipframe(fr->fr_child);
while (frc != NULL) { while (frc != NULL) {
ses_win_rec(fd, frc); ses_win_rec(fd, frc);
frc = ses_skipframe(frc->fr_next); frc = ses_skipframe(frc->fr_next);
/* Go to next window. */ // Go to next window.
if (frc != NULL && put_line(fd, "wincmd w") == FAIL) if (frc != NULL && put_line(fd, "wincmd w") == FAIL) {
return FAIL; return FAIL;
} }
} }
}
return OK; return OK;
} }
/* // Skip frames that don't contain windows we want to save in the Session.
* Skip frames that don't contain windows we want to save in the Session. // Returns NULL when there none.
* Returns NULL when there none.
*/
static frame_T *ses_skipframe(frame_T *fr) static frame_T *ses_skipframe(frame_T *fr)
{ {
frame_T *frc; frame_T *frc;
@ -9583,11 +9562,11 @@ static int put_view_curpos(FILE *fd, const win_T *wp, char *spaces)
int r; int r;
if (wp->w_curswant == MAXCOL) { if (wp->w_curswant == MAXCOL) {
r = fprintf(fd, "%snormal! $", spaces); r = fprintf(fd, "%snormal! $\n", spaces);
} else { } else {
r = fprintf(fd, "%snormal! 0%d|", spaces, wp->w_virtcol + 1); r = fprintf(fd, "%snormal! 0%d|\n", spaces, wp->w_virtcol + 1);
} }
return r < 0 || put_eol(fd) == FAIL ? FAIL : OK; return r >= 0;
} }
/* /*
@ -9617,32 +9596,33 @@ put_view(
* Local argument list. * Local argument list.
*/ */
if (wp->w_alist == &global_alist) { if (wp->w_alist == &global_alist) {
if (put_line(fd, "argglobal") == FAIL) PUTLINE_FAIL("argglobal");
return FAIL;
} else { } else {
if (ses_arglist(fd, "arglocal", &wp->w_alist->al_ga, if (ses_arglist(fd, "arglocal", &wp->w_alist->al_ga,
flagp == &vop_flags flagp == &vop_flags
|| !(*flagp & SSOP_CURDIR) || !(*flagp & SSOP_CURDIR)
|| wp->w_localdir != NULL, flagp) == FAIL) || wp->w_localdir != NULL, flagp) == FAIL) {
return FAIL; return FAIL;
} }
}
/* Only when part of a session: restore the argument index. Some /* Only when part of a session: restore the argument index. Some
* arguments may have been deleted, check if the index is valid. */ * arguments may have been deleted, check if the index is valid. */
if (wp->w_arg_idx != current_arg_idx && wp->w_arg_idx < WARGCOUNT(wp) if (wp->w_arg_idx != current_arg_idx && wp->w_arg_idx < WARGCOUNT(wp)
&& flagp == &ssop_flags) { && flagp == &ssop_flags) {
if (fprintf(fd, "%" PRId64 "argu", (int64_t)wp->w_arg_idx + 1) < 0 if (fprintf(fd, "%" PRId64 "argu\n", (int64_t)wp->w_arg_idx + 1) < 0) {
|| put_eol(fd) == FAIL) {
return FAIL; return FAIL;
} }
did_next = true; did_next = true;
} }
/* Edit the file. Skip this when ":next" already did it. */ // Edit the file. Skip this when ":next" already did it.
if (add_edit && (!did_next || wp->w_arg_idx_invalid)) { if (add_edit && (!did_next || wp->w_arg_idx_invalid)) {
/* char *fname_esc =
* Load the file. ses_escape_fname(ses_get_fname(wp->w_buffer, flagp), flagp);
*/ //
// Load the file.
//
if (wp->w_buffer->b_ffname != NULL if (wp->w_buffer->b_ffname != NULL
&& (!bt_nofile(wp->w_buffer) || wp->w_buffer->terminal) && (!bt_nofile(wp->w_buffer) || wp->w_buffer->terminal)
) { ) {
@ -9652,38 +9632,41 @@ put_view(
// Note, if a buffer for that file already exists, use :badd to // Note, if a buffer for that file already exists, use :badd to
// edit that buffer, to not lose folding information (:edit resets // edit that buffer, to not lose folding information (:edit resets
// folds in other buffers) // folds in other buffers)
if (fputs("if bufexists(\"", fd) < 0 if (fprintf(fd,
|| ses_fname(fd, wp->w_buffer, flagp, false) == FAIL "if bufexists(\"%s\") | buffer %s | else | edit %s | endif\n"
|| fputs("\") | buffer ", fd) < 0 // Fixup :terminal buffer name. #7836
|| ses_fname(fd, wp->w_buffer, flagp, false) == FAIL "if &buftype ==# 'terminal'\n"
|| fputs(" | else | edit ", fd) < 0 " silent file %s\n"
|| ses_fname(fd, wp->w_buffer, flagp, false) == FAIL "endif\n",
|| fputs(" | endif", fd) < 0 fname_esc,
|| put_eol(fd) == FAIL) { fname_esc,
fname_esc,
fname_esc) < 0) {
xfree(fname_esc);
return FAIL; return FAIL;
} }
} else { } else {
// No file in this buffer, just make it empty. // No file in this buffer, just make it empty.
if (put_line(fd, "enew") == FAIL) { PUTLINE_FAIL("enew");
return FAIL;
}
if (wp->w_buffer->b_ffname != NULL) { if (wp->w_buffer->b_ffname != NULL) {
// The buffer does have a name, but it's not a file name. // The buffer does have a name, but it's not a file name.
if (fputs("file ", fd) < 0 if (fprintf(fd, "file %s\n", fname_esc) < 0) {
|| ses_fname(fd, wp->w_buffer, flagp, true) == FAIL) { xfree(fname_esc);
return FAIL; return FAIL;
} }
} }
do_cursor = false; do_cursor = false;
} }
xfree(fname_esc);
} }
/* /*
* Local mappings and abbreviations. * Local mappings and abbreviations.
*/ */
if ((*flagp & (SSOP_OPTIONS | SSOP_LOCALOPTIONS)) if ((*flagp & (SSOP_OPTIONS | SSOP_LOCALOPTIONS))
&& makemap(fd, wp->w_buffer) == FAIL) && makemap(fd, wp->w_buffer) == FAIL) {
return FAIL; return FAIL;
}
/* /*
* Local options. Need to go to the window temporarily. * Local options. Need to go to the window temporarily.
@ -9704,12 +9687,13 @@ put_view(
f = OK; f = OK;
curwin = save_curwin; curwin = save_curwin;
curbuf = curwin->w_buffer; curbuf = curwin->w_buffer;
if (f == FAIL) if (f == FAIL) {
return FAIL; return FAIL;
}
/* //
* Save Folds when 'buftype' is empty and for help files. // Save Folds when 'buftype' is empty and for help files.
*/ //
if ((*flagp & SSOP_FOLDS) if ((*flagp & SSOP_FOLDS)
&& wp->w_buffer->b_ffname != NULL && wp->w_buffer->b_ffname != NULL
&& (bt_normal(wp->w_buffer) || bt_help(wp->w_buffer)) && (bt_normal(wp->w_buffer) || bt_help(wp->w_buffer))
@ -9718,46 +9702,42 @@ put_view(
return FAIL; return FAIL;
} }
/* //
* Set the cursor after creating folds, since that moves the cursor. // Set the cursor after creating folds, since that moves the cursor.
*/ //
if (do_cursor) { if (do_cursor) {
// Restore the cursor line in the file and relatively in the
/* Restore the cursor line in the file and relatively in the // window. Don't use "G", it changes the jumplist.
* window. Don't use "G", it changes the jumplist. */
if (fprintf(fd, if (fprintf(fd,
"let s:l = %" PRId64 " - ((%" PRId64 "let s:l = %" PRId64 " - ((%" PRId64
" * winheight(0) + %" PRId64 ") / %" PRId64 ")", " * winheight(0) + %" PRId64 ") / %" PRId64 ")\n"
"if s:l < 1 | let s:l = 1 | endif\n"
"exe s:l\n"
"normal! zt\n"
"%" PRId64 "\n",
(int64_t)wp->w_cursor.lnum, (int64_t)wp->w_cursor.lnum,
(int64_t)(wp->w_cursor.lnum - wp->w_topline), (int64_t)(wp->w_cursor.lnum - wp->w_topline),
(int64_t)(wp->w_height_inner / 2), (int64_t)(wp->w_height_inner / 2),
(int64_t)wp->w_height_inner) < 0 (int64_t)wp->w_height_inner,
|| put_eol(fd) == FAIL (int64_t)wp->w_cursor.lnum) < 0) {
|| put_line(fd, "if s:l < 1 | let s:l = 1 | endif") == FAIL
|| put_line(fd, "exe s:l") == FAIL
|| put_line(fd, "normal! zt") == FAIL
|| fprintf(fd, "%" PRId64, (int64_t)wp->w_cursor.lnum) < 0
|| put_eol(fd) == FAIL)
return FAIL; return FAIL;
/* Restore the cursor column and left offset when not wrapping. */ }
// Restore the cursor column and left offset when not wrapping.
if (wp->w_cursor.col == 0) { if (wp->w_cursor.col == 0) {
if (put_line(fd, "normal! 0") == FAIL) PUTLINE_FAIL("normal! 0");
return FAIL;
} else { } else {
if (!wp->w_p_wrap && wp->w_leftcol > 0 && wp->w_width > 0) { if (!wp->w_p_wrap && wp->w_leftcol > 0 && wp->w_width > 0) {
if (fprintf(fd, if (fprintf(fd,
"let s:c = %" PRId64 " - ((%" PRId64 "let s:c = %" PRId64 " - ((%" PRId64
" * winwidth(0) + %" PRId64 ") / %" PRId64 ")", " * winwidth(0) + %" PRId64 ") / %" PRId64 ")\n"
"if s:c > 0\n"
" exe 'normal! ' . s:c . '|zs' . %" PRId64 " . '|'\n"
"else\n",
(int64_t)wp->w_virtcol + 1, (int64_t)wp->w_virtcol + 1,
(int64_t)(wp->w_virtcol - wp->w_leftcol), (int64_t)(wp->w_virtcol - wp->w_leftcol),
(int64_t)(wp->w_width / 2), (int64_t)(wp->w_width / 2),
(int64_t)wp->w_width) < 0 (int64_t)wp->w_width,
|| put_eol(fd) == FAIL
|| put_line(fd, "if s:c > 0") == FAIL
|| fprintf(fd, " exe 'normal! ' . s:c . '|zs' . %" PRId64 " . '|'",
(int64_t)wp->w_virtcol + 1) < 0 (int64_t)wp->w_virtcol + 1) < 0
|| put_eol(fd) == FAIL
|| put_line(fd, "else") == FAIL
|| put_view_curpos(fd, wp, " ") == FAIL || put_view_curpos(fd, wp, " ") == FAIL
|| put_line(fd, "endif") == FAIL) { || put_line(fd, "endif") == FAIL) {
return FAIL; return FAIL;
@ -9776,7 +9756,7 @@ put_view(
&& (flagp != &vop_flags || (*flagp & SSOP_CURDIR))) { && (flagp != &vop_flags || (*flagp & SSOP_CURDIR))) {
if (fputs("lcd ", fd) < 0 if (fputs("lcd ", fd) < 0
|| ses_put_fname(fd, wp->w_localdir, flagp) == FAIL || ses_put_fname(fd, wp->w_localdir, flagp) == FAIL
|| put_eol(fd) == FAIL) { || fprintf(fd, "\n") < 0) {
return FAIL; return FAIL;
} }
did_lcd = true; did_lcd = true;
@ -9785,30 +9765,26 @@ put_view(
return OK; return OK;
} }
/* /// Writes an :argument list to the session file.
* Write an argument list to the session file. ///
* Returns FAIL if writing fails. /// @param fd
*/ /// @param cmd
static int /// @param gap
ses_arglist( /// @param fullname true: use full path name
FILE *fd, /// @param flagp
char *cmd, ///
garray_T *gap, /// @returns FAIL if writing fails.
int fullname, /* TRUE: use full path name */ static int ses_arglist(FILE *fd, char *cmd, garray_T *gap, int fullname,
unsigned *flagp unsigned *flagp)
)
{ {
char_u *buf = NULL; char_u *buf = NULL;
char_u *s; char_u *s;
if (fputs(cmd, fd) < 0 || put_eol(fd) == FAIL) { if (fprintf(fd, "%s\n%s\n", cmd, "%argdel") < 0) {
return FAIL; return FAIL;
} }
if (put_line(fd, "%argdel") == FAIL) { for (int i = 0; i < gap->ga_len; i++) {
return FAIL; // NULL file names are skipped (only happens when out of memory).
}
for (int i = 0; i < gap->ga_len; ++i) {
/* NULL file names are skipped (only happens when out of memory). */
s = alist_name(&((aentry_T *)gap->ga_data)[i]); s = alist_name(&((aentry_T *)gap->ga_data)[i]);
if (s != NULL) { if (s != NULL) {
if (fullname) { if (fullname) {
@ -9816,71 +9792,81 @@ ses_arglist(
(void)vim_FullName((char *)s, (char *)buf, MAXPATHL, FALSE); (void)vim_FullName((char *)s, (char *)buf, MAXPATHL, FALSE);
s = buf; s = buf;
} }
if (fputs("$argadd ", fd) < 0 || ses_put_fname(fd, s, flagp) == FAIL char *fname_esc = ses_escape_fname((char *)s, flagp);
|| put_eol(fd) == FAIL) { if (fprintf(fd, "$argadd %s\n", fname_esc) < 0) {
xfree(fname_esc);
xfree(buf); xfree(buf);
return FAIL; return FAIL;
} }
xfree(fname_esc);
xfree(buf); xfree(buf);
} }
} }
return OK; return OK;
} }
/// Gets the buffer name for `buf`.
static char *ses_get_fname(buf_T *buf, unsigned *flagp)
{
// Use the short file name if the current directory is known at the time
// the session file will be sourced.
// Don't do this for ":mkview", we don't know the current directory.
// Don't do this after ":lcd", we don't keep track of what the current
// directory is.
if (buf->b_sfname != NULL
&& flagp == &ssop_flags
&& (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
&& !p_acd
&& !did_lcd) {
return (char *)buf->b_sfname;
}
return (char *)buf->b_ffname;
}
/// Write a buffer name to the session file. /// Write a buffer name to the session file.
/// Also ends the line, if "add_eol" is true. /// Also ends the line, if "add_eol" is true.
/// Returns FAIL if writing fails. /// Returns FAIL if writing fails.
static int ses_fname(FILE *fd, buf_T *buf, unsigned *flagp, bool add_eol) static int ses_fname(FILE *fd, buf_T *buf, unsigned *flagp, bool add_eol)
{ {
char_u *name; char *name = ses_get_fname(buf, flagp);
if (ses_put_fname(fd, (char_u *)name, flagp) == FAIL
/* Use the short file name if the current directory is known at the time || (add_eol && fprintf(fd, "\n") < 0)) {
* the session file will be sourced.
* Don't do this for ":mkview", we don't know the current directory.
* Don't do this after ":lcd", we don't keep track of what the current
* directory is. */
if (buf->b_sfname != NULL
&& flagp == &ssop_flags
&& (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
&& !p_acd
&& !did_lcd)
name = buf->b_sfname;
else
name = buf->b_ffname;
if (ses_put_fname(fd, name, flagp) == FAIL
|| (add_eol && put_eol(fd) == FAIL)) {
return FAIL; return FAIL;
} }
return OK; return OK;
} }
/* // Escapes a filename for session writing.
* Write a file name to the session file. // Takes care of "slash" flag in 'sessionoptions' and escapes special
* Takes care of the "slash" option in 'sessionoptions' and escapes special // characters.
* characters. //
* Returns FAIL if writing fails. // Returns allocated string or NULL.
*/ static char *ses_escape_fname(char *name, unsigned *flagp)
static int ses_put_fname(FILE *fd, char_u *name, unsigned *flagp)
{ {
char_u *p; char *p;
char *sname = (char *)home_replace_save(NULL, (char_u *)name);
char_u *sname = home_replace_save(NULL, name); // Always SSOP_SLASH: change all backslashes to forward slashes.
if (*flagp & SSOP_SLASH) {
// change all backslashes to forward slashes
for (p = sname; *p != NUL; MB_PTR_ADV(p)) { for (p = sname; *p != NUL; MB_PTR_ADV(p)) {
if (*p == '\\') { if (*p == '\\') {
*p = '/'; *p = '/';
} }
} }
}
// Escape special characters. // Escape special characters.
p = (char_u *)vim_strsave_fnameescape((const char *)sname, false); p = vim_strsave_fnameescape(sname, false);
xfree(sname); xfree(sname);
return p;
}
/* write the result */ // Write a file name to the session file.
bool retval = fputs((char *)p, fd) < 0 ? FAIL : OK; // Takes care of the "slash" option in 'sessionoptions' and escapes special
// characters.
// Returns FAIL if writing fails.
static int ses_put_fname(FILE *fd, char_u *name, unsigned *flagp)
{
char *p = ses_escape_fname((char *)name, flagp);
bool retval = fputs(p, fd) < 0 ? FAIL : OK;
xfree(p); xfree(p);
return retval; return retval;
} }
@ -9947,32 +9933,21 @@ static char *get_view_file(int c)
} }
/* // TODO(justinmk): remove this, not needed after 5ba3cecb68cd.
* Write end-of-line character(s) for ":mkexrc", ":mkvimrc" and ":mksession".
* Return FAIL for a write error.
*/
int put_eol(FILE *fd) int put_eol(FILE *fd)
{ {
#if defined(USE_CRNL) && defined(MKSESSION_NL)
if ((!mksession_nl && putc('\r', fd) < 0) || putc('\n', fd) < 0) {
#elif defined(USE_CRNL)
if (putc('\r', fd) < 0 || putc('\n', fd) < 0) {
#else
if (putc('\n', fd) < 0) { if (putc('\n', fd) < 0) {
#endif
return FAIL; return FAIL;
} }
return OK; return OK;
} }
/* // TODO(justinmk): remove this, not needed after 5ba3cecb68cd.
* Write a line to "fd".
* Return FAIL for a write error.
*/
int put_line(FILE *fd, char *s) int put_line(FILE *fd, char *s)
{ {
if (fputs(s, fd) < 0 || put_eol(fd) == FAIL) if (fprintf(fd, "%s\n", s) < 0) {
return FAIL; return FAIL;
}
return OK; return OK;
} }

4
src/nvim/option_defs.h
View File

@ -577,8 +577,8 @@ static char *(p_ssop_values[]) = {
# define SSOP_HELP 0x040 # define SSOP_HELP 0x040
# define SSOP_BLANK 0x080 # define SSOP_BLANK 0x080
# define SSOP_GLOBALS 0x100 # define SSOP_GLOBALS 0x100
# define SSOP_SLASH 0x200 # define SSOP_SLASH 0x200 // Deprecated, always set.
# define SSOP_UNIX 0x400 # define SSOP_UNIX 0x400 // Deprecated, always set.
# define SSOP_SESDIR 0x800 # define SSOP_SESDIR 0x800
# define SSOP_CURDIR 0x1000 # define SSOP_CURDIR 0x1000
# define SSOP_FOLDS 0x2000 # define SSOP_FOLDS 0x2000

26
test/functional/ex_cmds/mksession_spec.lua
View File

@ -26,6 +26,27 @@ describe(':mksession', function()
rmdir(tab_dir) rmdir(tab_dir)
end) end)
it('restores same :terminal buf in splits', function()
-- If the same :terminal is displayed in multiple windows, :mksession
-- should restore it as such.
-- Create two windows showing the same :terminal buffer.
command('terminal')
command('split')
command('terminal')
command('split')
command('mksession '..session_file)
-- Create a new test instance of Nvim.
command('qall!')
clear()
-- Restore session.
command('source '..session_file)
eq({3,3,2},
{funcs.winbufnr(1), funcs.winbufnr(2), funcs.winbufnr(3)})
end)
it('restores tab-local working directories', function() it('restores tab-local working directories', function()
local tmpfile_base = file_prefix .. '-tmpfile' local tmpfile_base = file_prefix .. '-tmpfile'
local cwd_dir = funcs.getcwd() local cwd_dir = funcs.getcwd()
@ -75,7 +96,8 @@ describe(':mksession', function()
it('restores CWD for :terminal buffers #11288', function() it('restores CWD for :terminal buffers #11288', function()
local cwd_dir = funcs.fnamemodify('.', ':p:~'):gsub([[[\/]*$]], '') local cwd_dir = funcs.fnamemodify('.', ':p:~'):gsub([[[\/]*$]], '')
local session_path = cwd_dir..get_pathsep()..session_file cwd_dir = cwd_dir:gsub([[\]], '/') -- :mksession always uses unix slashes.
local session_path = cwd_dir..'/'..session_file
command('cd '..tab_dir) command('cd '..tab_dir)
command('terminal echo $PWD') command('terminal echo $PWD')
@ -87,7 +109,7 @@ describe(':mksession', function()
clear() clear()
command('silent source '..session_path) command('silent source '..session_path)
local expected_cwd = cwd_dir..get_pathsep()..tab_dir local expected_cwd = cwd_dir..'/'..tab_dir
matches('^term://'..pesc(expected_cwd)..'//%d+:', funcs.expand('%')) matches('^term://'..pesc(expected_cwd)..'//%d+:', funcs.expand('%'))
command('qall!') command('qall!')
end) end)

2
test/functional/helpers.lua
View File

@ -794,7 +794,7 @@ function module.alter_slashes(obj)
end end
return ret return ret
else else
assert(false, 'Could only alter slashes for tables of strings and strings') assert(false, 'expected string or table of strings, got '..type(obj))
end end
end end