Satisfy testlint.

For that, make luatest ignore the preload.lua files.

1 files changed, 33 insertions, 34 deletions

diff --git a/test/unit/mbyte_spec.lua b/test/unit/mbyte_spec.lua
index e1b401c76d..9b2415a93f 100644
--- a/test/unit/mbyte_spec.lua
+++ b/test/unit/mbyte_spec.lua
@@ -3,7 +3,6 @@ local helpers = require("test.unit.helpers")
 local ffi     = helpers.ffi
 local eq      = helpers.eq
 
-local globals = helpers.cimport("./src/nvim/globals.h")
 local mbyte = helpers.cimport("./src/nvim/mbyte.h")
 
 describe('mbyte', function()
@@ -17,7 +16,7 @@ describe('mbyte', function()
 
   -- Convert from bytes to string
   local function to_string(bytes)
-    s = {}
+    local s = {}
     for i = 1, #bytes do
       s[i] = string.char(bytes[i])
     end
@@ -59,20 +58,20 @@ describe('mbyte', function()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0x7f}), pcc, 2))
       eq(0, pcc[0])
       -- No combining characters
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0x80}), pcc, 2))
       eq(0, pcc[0])
 
       -- No UTF-8 sequence
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x00c2, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x7f}), pcc, 2))
       eq(0, pcc[0])
       -- One UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x0080, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x80}), pcc, 2))
       eq(0, pcc[0])
       -- No UTF-8 sequence
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x00c2, mbyte.utfc_ptr2char_len(to_string({0xc2, 0xc0}), pcc, 2))
       eq(0, pcc[0])
     end)
@@ -84,27 +83,27 @@ describe('mbyte', function()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0x80, 0x80}), pcc, 3))
       eq(0, pcc[0])
       -- No combining character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0xc2, 0x80}), pcc, 3))
       eq(0, pcc[0])
 
       -- Combining character is U+0300
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0xcc, 0x80}), pcc, 3))
       eq(0x0300, pcc[0])
       eq(0x0000, pcc[1])
 
       -- No UTF-8 sequence
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x00c2, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x7f, 0xcc}), pcc, 3))
       eq(0, pcc[0])
       -- Incomplete combining character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x0080, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x80, 0xcc}), pcc, 3))
       eq(0, pcc[0])
 
       -- One UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x20d0, mbyte.utfc_ptr2char_len(to_string({0xe2, 0x83, 0x90}), pcc, 3))
       eq(0, pcc[0])
     end)
@@ -116,32 +115,32 @@ describe('mbyte', function()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0x7f, 0xcc, 0x80}), pcc, 4))
       eq(0, pcc[0])
       -- No second UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0xc2, 0xcc, 0x80}), pcc, 4))
       eq(0, pcc[0])
 
       -- Combining character U+0300
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0xcc, 0x80, 0xcc}), pcc, 4))
       eq(0x0300, pcc[0])
       eq(0x0000, pcc[1])
 
       -- No UTF-8 sequence
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x00c2, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x7f, 0xcc, 0x80}), pcc, 4))
       eq(0, pcc[0])
       -- No following UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x0080, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x80, 0xcc, 0xcc}), pcc, 4))
       eq(0, pcc[0])
       -- Combining character U+0301
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x0080, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x80, 0xcc, 0x81}), pcc, 4))
       eq(0x0301, pcc[0])
       eq(0x0000, pcc[1])
 
       -- One UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x100000, mbyte.utfc_ptr2char_len(to_string({0xf4, 0x80, 0x80, 0x80}), pcc, 4))
       eq(0, pcc[0])
     end)
@@ -153,31 +152,31 @@ describe('mbyte', function()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0x7f, 0xcc, 0x80, 0x80}), pcc, 5))
       eq(0, pcc[0])
       -- No second UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0xc2, 0xcc, 0x80, 0x80}), pcc, 5))
       eq(0, pcc[0])
 
       -- Combining character U+0300
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0xcc, 0x80, 0xcc}), pcc, 5))
       eq(0x0300, pcc[0])
       eq(0x0000, pcc[1])
 
       -- Combining characters U+0300 and U+0301
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0xcc, 0x80, 0xcc, 0x81}), pcc, 5))
       eq(0x0300, pcc[0])
       eq(0x0301, pcc[1])
       eq(0x0000, pcc[2])
       -- Combining characters U+0300, U+0301, U+0302
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0xcc, 0x80, 0xcc, 0x81, 0xcc, 0x82}), pcc, 7))
       eq(0x0300, pcc[0])
       eq(0x0301, pcc[1])
       eq(0x0302, pcc[2])
       eq(0x0000, pcc[3])
       -- Combining characters U+0300, U+0301, U+0302, U+0303
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string({0x7f, 0xcc, 0x80, 0xcc, 0x81, 0xcc, 0x82, 0xcc, 0x83}), pcc, 9))
       eq(0x0300, pcc[0])
       eq(0x0301, pcc[1])
