feat!: drop modules, general refactor and cleanup

1 files changed, 89 insertions, 55 deletions

diff --git a/tests/indent/t32_spec.lua b/tests/indent/t32_spec.lua
index 88d26612b..30c6542e0 100644
--- a/tests/indent/t32_spec.lua
+++ b/tests/indent/t32_spec.lua
@@ -1,137 +1,171 @@
-local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
+local Runner = require('tests.indent.common').Runner
+local XFAIL = require('tests.indent.common').XFAIL
 
-local runner = Runner:new(it, "tests/indent/t32", {
+local runner = Runner:new(it, 'tests/indent/t32', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent t32:", function()
-  describe("whole file:", function()
-    runner:whole_file "."
+describe('indent t32:', function()
+  describe('whole file:', function()
+    runner:whole_file('.')
   end)
 
-  describe("new line:", function()
-    runner:new_line("if_block.cmm", { on_line = 2, text = "GOTO start", indent = 0 }, "command after IF", XFAIL)
+  describe('new line:', function()
+    runner:new_line(
+      'if_block.cmm',
+      { on_line = 2, text = 'GOTO start', indent = 0 },
+      'command after IF',
+      XFAIL
+    )
 
-    runner:new_line("if_block.cmm", { on_line = 5, text = "GOTO start", indent = 2 }, "command in IF then block")
+    runner:new_line(
+      'if_block.cmm',
+      { on_line = 5, text = 'GOTO start', indent = 2 },
+      'command in IF then block'
+    )
 
-    runner:new_line("if_block.cmm", { on_line = 4, text = "(", indent = 0 }, "block after IF")
+    runner:new_line('if_block.cmm', { on_line = 4, text = '(', indent = 0 }, 'block after IF')
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 1, 2 },
       { 14, 2 },
       { 19, 2 },
       { 21, 2 },
       { 41, 2 },
       { 42, 4 },
-    } do
+    }) do
       runner:new_line(
-        "if_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in IF then[" .. ii .. "]"
+        'if_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command in IF then[' .. ii .. ']'
       )
     end
 
     -- Insertion of a command right before the existing block results in
     -- incorrect syntax. The parse either detect an error or incorrectly
     -- assumes "ELSE IF" is a command.
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 26, 2 },
       { 30, 2 },
-    } do
+    }) do
       runner:new_line(
-        "if_block.cmm",
+        'if_block.cmm',
         { on_line = test[1], text = 'PRINT ""', indent = test[2] },
-        "displace block in IF then[" .. ii .. "]",
+        'displace block in IF then[' .. ii .. ']',
         XFAIL
       )
     end
 
-    runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 6 }, "command in IF then", XFAIL)
+    runner:new_line(
+      'if_block.cmm',
+      { on_line = 45, text = '&x=1.', indent = 6 },
+      'command in IF then',
+      XFAIL
+    )
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 16, 2 },
       { 21, 2 },
       { 23, 2 },
       { 44, 4 },
-    } do
+    }) do
       runner:new_line(
-        "if_block.cmm",
-        { on_line = test[1], text = "CONTinue\n", indent = test[2] },
-        "command in IF else[" .. ii .. "]"
+        'if_block.cmm',
+        { on_line = test[1], text = 'CONTinue\n', indent = test[2] },
+        'command in IF else[' .. ii .. ']'
       )
     end
 
-    runner:new_line("while_block.cmm", { on_line = 2, text = "&x=1.", indent = 2 }, "command after WHILE")
+    runner:new_line(
+      'while_block.cmm',
+      { on_line = 2, text = '&x=1.', indent = 2 },
+      'command after WHILE'
+    )
 
-    runner:new_line("while_block.cmm", { on_line = 4, text = "&x=1.", indent = 0 }, "command after WHILE")
+    runner:new_line(
+      'while_block.cmm',
+      { on_line = 4, text = '&x=1.', indent = 0 },
+      'command after WHILE'
+    )
 
-    runner:new_line("while_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block in WHILE then")
+    runner:new_line(
+      'while_block.cmm',
+      { on_line = 1, text = '(\n', indent = 0 },
+      'block in WHILE then'
+    )
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 5, 2 },
       { 12, 2 },
-    } do
+    }) do
       runner:new_line(
-        "while_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in WHILE then block[" .. ii .. "]"
+        'while_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command in WHILE then block[' .. ii .. ']'
       )
     end
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 1, 0 },
       { 4, 2 },
-    } do
+    }) do
       runner:new_line(
-        "repeat_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command after RePeaT[" .. ii .. "]"
+        'repeat_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command after RePeaT[' .. ii .. ']'
       )
     end
 
-    runner:new_line("repeat_block.cmm", { on_line = 3, text = "(\n", indent = 0 }, "block in RePeaT then")
+    runner:new_line(
+      'repeat_block.cmm',
+      { on_line = 3, text = '(\n', indent = 0 },
+      'block in RePeaT then'
+    )
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 7, 2 },
       { 18, 2 },
       { 24, 2 },
-    } do
+    }) do
       runner:new_line(
-        "repeat_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in RePeaT then block [" .. ii .. "]"
+        'repeat_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command in RePeaT then block [' .. ii .. ']'
       )
     end
 
-    runner:new_line("subroutine_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block after call label")
+    runner:new_line(
+      'subroutine_block.cmm',
+      { on_line = 1, text = '(\n', indent = 0 },
+      'block after call label'
+    )
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 2, 2 },
       { 3, 2 },
       { 8, 2 },
       { 12, 2 },
       { 19, 2 },
-    } do
+    }) do
       runner:new_line(
-        "subroutine_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in subroutine block[" .. ii .. "]"
+        'subroutine_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command in subroutine block[' .. ii .. ']'
       )
     end
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 5, 2 },
       { 13, 2 },
       { 23, 2 },
-    } do
+    }) do
       runner:new_line(
-        "subroutine_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command after subroutine block[" .. ii .. "]"
+        'subroutine_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command after subroutine block[' .. ii .. ']'
       )
     end
   end)