mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 07:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval,functests: Fix linter errors

Browse Source
This commit is contained in:
ZyX
2017-01-30 03:35:45 +03:00
parent d13fdfd446
commit a24e94215e
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/eval.c
View File

@@ -12363,8 +12363,8 @@ static void f_input(typval_T *argvars, typval_T *rettv, FunPtr fptr)
argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN
? (const char *)get_tv_string_buf(&argvars[2], (char_u *)xp_name_buf)
: NULL);
if (prompt == NULL || initval == NULL || (
argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN
if (prompt == NULL || initval == NULL
|| (argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN
&& xp_name == NULL)) {
return;
}
@@ -12389,8 +12389,8 @@ static void f_inputdialog(typval_T *argvars, typval_T *rettv, FunPtr fptr)
argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN
? (const char *)get_tv_string_buf(&argvars[2], (char_u *)cancelval_buf)
: NULL);
if (prompt == NULL || initval == NULL || (
argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN
if (prompt == NULL || initval == NULL
|| (argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN
&& cancelval == NULL)) {
return;
}

15
test/functional/lua/overrides_spec.lua
View File

@@ -79,14 +79,13 @@ describe('debug.debug', function()
})
end)
it('works', function()
write_file(fname, [[
command([[lua
function Test(a)
print(a)
debug.debug()
print(a * 100)
end
]])
eq('', redir_exec('luafile ' .. fname))
feed(':lua Test()\n')
screen:expect([[
{0:~ }|
@@ -133,9 +132,9 @@ describe('debug.debug', function()
lua_debug> print("TEST") |
TEST |
|
{E:E5105: Error while calling lua chunk: Xtest-functiona}|
{E:l-lua-overrides-luafile:4: attempt to perform arithme}|
{E:tic on local 'a' (a nil value)} |
{E:E5105: Error while calling lua chunk: [string "<VimL }|
{E:compiled string>"]:5: attempt to perform arithmetic o}|
{E:n local 'a' (a nil value)} |
Interrupt: {cr:Press ENTER or type command to continue}^ |
]])
feed('<C-l>:lua Test()\n')
@@ -167,9 +166,9 @@ describe('debug.debug', function()
{0:~ }|
nil |
lua_debug> |
{E:E5105: Error while calling lua chunk: Xtest-functiona}|
{E:l-lua-overrides-luafile:4: attempt to perform arithme}|
{E:tic on local 'a' (a nil value)} |
{E:E5105: Error while calling lua chunk: [string "<VimL }|
{E:compiled string>"]:5: attempt to perform arithmetic o}|
{E:n local 'a' (a nil value)} |
{cr:Press ENTER or type command to continue}^ |
]])
end)