@@ -185,7 +184,7 @@ describe('mbyte', function()
       eq(0x0303, pcc[3])
       eq(0x0000, pcc[4])
       -- Combining characters U+0300, U+0301, U+0302, U+0303, U+0304
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string(
         {0x7f, 0xcc, 0x80, 0xcc, 0x81, 0xcc, 0x82, 0xcc, 0x83, 0xcc, 0x84}), pcc, 11))
       eq(0x0300, pcc[0])
@@ -196,7 +195,7 @@ describe('mbyte', function()
       eq(0x0000, pcc[5])
       -- Combining characters U+0300, U+0301, U+0302, U+0303, U+0304,
       -- U+0305
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string(
         {0x7f, 0xcc, 0x80, 0xcc, 0x81, 0xcc, 0x82, 0xcc, 0x83, 0xcc, 0x84, 0xcc, 0x85}), pcc, 13))
       eq(0x0300, pcc[0])
@@ -209,7 +208,7 @@ describe('mbyte', function()
 
       -- Combining characters U+0300, U+0301, U+0302, U+0303, U+0304,
       -- U+0305, U+0306, but only save six (= MAX_MCO).
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string(
         {0x7f, 0xcc, 0x80, 0xcc, 0x81, 0xcc, 0x82, 0xcc, 0x83, 0xcc, 0x84, 0xcc, 0x85, 0xcc, 0x86}), pcc, 15))
       eq(0x0300, pcc[0])
@@ -221,7 +220,7 @@ describe('mbyte', function()
       eq(0x0001, pcc[6])
 
       -- Only three following combining characters U+0300, U+0301, U+0302
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x007f, mbyte.utfc_ptr2char_len(to_string(
         {0x7f, 0xcc, 0x80, 0xcc, 0x81, 0xcc, 0x82, 0xc2, 0x80, 0xcc, 0x84, 0xcc, 0x85}), pcc, 13))
       eq(0x0300, pcc[0])
@@ -231,40 +230,40 @@ describe('mbyte', function()
 
 
       -- No UTF-8 sequence
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x00c2, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x7f, 0xcc, 0x80, 0x80}), pcc, 5))
       eq(0, pcc[0])
       -- No following UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x0080, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x80, 0xcc, 0xcc, 0x80}), pcc, 5))
       eq(0, pcc[0])
       -- Combining character U+0301
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x0080, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x80, 0xcc, 0x81, 0x7f}), pcc, 5))
       eq(0x0301, pcc[0])
       eq(0x0000, pcc[1])
       -- Combining character U+0301
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x0080, mbyte.utfc_ptr2char_len(to_string({0xc2, 0x80, 0xcc, 0x81, 0xcc}), pcc, 5))
       eq(0x0301, pcc[0])
       eq(0x0000, pcc[1])
 
       -- One UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x100000, mbyte.utfc_ptr2char_len(to_string({0xf4, 0x80, 0x80, 0x80, 0x7f}), pcc, 5))
       eq(0, pcc[0])
 
       -- One UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x100000, mbyte.utfc_ptr2char_len(to_string({0xf4, 0x80, 0x80, 0x80, 0x80}), pcc, 5))
       eq(0, pcc[0])
       -- One UTF-8 character
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x100000, mbyte.utfc_ptr2char_len(to_string({0xf4, 0x80, 0x80, 0x80, 0xcc}), pcc, 5))
       eq(0, pcc[0])
 
       -- Combining characters U+1AB0 and U+0301
-      local pcc = to_intp()
+      pcc = to_intp()
       eq(0x100000, mbyte.utfc_ptr2char_len(to_string(
         {0xf4, 0x80, 0x80, 0x80, 0xe1, 0xaa, 0xb0, 0xcc, 0x81}), pcc, 9))
       eq(0x1ab0, pcc[0])