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

10 files changed, 9 insertions, 15 deletions

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