specs: update

Author: YaroSpace

.busted

@@ -1 +1,2 @@
 .todo.md
+.tests

.gitignore

@@ -1,9 +1,5 @@
-set_lua_paths = eval $$(luarocks path --lua-version 5.1 --bin)
-busted = $$(find /usr/local/lib/luarocks/*/busted/* -name busted)
-set_luals_path = PATH="$$PATH:/home/yaro/.local/share/nvim/mason/bin/lua-language-server"
-
-test_unit = busted --run=unit
-test_nvim = nvim --headless -i NONE -n -u spec/minimal_init.lua  -l $(busted) --run=unit
+test=nvim -l tests/minit.lua tests -o utfTerminal -Xoutput --color -v 
+#--shuffle-tests 
 
 tag ?= wip
 watch = '*.lua'
@@ -19,19 +15,19 @@ llscheck:
 	@$(set_luals_path) && llscheck --configpath .luarc.json .
 
 luacheck:
-	luacheck lua spec scripts
+	luacheck lua tests scripts
 
 stylua:
 	stylua --check lua scripts spec
 
 test:
-	@$(set_lua_paths); $(test_unit)
+	@$(test)
 
 watch:
-	@$(set_lua_paths); while sleep 0.1; do find . -name $(watch) | entr -d -c $(test_unit); done
+	@while sleep 0.1; do find . -name $(watch) | entr -d -c $(test); done
 
 watch_tag:
-	@$(set_lua_paths); while sleep 0.1; do find . -name $(watch) | entr -d -c $(test_unit) --tags=$(tag); done
+	@while sleep 0.1; do find . -name $(watch) | entr -d -c $(test) --tags=$(tag); done
 
 test_nvim:
 	@$(test_nvim) spec/unit

Makefile

@@ -359,14 +359,18 @@ local function strip_local(lines)
   local ts = vim.treesitter
   local ret = {}
 
-  local start_row = vim.fn.line('.') - 1 - #lines
+  local start_row = math.max(0, vim.fn.line('.') - 1 - #lines)
 
   for i, line in ipairs(lines) do
-    local col = line:find('^%s*local%s+')
+    local cs, ce = 1, 1
 
-    if col then
-      local node = ts.get_node { pos = { start_row + i, col } }
-      line = node and node:parent():type() == 'chunk' and line:gsub('^%s*local%s+', '') or line
+    while cs do
+      cs, ce = line:find('local%s', ce)
+
+      if cs then
+        local node = ts.get_node { pos = { start_row + i - 1, cs } }
+        if node and node:parent():type() == 'chunk' then line = line:sub(1, cs - 1) .. line:sub(ce + 1) end
+      end
     end
 
     table.insert(ret, line)
@@ -470,6 +474,7 @@ local get_external_evaluator = function(buf, lang)
   local fun = opts.on_exit
   opts.on_exit = function(system_completed)
     vim.schedule(function()
+      if not vim.api.nvim_buf_is_valid(buf) then return end
       vim.api.nvim_buf_del_extmark(buf, ns, 10)
       _ = fun and fun(system_completed)
     end)