diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-02-28 17:39:23 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-01 14:47:49 +0100 |
| commit | 4306e5ae0c2a31ea6798af41f7033771af9af6d5 (patch) | |
| tree | 2b17ca4039a40e2daa4918c71ac808e18bd31bf7 | |
| parent | 3aedf9d669370165d9fdc0d8132e2d9e3c5231c1 (diff) | |
| download | rneovim-4306e5ae0c2a31ea6798af41f7033771af9af6d5.tar.gz rneovim-4306e5ae0c2a31ea6798af41f7033771af9af6d5.tar.bz2 rneovim-4306e5ae0c2a31ea6798af41f7033771af9af6d5.zip | |
test: luacheck update
We pull luacheck HEAD, so this is a "catch up" commit to fix
newly-discovered errors.
| -rw-r--r-- | test/.luacheckrc | 4 | ||||
| -rw-r--r-- | test/functional/legacy/007_ball_buffer_list_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/legacy/054_buffer_local_autocommands_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/legacy/074_global_var_in_viminfo_spec.lua | 4 | ||||
| -rw-r--r-- | test/unit/api/helpers.lua | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/test/.luacheckrc b/test/.luacheckrc index 1c98d096a4..034b4f10df 100644 --- a/test/.luacheckrc +++ b/test/.luacheckrc @@ -12,5 +12,9 @@ self = false -- Rerun tests only if their modification time changed. cache = true +ignore = { + "631", -- max_line_length +} + -- Ignore whitespace issues in converted Vim legacy tests. files["functional/legacy"] = {ignore = { "611", "612", "613", "621" }} diff --git a/test/functional/legacy/007_ball_buffer_list_spec.lua b/test/functional/legacy/007_ball_buffer_list_spec.lua index 07e3fe6e7a..e54525fd06 100644 --- a/test/functional/legacy/007_ball_buffer_list_spec.lua +++ b/test/functional/legacy/007_ball_buffer_list_spec.lua @@ -40,7 +40,7 @@ describe(':ball', function() -- Write contents of this file execute('%yank A') - -- Append contents of second window (Xxx1) + -- Append contents of second window (Xxx1) feed('') execute('%yank A') diff --git a/test/functional/legacy/054_buffer_local_autocommands_spec.lua b/test/functional/legacy/054_buffer_local_autocommands_spec.lua index 494ea8f927..1f7c4dee6a 100644 --- a/test/functional/legacy/054_buffer_local_autocommands_spec.lua +++ b/test/functional/legacy/054_buffer_local_autocommands_spec.lua @@ -13,7 +13,7 @@ describe('BufLeave <buffer>', function() execute('au BufLeave <buffer> update') -- Here, autocommand for xx shall append a line - -- But autocommand shall not apply to buffer named <buffer> + -- But autocommand shall not apply to buffer named <buffer> execute('e somefile') -- Here, autocommand shall be auto-deleted diff --git a/test/functional/legacy/074_global_var_in_viminfo_spec.lua b/test/functional/legacy/074_global_var_in_viminfo_spec.lua index 2fc30c9d83..e8292db8c1 100644 --- a/test/functional/legacy/074_global_var_in_viminfo_spec.lua +++ b/test/functional/legacy/074_global_var_in_viminfo_spec.lua @@ -31,8 +31,8 @@ describe('storing global variables in ShaDa files', function() 'set visualbell', 'set shada+=!', "let MY_GLOBAL_DICT={'foo': 1, 'bar': 0, 'longvarible': 1000}", - -- Store a really long list. Initially this was testing line wrapping in - -- viminfo, but shada files has no line wrapping, no matter how long the + -- Store a really long list. Initially this was testing line wrapping in + -- viminfo, but shada files has no line wrapping, no matter how long the -- list is. 'let MY_GLOBAL_LIST=range(1,100)' ) diff --git a/test/unit/api/helpers.lua b/test/unit/api/helpers.lua index 883e1c6c19..166456d2a1 100644 --- a/test/unit/api/helpers.lua +++ b/test/unit/api/helpers.lua @@ -106,7 +106,8 @@ local lua2obj_type_tab = { api.xmalloc(len * ffi.sizeof('KeyValuePair'))), }}) for i = 1, len do - local key, val = table.unpack(kvs[i]) + local table_unpack = table.unpack or unpack -- luacheck: compat + local key, val = table_unpack(kvs[i]) dct.data.dictionary.items[i - 1] = ffi.new( 'KeyValuePair', {key=ffi.gc(lua2obj(key), nil).data.string, value=ffi.gc(lua2obj(val), nil)}) |