diff options
| -rw-r--r-- | runtime/doc/news.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 2 | ||||
| -rw-r--r-- | src/nvim/main.c | 4 | ||||
| -rw-r--r-- | test/functional/core/startup_spec.lua | 32 |
4 files changed, 28 insertions, 13 deletions
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt index 58c338b225..61ae92296f 100644 --- a/runtime/doc/news.txt +++ b/runtime/doc/news.txt @@ -38,6 +38,9 @@ The following changes may require adaptations in user config or plugins. • When switching windows, |CursorMoved| autocommands trigger when Nvim is back in the main loop rather than immediately. This is more compatible with Vim. +• |-l| ensures output ends with a newline if the script prints messages and + doesn't cause Nvim to exit. + • |LspRequest| and LspProgressUpdate (renamed to |LspProgress|) autocmds were promoted from a |User| autocmd to first class citizen. diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 07b6bd93bd..53a14c586f 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -227,6 +227,8 @@ argument. Sets 'verbose' to 1 (like "-V1"), so Lua `print()` writes to output. + If {script} prints messages and doesn't cause Nvim to exit, + Nvim ensures output ends with a newline. Arguments before "-l" are processed before executing {script}. This example quits before executing "foo.lua": > diff --git a/src/nvim/main.c b/src/nvim/main.c index 481172e040..567d364284 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -633,6 +633,10 @@ int main(int argc, char **argv) msg_scroll = true; bool lua_ok = nlua_exec_file(params.luaf); TIME_MSG("executing Lua -l script"); + if (msg_didout) { + msg_putchar('\n'); + msg_didout = false; + } getout(lua_ok ? 0 : 1); } diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua index 3f284c5c9e..3253854093 100644 --- a/test/functional/core/startup_spec.lua +++ b/test/functional/core/startup_spec.lua @@ -131,12 +131,12 @@ describe('startup', function() end) it('executes stdin "-"', function() - assert_l_out('arg0=- args=2 whoa', + assert_l_out('arg0=- args=2 whoa\n', nil, { 'arg1', 'arg 2' }, '-', "print(('arg0=%s args=%d %s'):format(_G.arg[0], #_G.arg, 'whoa'))") - assert_l_out('biiig input: 1000042', + assert_l_out('biiig input: 1000042\n', nil, nil, '-', @@ -145,11 +145,12 @@ describe('startup', function() end) it('does not truncate long print() message', function() - assert_l_out(('k'):rep(1234), - nil, - nil, - '-', - "print(('k'):rep(1234))") + assert_l_out(('k'):rep(1234) .. '\n', nil, nil, '-', "print(('k'):rep(1234))") + end) + + it('does not add newline when unnecessary', function() + assert_l_out('', nil, nil, '-', '') + assert_l_out('foobar\n', nil, nil, '-', [[print('foobar\n')]]) end) it('sets _G.arg', function() @@ -159,7 +160,8 @@ describe('startup', function() nvim args: 3 lua args: { [0] = "test/functional/fixtures/startup.lua" - }]], + } + ]], {}, {} ) @@ -171,7 +173,8 @@ describe('startup', function() nvim args: 7 lua args: { "-arg1", "--arg2", "--", "arg3", [0] = "test/functional/fixtures/startup.lua" - }]], + } + ]], {}, { '-arg1', '--arg2', '--', 'arg3' } ) @@ -183,7 +186,8 @@ describe('startup', function() nvim args: 10 lua args: { "-arg1", "arg 2", "--", "file3", "file4", [0] = "test/functional/fixtures/startup.lua" - }]], + } + ]], { 'file1', 'file2', }, { '-arg1', 'arg 2', '--', 'file3', 'file4' } ) @@ -195,7 +199,8 @@ describe('startup', function() nvim args: 5 lua args: { "-c", "set wrap?", [0] = "test/functional/fixtures/startup.lua" - }]], + } + ]], {}, { '-c', 'set wrap?' } ) @@ -211,7 +216,8 @@ describe('startup', function() nvim args: 7 lua args: { "-c", "set wrap?", [0] = "test/functional/fixtures/startup.lua" - }]], + } + ]], { '-c', 'set wrap?' }, { '-c', 'set wrap?' } ) @@ -219,7 +225,7 @@ describe('startup', function() end) it('disables swapfile/shada/config/plugins', function() - assert_l_out('updatecount=0 shadafile=NONE loadplugins=false scripts=1', + assert_l_out('updatecount=0 shadafile=NONE loadplugins=false scripts=1\n', nil, nil, '-', |