test/functional: clean up according to luacheck (part 1)

51 files changed, 115 insertions, 137 deletions

diff --git a/test/.luacheckrc b/test/.luacheckrc
index a2771a6d55..4c8243ad7e 100644
--- a/test/.luacheckrc
+++ b/test/.luacheckrc
@@ -2,7 +2,4 @@
 
 std = '+luajit +busted'
 cache = true
-exclude_files = {
-  'benchmark/preload.lua',
-  'unit/preload.lua'
-}
+exclude_files = { '*/preload.lua' }
diff --git a/test/functional/legacy/078_swapfile_recover_spec.lua b/test/functional/legacy/078_swapfile_recover_spec.lua
index 33115c1317..21a3dadefd 100644
--- a/test/functional/legacy/078_swapfile_recover_spec.lua
+++ b/test/functional/legacy/078_swapfile_recover_spec.lua
@@ -4,8 +4,7 @@
 -- pointer blocks.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect, source = helpers.clear, helpers.execute, helpers.expect, helpers.source
+local clear, expect, source = helpers.clear, helpers.expect, helpers.source
 local eval = helpers.eval
 
 describe('78', function()
diff --git a/test/functional/legacy/080_substitute_spec.lua b/test/functional/legacy/080_substitute_spec.lua
index 89ef7a713c..96082364e0 100644
--- a/test/functional/legacy/080_substitute_spec.lua
+++ b/test/functional/legacy/080_substitute_spec.lua
@@ -3,7 +3,7 @@
 -- Test for *:s%* on :substitute.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
+local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 local eq, eval = helpers.eq, helpers.eval
 
diff --git a/test/functional/legacy/082_string_comparison_spec.lua b/test/functional/legacy/082_string_comparison_spec.lua
index 1615828ca0..933c6c8fa3 100644
--- a/test/functional/legacy/082_string_comparison_spec.lua
+++ b/test/functional/legacy/082_string_comparison_spec.lua
@@ -2,7 +2,7 @@
 -- Also test "g~ap".
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
+local feed, source = helpers.feed, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
 describe('case-insensitive string comparison in UTF-8', function()
diff --git a/test/functional/legacy/084_curswant_spec.lua b/test/functional/legacy/084_curswant_spec.lua
index 55df5d3e73..946dd5e501 100644
--- a/test/functional/legacy/084_curswant_spec.lua
+++ b/test/functional/legacy/084_curswant_spec.lua
@@ -1,8 +1,8 @@
 -- Tests for curswant not changing when setting an option.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local insert, source = helpers.insert, helpers.source
+local clear, expect = helpers.clear, helpers.expect
 
 describe('curswant', function()
   setup(clear)
diff --git a/test/functional/legacy/089_number_relnumber_findfile_spec.lua b/test/functional/legacy/089_number_relnumber_findfile_spec.lua
index 1f8e49cc81..f72ebf3f72 100644
--- a/test/functional/legacy/089_number_relnumber_findfile_spec.lua
+++ b/test/functional/legacy/089_number_relnumber_findfile_spec.lua
@@ -4,7 +4,7 @@
 
 local helpers = require('test.functional.helpers')
 local feed = helpers.feed
-local clear, execute, expect, source = helpers.clear, helpers.execute, helpers.expect, helpers.source
+local clear, expect, source = helpers.clear, helpers.expect, helpers.source
 
 describe("setting 'number' and 'relativenumber'", function()
   setup(clear)
diff --git a/test/functional/legacy/090_sha256_spec.lua b/test/functional/legacy/090_sha256_spec.lua
index 35fbd5752e..95e50063a1 100644
--- a/test/functional/legacy/090_sha256_spec.lua
+++ b/test/functional/legacy/090_sha256_spec.lua
@@ -1,8 +1,8 @@
 -- Tests for sha256() function.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local insert, source = helpers.insert, helpers.source
+local clear, expect = helpers.clear, helpers.expect
 
 describe('sha256()', function()
   setup(clear)
diff --git a/test/functional/legacy/091_context_variables_spec.lua b/test/functional/legacy/091_context_variables_spec.lua
index bb9c32b84f..ffeb0c657e 100644
--- a/test/functional/legacy/091_context_variables_spec.lua
+++ b/test/functional/legacy/091_context_variables_spec.lua
@@ -1,8 +1,8 @@
 -- Tests for getbufvar(), getwinvar(), gettabvar() and gettabwinvar().
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local insert, source = helpers.insert, helpers.source
+local clear, expect = helpers.clear, helpers.expect
 
 describe('context variables', function()
   setup(clear)
diff --git a/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua b/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua
index e0cc39dc40..f76ba25d7a 100644
--- a/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua
+++ b/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua
@@ -4,7 +4,7 @@
 -- Same as legacy test 93 but using UTF-8 file encoding.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
+local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
 describe('store cursor position in session file in UTF-8', function()
diff --git a/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua b/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua
index 659e716721..bf3af1a827 100644
--- a/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua
+++ b/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua
@@ -4,7 +4,7 @@
 -- Same as legacy test 92 but using Latin-1 file encoding.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
+local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
 describe('store cursor position in session file in Latin-1', function()
diff --git a/test/functional/legacy/095_regexp_multibyte_spec.lua b/test/functional/legacy/095_regexp_multibyte_spec.lua
index 559222e2ff..a80a247612 100644
--- a/test/functional/legacy/095_regexp_multibyte_spec.lua
+++ b/test/functional/legacy/095_regexp_multibyte_spec.lua
@@ -4,8 +4,8 @@
 -- actually tried.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local insert, source = helpers.insert, helpers.source
+local clear, expect = helpers.clear, helpers.expect
 
 describe('regex with multi-byte', function()
   setup(clear)
diff --git a/test/functional/legacy/096_location_list_spec.lua b/test/functional/legacy/096_location_list_spec.lua
index 2ccfd3530d..6e2f22ea33 100644
--- a/test/functional/legacy/096_location_list_spec.lua
+++ b/test/functional/legacy/096_location_list_spec.lua
@@ -7,7 +7,7 @@
 --    it belongs to.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
+local source = helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
 describe('location list', function()
diff --git a/test/functional/legacy/097_glob_path_spec.lua b/test/functional/legacy/097_glob_path_spec.lua
index 84f26478ac..5c467fbb20 100644
--- a/test/functional/legacy/097_glob_path_spec.lua
+++ b/test/functional/legacy/097_glob_path_spec.lua
@@ -3,7 +3,7 @@
 -- characters.
 
 local helpers = require('test.functional.helpers')
-local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
 describe('glob() and globpath()', function()
diff --git a/test/functional/legacy/098_scrollbind_spec.lua b/test/functional/legacy/098_scrollbind_spec.lua
index 7b2059e38b..6850e373ab 100644
--- a/test/functional/legacy/098_scrollbind_spec.lua
+++ b/test/functional/legacy/098_scrollbind_spec.lua
@@ -1,8 +1,8 @@
 -- Test for 'scrollbind' causing an unexpected scroll of one of the windows.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local source = helpers.source
+local clear, expect = helpers.clear, helpers.expect
 
 describe('scrollbind', function()
   setup(clear)
diff --git a/test/functional/legacy/100_undo_level_spec.lua b/test/functional/legacy/100_undo_level_spec.lua
index 9143d9e540..3bf72341d6 100644
--- a/test/functional/legacy/100_undo_level_spec.lua
+++ b/test/functional/legacy/100_undo_level_spec.lua
@@ -1,8 +1,8 @@
 -- Tests for 'undolevel' setting being global-local
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local source = helpers.source
+local clear, expect = helpers.clear, helpers.expect
 
 describe('undolevel', function()
   setup(clear)
diff --git a/test/functional/legacy/101_hlsearch_spec.lua b/test/functional/legacy/101_hlsearch_spec.lua
index 4b8b1cef50..335d275c2a 100644
--- a/test/functional/legacy/101_hlsearch_spec.lua
+++ b/test/functional/legacy/101_hlsearch_spec.lua
@@ -1,9 +1,8 @@
 -- Test for v:hlsearch
 
 local helpers = require('test.functional.helpers')
-local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local clear, feed = helpers.clear, helpers.feed
 local execute, expect = helpers.execute, helpers.expect
-local eval = helpers.eval
 
 describe('v:hlsearch', function()
   setup(clear)
diff --git a/test/functional/legacy/102_fnameescape_spec.lua b/test/functional/legacy/102_fnameescape_spec.lua
index 251ce68430..a3b0313d7a 100644
--- a/test/functional/legacy/102_fnameescape_spec.lua
+++ b/test/functional/legacy/102_fnameescape_spec.lua
@@ -1,7 +1,7 @@
 -- Test if fnameescape is correct for special chars like!
 
 local helpers = require('test.functional.helpers')
-local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
 describe('fnameescape', function()
diff --git a/test/functional/legacy/103_visual_mode_reset_spec.lua b/test/functional/legacy/103_visual_mode_reset_spec.lua
index 6b2f3bc1b6..c1407ef10a 100644
--- a/test/functional/legacy/103_visual_mode_reset_spec.lua
+++ b/test/functional/legacy/103_visual_mode_reset_spec.lua
@@ -1,8 +1,8 @@
 -- Test for visual mode not being reset causing E315 error.
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local feed, source = helpers.feed, helpers.source
+local clear, expect = helpers.clear, helpers.expect
 
 describe('E315 error', function()
   setup(clear)
diff --git a/test/functional/legacy/105_filename_modifiers_spec.lua b/test/functional/legacy/105_filename_modifiers_spec.lua
index 3b417a88eb..3413667022 100644
--- a/test/functional/legacy/105_filename_modifiers_spec.lua
+++ b/test/functional/legacy/105_filename_modifiers_spec.lua
@@ -1,7 +1,7 @@
 -- Test filename modifiers.
 
 local helpers = require('test.functional.helpers')
-local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
 describe('filename modifiers', function()
diff --git a/test/functional/legacy/106_errorformat_spec.lua b/test/functional/legacy/106_errorformat_spec.lua
index 5b6037f928..5958f1aa7b 100644
--- a/test/functional/legacy/106_errorformat_spec.lua
+++ b/test/functional/legacy/106_errorformat_spec.lua
@@ -1,7 +1,7 @@
 -- Tests for errorformat.
 
 local helpers = require('test.functional.helpers')
-local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
 describe('errorformat', function()
diff --git a/test/functional/legacy/107_adjust_window_and_contents_spec.lua b/test/functional/legacy/107_adjust_window_and_contents_spec.lua
index f6ea7e5a6c..7a6de3d748 100644
--- a/test/functional/legacy/107_adjust_window_and_contents_spec.lua
+++ b/test/functional/legacy/107_adjust_window_and_contents_spec.lua
@@ -2,8 +2,8 @@
 
 local helpers = require('test.functional.helpers')
 local Screen = require('test.functional.ui.screen')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local insert = helpers.insert
+local clear, execute = helpers.clear, helpers.execute
 
 describe('107', function()
   setup(clear)
diff --git a/test/functional/legacy/listlbr_utf8_spec.lua b/test/functional/legacy/listlbr_utf8_spec.lua
index 15d12ac4af..69e7b87a21 100644
--- a/test/functional/legacy/listlbr_utf8_spec.lua
+++ b/test/functional/legacy/listlbr_utf8_spec.lua
@@ -1,8 +1,8 @@
 -- Test for linebreak and list option in utf-8 mode
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local source = helpers.source
+local clear, expect = helpers.clear, helpers.expect
 
 describe('linebreak', function()
   setup(clear)
diff --git a/test/functional/legacy/nested_function_spec.lua b/test/functional/legacy/nested_function_spec.lua
index 87371c8294..fac3b03191 100644
--- a/test/functional/legacy/nested_function_spec.lua
+++ b/test/functional/legacy/nested_function_spec.lua
@@ -1,7 +1,7 @@
 -- Tests for nested function.
 
 local helpers = require('test.functional.helpers')
-local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local clear, insert = helpers.clear, helpers.insert
 local execute, expect, source = helpers.execute, helpers.expect, helpers.source
 
 describe('test_nested_function', function()
diff --git a/test/functional/legacy/qf_title_spec.lua b/test/functional/legacy/qf_title_spec.lua
index aa005117be..01c781cc05 100644
--- a/test/functional/legacy/qf_title_spec.lua
+++ b/test/functional/legacy/qf_title_spec.lua
@@ -1,8 +1,8 @@
 -- Tests for quickfix window's title
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local insert, source = helpers.insert, helpers.source
+local clear, expect = helpers.clear, helpers.expect
 
 describe('qf_title', function()
   setup(clear)
diff --git a/test/functional/legacy/signs_spec.lua b/test/functional/legacy/signs_spec.lua
index 89b2bf3b73..5a834c39e3 100644
--- a/test/functional/legacy/signs_spec.lua
+++ b/test/functional/legacy/signs_spec.lua
@@ -1,7 +1,6 @@
 -- Tests for signs
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
 describe('signs', function()
diff --git a/test/functional/legacy/writefile_spec.lua b/test/functional/legacy/writefile_spec.lua
index e7a260bcd9..efdfc1d09f 100644
--- a/test/functional/legacy/writefile_spec.lua
+++ b/test/functional/legacy/writefile_spec.lua
@@ -1,7 +1,6 @@
 -- Tests for writefile()
 
 local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
 describe('writefile', function()
diff --git a/test/functional/normal/K_spec.lua b/test/functional/normal/K_spec.lua
index dbda6dcb93..df6b429f50 100644
--- a/test/functional/normal/K_spec.lua
+++ b/test/functional/normal/K_spec.lua
@@ -1,7 +1,6 @@
 local helpers = require('test.functional.helpers')
-local execute, eq, clear, eval, feed, ok =
-  helpers.execute, helpers.eq, helpers.clear, helpers.eval,
-  helpers.feed, helpers.ok
+local eq, clear, eval, feed =
+  helpers.eq, helpers.clear, helpers.eval, helpers.feed
 
 describe('K', function()
   local test_file = 'K_spec_out'
diff --git a/test/functional/provider/define_spec.lua b/test/functional/provider/define_spec.lua
index 9b97ed84d9..6e8a3b89cd 100644
--- a/test/functional/provider/define_spec.lua
+++ b/test/functional/provider/define_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')
 local eval, command, nvim = helpers.eval, helpers.command, helpers.nvim
 local eq, run, stop = helpers.eq, helpers.run, helpers.stop
-local clear, feed = helpers.clear, helpers.feed
+local clear = helpers.clear
 
 
 local function get_prefix(sync)
@@ -12,8 +12,8 @@ local function get_prefix(sync)
 end
 
 
-local function call(fn, args)
-  command('call '..fn..'('..args..')')
+local function call(fn, arguments)
+  command('call '..fn..'('..arguments..')')
 end
 
 
@@ -87,9 +87,9 @@ local function command_specs_for(fn, sync, first_arg_factory, init)
             command('RpcCommand arg1 arg2 arg3')
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq({'arg1', 'arg2', 'arg3'}, args[1])
+            eq({'arg1', 'arg2', 'arg3'}, arguments[1])
             return ''
           end
 
@@ -104,9 +104,9 @@ local function command_specs_for(fn, sync, first_arg_factory, init)
             command('1,1RpcCommand')
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq({1, 1}, args[1])
+            eq({1, 1}, arguments[1])
             return ''
           end
 
@@ -121,10 +121,10 @@ local function command_specs_for(fn, sync, first_arg_factory, init)
             command('1,1RpcCommand arg')
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq({'arg'}, args[1])
-            eq({1, 1}, args[2])
+            eq({'arg'}, arguments[1])
+            eq({1, 1}, arguments[2])
             return ''
           end
 
@@ -139,10 +139,10 @@ local function command_specs_for(fn, sync, first_arg_factory, init)
             command('5RpcCommand arg')
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq({'arg'}, args[1])
-            eq(5, args[2])
+            eq({'arg'}, arguments[1])
+            eq(5, arguments[2])
             return ''
           end
 
@@ -157,11 +157,11 @@ local function command_specs_for(fn, sync, first_arg_factory, init)
             command('5RpcCommand! arg')
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq({'arg'}, args[1])
-            eq(5, args[2])
-            eq(1, args[3])
+            eq({'arg'}, arguments[1])
+            eq(5, arguments[2])
+            eq(1, arguments[3])
             return ''
           end
 
@@ -177,12 +177,12 @@ local function command_specs_for(fn, sync, first_arg_factory, init)
             command('5RpcCommand! b arg')
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq({'arg'}, args[1])
-            eq(5, args[2])
-            eq(1, args[3])
-            eq('b', args[4])
+            eq({'arg'}, arguments[1])
+            eq(5, arguments[2])
+            eq(1, arguments[3])
+            eq('b', arguments[4])
             return ''
           end
 
@@ -199,13 +199,13 @@ local function command_specs_for(fn, sync, first_arg_factory, init)
             command('5RpcCommand! b arg')
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq({'arg'}, args[1])
-            eq(5, args[2])
-            eq(1, args[3])
-            eq('b', args[4])
-            eq('regb', args[5])
+            eq({'arg'}, arguments[1])
+            eq(5, arguments[2])
+            eq(1, arguments[3])
+            eq('b', arguments[4])
+            eq('regb', arguments[5])
             return ''
           end
 
@@ -243,7 +243,7 @@ local function autocmd_specs_for(fn, sync, first_arg_factory, init)
             command('doautocmd BufEnter x.c')
           end
 
-          local function handler(method, args)
+          local function handler(method)
             eq('test-handler', method)
             return ''
           end
@@ -259,9 +259,9 @@ local function autocmd_specs_for(fn, sync, first_arg_factory, init)
             command('doautocmd BufEnter x.c')
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq('x.c', args[1])
+            eq('x.c', arguments[1])
             return ''
           end
 
@@ -303,9 +303,9 @@ local function function_specs_for(fn, sync, first_arg_factory, init)
             end
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq({{1, 'a', {'b', 'c'}}}, args)
+            eq({{1, 'a', {'b', 'c'}}}, arguments)
             return 'rv'
           end
 
@@ -324,9 +324,9 @@ local function function_specs_for(fn, sync, first_arg_factory, init)
             end
           end
 
-          local function handler(method, args)
+          local function handler(method, arguments)
             eq('test-handler', method)
-            eq({{1, 'a', {'b', 'c'}}, 4}, args)
+            eq({{1, 'a', {'b', 'c'}}, 4}, arguments)
             return 'rv'
           end
 
diff --git a/test/functional/server/server_spec.lua b/test/functional/server/server_spec.lua
index 1cb3c879b9..d9ce96057e 100644
--- a/test/functional/server/server_spec.lua
+++ b/test/functional/server/server_spec.lua
@@ -1,7 +1,6 @@
 
 local helpers = require('test.functional.helpers')
-local nvim, eq, neq, ok, eval
-  = helpers.nvim, helpers.eq, helpers.neq, helpers.ok, helpers.eval
+local nvim, eq, neq, eval = helpers.nvim, helpers.eq, helpers.neq, helpers.eval
 local clear = helpers.clear
 
 describe('serverstart(), serverstop()', function()
diff --git a/test/functional/shada/buffers_spec.lua b/test/functional/shada/buffers_spec.lua
index 3666b718f0..fd0c5e9a39 100644
--- a/test/functional/shada/buffers_spec.lua
+++ b/test/functional/shada/buffers_spec.lua
@@ -9,8 +9,8 @@ local reset, set_additional_cmd, clear =
   shada_helpers.clear
 
 describe('ShaDa support code', function()
-  testfilename = 'Xtestfile-functional-shada-buffers'
-  testfilename_2 = 'Xtestfile-functional-shada-buffers-2'
+  local testfilename = 'Xtestfile-functional-shada-buffers'
+  local testfilename_2 = 'Xtestfile-functional-shada-buffers-2'
   before_each(reset)
   after_each(clear)
 
diff --git a/test/functional/shada/compatibility_spec.lua b/test/functional/shada/compatibility_spec.lua
index 342dee377b..2ca0b16e75 100644
--- a/test/functional/shada/compatibility_spec.lua
+++ b/test/functional/shada/compatibility_spec.lua
@@ -4,9 +4,8 @@ local nvim_command, funcs, eq = helpers.command, helpers.funcs, helpers.eq
 local exc_exec = helpers.exc_exec
 
 local shada_helpers = require('test.functional.shada.helpers')
-local reset, set_additional_cmd, clear, get_shada_rw =
-  shada_helpers.reset, shada_helpers.set_additional_cmd,
-  shada_helpers.clear, shada_helpers.get_shada_rw
+local reset, clear, get_shada_rw = shada_helpers.reset, shada_helpers.clear,
+  shada_helpers.get_shada_rw
 local read_shada_file = shada_helpers.read_shada_file
 
 local wshada, sdrcmd, shada_fname = get_shada_rw('Xtest-functional-shada-compatibility.shada')
@@ -181,7 +180,7 @@ describe('ShaDa forward compatibility support code', function()
         end
         eq(3, found)
         nvim_command('wshada! ' .. shada_fname)
-        local found = 0
+        found = 0
         for i, subv in ipairs(read_shada_file(shada_fname)) do
           if i == 1 then
             eq(1, subv.type)
@@ -249,7 +248,7 @@ describe('ShaDa forward compatibility support code', function()
     end
     eq(1, found)
     nvim_command('wshada! ' .. shada_fname)
-    local found = 0
+    found = 0
     for i, v in ipairs(read_shada_file(shada_fname)) do
       if i == 1 then
         eq(1, v.type)
@@ -289,7 +288,7 @@ describe('ShaDa forward compatibility support code', function()
     end
     eq(1, found)
     nvim_command('wshada! ' .. shada_fname)
-    local found = 0
+    found = 0
     for i, v in ipairs(read_shada_file(shada_fname)) do
       if i == 1 then
         eq(1, v.type)
@@ -395,7 +394,7 @@ describe('ShaDa forward compatibility support code', function()
     end
     eq(1, found)
     nvim_command('wshada! ' .. shada_fname)
-    local found = 0
+    found = 0
     for i, v in ipairs(read_shada_file(shada_fname)) do
       if i == 1 then
         eq(1, v.type)
@@ -432,7 +431,7 @@ describe('ShaDa forward compatibility support code', function()
     end
     eq(1, found)
     nvim_command('wshada! ' .. shada_fname)
-    local found = 0
+    found = 0
     for i, v in ipairs(read_shada_file(shada_fname)) do
       if i == 1 then
         eq(1, v.type)
diff --git a/test/functional/shada/helpers.lua b/test/functional/shada/helpers.lua
index c2ff4cadd1..146ae8d51e 100644
--- a/test/functional/shada/helpers.lua
+++ b/test/functional/shada/helpers.lua
@@ -9,15 +9,14 @@ local tmpname = os.tmpname()
 local additional_cmd = ''
 
 local function nvim_argv()
-  local ret
-  local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', tmpname, '-N',
-                     '--cmd', 'set shortmess+=I background=light noswapfile',
-                     '--cmd', additional_cmd,
-                     '--embed'}
+  local argv = {nvim_prog, '-u', 'NONE', '-i', tmpname, '-N',
+                '--cmd', 'set shortmess+=I background=light noswapfile',
+                '--cmd', additional_cmd,
+                '--embed'}
   if helpers.prepend_argv then
-    return merge_args(helpers.prepend_argv, nvim_argv)
+    return merge_args(helpers.prepend_argv, argv)
   else
-    return nvim_argv
+    return argv
   end
 end
 
@@ -88,7 +87,6 @@ return {
   reset=reset,
   set_additional_cmd=set_additional_cmd,
   clear=clear,
-  exc_exec=exc_exec,
   get_shada_rw=get_shada_rw,
   read_shada_file=read_shada_file,
 }
diff --git a/test/functional/shada/marks_spec.lua b/test/functional/shada/marks_spec.lua
index 6818844ebd..955a6f382b 100644
--- a/test/functional/shada/marks_spec.lua
+++ b/test/functional/shada/marks_spec.lua
@@ -15,15 +15,15 @@ local nvim_current_line = function()
 end
 
 describe('ShaDa support code', function()
-  testfilename = 'Xtestfile-functional-shada-marks'
-  testfilename_2 = 'Xtestfile-functional-shada-marks-2'
+  local testfilename = 'Xtestfile-functional-shada-marks'
+  local testfilename_2 = 'Xtestfile-functional-shada-marks-2'
   before_each(function()
     reset()
     local fd = io.open(testfilename, 'w')
     fd:write('test\n')
     fd:write('test2\n')
     fd:close()
-    local fd = io.open(testfilename_2, 'w')
+    fd = io.open(testfilename_2, 'w')
     fd:write('test3\n')
     fd:write('test4\n')
     fd:close()
@@ -115,7 +115,7 @@ describe('ShaDa support code', function()
     eq(tf_full, oldfiles[1])
     eq(tf_full_2, oldfiles[2])
     nvim_command('rshada!')
-    local oldfiles = meths.get_vvar('oldfiles')
+    oldfiles = meths.get_vvar('oldfiles')
     table.sort(oldfiles)
     eq(2, #oldfiles)
     eq(testfilename, oldfiles[1]:sub(-#testfilename))
diff --git a/test/functional/shada/merging_spec.lua b/test/functional/shada/merging_spec.lua
index 7066ca9f54..221f989409 100644
--- a/test/functional/shada/merging_spec.lua
+++ b/test/functional/shada/merging_spec.lua
@@ -1,7 +1,7 @@
 -- ShaDa merging data support
 local helpers = require('test.functional.helpers')
-local nvim_command, meths, funcs, curbufmeths, eq =
-  helpers.command, helpers.meths, helpers.funcs,
+local nvim_command, funcs, curbufmeths, eq =
+  helpers.command, helpers.funcs,
   helpers.curbufmeths, helpers.eq
 local exc_exec, redir_exec = helpers.exc_exec, helpers.redir_exec
 
@@ -870,7 +870,7 @@ describe('ShaDa jumps support code', function()
     end
     wshada(shada)
     eq(0, exc_exec(sdrcmd()))
-    local shada = ''
+    shada = ''
     for i = 1,101 do
       local t = i * 2
       shada = shada .. (
@@ -964,7 +964,7 @@ describe('ShaDa changes support code', function()
     end
     wshada(shada)
     eq(0, exc_exec(sdrcmd()))
-    local shada = ''
+    shada = ''
     for i = 1,101 do
       local t = i * 2
       shada = shada .. (
@@ -1001,7 +1001,7 @@ describe('ShaDa changes support code', function()
     end
     wshada(shada)
     eq(0, exc_exec(sdrcmd()))
-    local shada = ''
+    shada = ''
     for i = 1,100 do
       shada = shada .. ('\011%c\018\131\162mX\195\161f\196\006/a/b/c\161l%c'
                        ):format(i, i)
diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/shell/viml_system_spec.lua
index 4985c24aec..00b16e9158 100644
--- a/test/functional/shell/viml_system_spec.lua
+++ b/test/functional/shell/viml_system_spec.lua
@@ -133,7 +133,7 @@ describe('system()', function()
       -- write more than 1mb of data, which should be enough to overcome
       -- the os buffer limit and force multiple event loop iterations to write
       -- everything
-      for i = 1, 0xffff do
+      for _ = 1, 0xffff do
         input[#input + 1] = '01234567890ABCDEFabcdef'
       end
       input = table.concat(input, '\n')
@@ -299,7 +299,7 @@ describe('systemlist()', function()
   describe('passing a lot of input', function()
     it('returns the program output', function()
       local input = {}
-      for i = 1, 0xffff do
+      for _ = 1, 0xffff do
         input[#input + 1] = '01234567890ABCDEFabcdef'
       end
       nvim('set_var', 'input', input)
diff --git a/test/functional/terminal/altscreen_spec.lua b/test/functional/terminal/altscreen_spec.lua
index 9ec0fc7c5a..d9d96b25f9 100644
--- a/test/functional/terminal/altscreen_spec.lua
+++ b/test/functional/terminal/altscreen_spec.lua
@@ -1,6 +1,5 @@
 local helpers = require('test.functional.helpers')
 local thelpers = require('test.functional.terminal.helpers')
-local Screen = require('test.functional.ui.screen')
 local clear, eq, curbuf = helpers.clear, helpers.eq, helpers.curbuf
 local feed = helpers.feed
 local feed_data = thelpers.feed_data
diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua
index ffdfec4428..55ef254a63 100644
--- a/test/functional/terminal/buffer_spec.lua
+++ b/test/functional/terminal/buffer_spec.lua
@@ -1,5 +1,4 @@
 local helpers = require('test.functional.helpers')
-local Screen = require('test.functional.ui.screen')
 local thelpers = require('test.functional.terminal.helpers')
 local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
 local wait = helpers.wait
diff --git a/test/functional/terminal/cursor_spec.lua b/test/functional/terminal/cursor_spec.lua
index 7f07467fde..e9cb010003 100644
--- a/test/functional/terminal/cursor_spec.lua
+++ b/test/functional/terminal/cursor_spec.lua
@@ -2,7 +2,7 @@ local helpers = require('test.functional.helpers')
 local Screen = require('test.functional.ui.screen')
 local thelpers = require('test.functional.terminal.helpers')
 local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
-local nvim_dir, execute, eq = helpers.nvim_dir, helpers.execute, helpers.eq
+local nvim_dir, execute = helpers.nvim_dir, helpers.execute
 local hide_cursor = thelpers.hide_cursor
 local show_cursor = thelpers.show_cursor
 
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index 611ba55793..493539b4d3 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -2,8 +2,7 @@ local helpers = require('test.functional.helpers')
 local Screen = require('test.functional.ui.screen')
 local clear, wait, nvim = helpers.clear, helpers.wait, helpers.nvim
 local nvim_dir = helpers.nvim_dir
-local execute, source = helpers.execute, helpers.source
-local eq, neq = helpers.eq, helpers.neq
+local execute = helpers.execute
 
 describe(':terminal', function()
   local screen
diff --git a/test/functional/terminal/helpers.lua b/test/functional/terminal/helpers.lua
index ae13aab277..a32ae650d6 100644
--- a/test/functional/terminal/helpers.lua
+++ b/test/functional/terminal/helpers.lua
@@ -72,7 +72,7 @@ local function screen_setup(extra_height, command)
       empty_line,
       empty_line,
     }
-    for i = 1, extra_height do
+    for _ = 1, extra_height do
       table.insert(expected, empty_line)
     end
 
diff --git a/test/functional/terminal/highlight_spec.lua b/test/functional/terminal/highlight_spec.lua
index 1a96cb4dba..045f5aa42f 100644
--- a/test/functional/terminal/highlight_spec.lua
+++ b/test/functional/terminal/highlight_spec.lua
@@ -40,7 +40,7 @@ describe('terminal window highlighting', function()
     ]])
   end)
 
-  function descr(title, attr_num, set_attrs_fn)
+  local function descr(title, attr_num, set_attrs_fn)
     local function sub(s)
       return s:gsub('NUM', attr_num)
     end
diff --git a/test/functional/terminal/mouse_spec.lua b/test/functional/terminal/mouse_spec.lua
index ac61abebcb..c4bd3c2663 100644
--- a/test/functional/terminal/mouse_spec.lua
+++ b/test/functional/terminal/mouse_spec.lua
@@ -1,8 +1,7 @@
-local Screen = require('test.functional.ui.screen')
 local helpers = require('test.functional.helpers')
 local thelpers = require('test.functional.terminal.helpers')
-local clear, eq, curbuf = helpers.clear, helpers.eq, helpers.curbuf
-local feed, execute, nvim = helpers.feed, helpers.execute, helpers.nvim
+local clear = helpers.clear
+local feed, nvim = helpers.feed, helpers.nvim
 local feed_data = thelpers.feed_data
 
 describe('terminal mouse', function()
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 3c79bc1fdb..0ace24ee0f 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -1,6 +1,5 @@
 -- Some sanity checks for the TUI using the builtin terminal emulator
 -- as a simple way to send keys and assert screen state.
-local Screen = require('test.functional.ui.screen')
 local helpers = require('test.functional.helpers')
 local thelpers = require('test.functional.terminal.helpers')
 local feed = thelpers.feed_data
diff --git a/test/functional/terminal/window_spec.lua b/test/functional/terminal/window_spec.lua
index c2b9390a11..6c236ed868 100644
--- a/test/functional/terminal/window_spec.lua
+++ b/test/functional/terminal/window_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')
 local thelpers = require('test.functional.terminal.helpers')
-local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
-local wait, eq = helpers.wait, helpers.eq
+local feed, clear = helpers.feed, helpers.clear
+local wait = helpers.wait
 
 
 describe('terminal window', function()
diff --git a/test/functional/terminal/window_split_tab_spec.lua b/test/functional/terminal/window_split_tab_spec.lua
index c102b1f133..727eba2717 100644
--- a/test/functional/terminal/window_split_tab_spec.lua
+++ b/test/functional/terminal/window_split_tab_spec.lua
@@ -1,8 +1,7 @@
 local helpers = require('test.functional.helpers')
 local thelpers = require('test.functional.terminal.helpers')
-local clear, eq, curbuf = helpers.clear, helpers.eq, helpers.curbuf
+local clear = helpers.clear
 local feed, nvim = helpers.feed, helpers.nvim
-local feed_data = thelpers.feed_data
 
 describe('terminal', function()
   local screen
diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index 33a53ef201..f9b112e464 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -1,6 +1,6 @@
 local helpers = require('test.functional.helpers')
 local Screen = require('test.functional.ui.screen')
-local clear, feed, nvim = helpers.clear, helpers.feed, helpers.nvim
+local clear, feed = helpers.clear, helpers.feed
 local execute, request, eq = helpers.execute, helpers.request, helpers.eq
 
 
diff --git a/test/functional/ui/input_spec.lua b/test/functional/ui/input_spec.lua
index a7c8e02def..4818830940 100644
--- a/test/functional/ui/input_spec.lua
+++ b/test/functional/ui/input_spec.lua
@@ -8,7 +8,6 @@ describe('mappings', function()
   local cid
 
   local add_mapping = function(mapping, send)
-    local str = 'mapped '..mapping
     local cmd = "nnoremap "..mapping.." :call rpcnotify("..cid..", 'mapped', '"
                 ..send:gsub('<', '<lt>').."')<cr>"
     execute(cmd)
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index c767f9b83a..c8250ec4c1 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -107,7 +107,7 @@
 
 local helpers = require('test.functional.helpers')
 local request, run, stop = helpers.request, helpers.run, helpers.stop
-local eq, dedent = helpers.eq, helpers.dedent
+local dedent = helpers.dedent
 
 local Screen = {}
 Screen.__index = Screen
@@ -294,9 +294,9 @@ end
 
 function Screen:_handle_resize(width, height)
   local rows = {}
-  for i = 1, height do
+  for _ = 1, height do
     local cols = {}
-    for j = 1, width do
+    for _ = 1, width do
       table.insert(cols, {text = ' ', attrs = {}})
     end
     table.insert(rows, cols)
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index 092cc8c126..a4545eeff0 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -2,7 +2,7 @@ local helpers = require('test.functional.helpers')
 local Screen = require('test.functional.ui.screen')
 local spawn, set_session, clear = helpers.spawn, helpers.set_session, helpers.clear
 local feed, execute = helpers.feed, helpers.execute
-local insert, wait = helpers.insert, helpers.wait
+local insert = helpers.insert
 
 describe('Initial screen', function()
   local screen
@@ -11,9 +11,6 @@ describe('Initial screen', function()
                      '--embed'}
 
   before_each(function()
-    if session then
-      session:exit(0)
-    end
     local screen_nvim = spawn(nvim_argv)
     set_session(screen_nvim)
     screen = Screen.new()
diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua
index d04329e1e2..e4217abcfe 100644
--- a/test/functional/ui/searchhl_spec.lua
+++ b/test/functional/ui/searchhl_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')
 local Screen = require('test.functional.ui.screen')
-local clear, feed, nvim, insert = helpers.clear, helpers.feed, helpers.nvim, helpers.insert
-local execute, request, eq = helpers.execute, helpers.request, helpers.eq
+local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local execute = helpers.execute
 
 describe('search highlighting', function()
   local screen
diff --git a/test/functional/viml/completion_spec.lua b/test/functional/viml/completion_spec.lua
index 5e3d4a6658..12f542de7f 100644
--- a/test/functional/viml/completion_spec.lua
+++ b/test/functional/viml/completion_spec.lua
@@ -1,6 +1,6 @@
 
 local helpers = require('test.functional.helpers')
-local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
+local clear, feed = helpers.clear, helpers.feed
 local eval, eq, neq = helpers.eval, helpers.eq, helpers.neq
 local execute, source = helpers.execute, helpers.source