specs: update

Author: YaroSpace

.busted

@@ -1,5 +1,5 @@
 ---
-name: develop
+name: Tests
 on:
   pull_request: ~
   push:

.github/workflows/test_develop.yml

@@ -1,5 +1,5 @@
 ---
-name: main
+name: Tests
 on:
   pull_request: ~
   push:

.github/workflows/test_main.yml

@@ -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

@@ -1,6 +1,7 @@
 # 💻 Lua console ![main](https://github.com/yarospace/lua-console.nvim/actions/workflows/test_main.yml/badge.svg?branch=main) ![develop](https://github.com/yarospace/lua-console.nvim/actions/workflows/test_develop.yml/badge.svg?branch=develop) [![LuaRocks](https://img.shields.io/luarocks/v/YaroSpace/lua-console.nvim?logo=lua&color=purple)](https://luarocks.org/modules/YaroSpace/lua-console.nvim)
 
-**lua-console.nvim** - is a REPL / scratch pad / debug console for Neovim.  Supports Lua natively and can be extended for other languages.
+**lua-console.nvim** - is a REPL / scratch pad / debug console for Neovim. 
+Supports Lua natively and can be extended for other languages.
 
 <br/><img src="https://github.com/YaroSpace/assets/blob/main/lua-console.nvim/demo.gif">
 
@@ -16,8 +17,6 @@
 - Use as a scratch pad for code gists
 - Attach code evaluators to any buffer
 
-<br>
-
 ## 📦 Installation
 
 With [lazy.nvim](https://github.com/folke/lazy.nvim):
@@ -46,8 +45,8 @@ require('lua-console').setup { your_custom_options }
 > [!NOTE]
 > All settings are self explanatory, but please read below about [`preserve_context`](#-notes-on-globals-locals-and-preserving-execution-context) option.
 
-Mappings are local to the console, except the ones for toggling the console - `` ` `` and attaching to a buffer - ``<Leader>` ``. All mappings can be overridden in your custom 
-config. If you want to delete a mapping - set its value to `false`.
+Mappings are local to the console, except the ones for toggling the console - `` ` `` and attaching to a buffer - ``<Leader>` ``. 
+All mappings can be overridden in your custom config. If you want to delete a mapping - set its value to `false`.
 
 <details><summary>Default Settings</summary>
 
@@ -93,8 +92,6 @@ opts = {
 
 </details>
 
-<br>
-
 ## 🚀 Basic usage (with default mappings)
 
 - Install, press the mapped key `` ` `` and start exploring. 
@@ -124,10 +121,11 @@ opts = {
 > [!IMPORTANT]
 > By default, the option `preserve_context` is on, which means that the execution context is preserved between evaluations. 
 
-All the code executed in the console is evaluated in isolated environment, which means that any global variables that you declare will not be persisted 
-in Neovim's global environment.  If you purposefully want to alter the global state, use `_G.My_variable = ..`.
+All the code executed in the console is evaluated in isolated environment, which means that any global variables that you declare will not be persisted in Neovim's global environment. 
+If you purposefully want to alter the global state, use `_G.My_variable = ..`.
 
 The option `preserve_context` implies that variables without `local` will be stored in the console's local context and preserved between executions. 
+
 So, if you first execute `a = 1`, then `a = a + 1` and then `a` - you will get `2`. 
 
 Also, by default, the option `strip_local` is on, which means that `local` modifier is stripped from top-level variable declarations and these variables are also stored in the context.
@@ -139,8 +137,6 @@ There are two functions available within the console:
 - `_ctx` - will print the contents of the context
 - `_ctx_clear()` - clears the context
 
-<br>
-
 ## ⭐ Extra features
 
 ### Attaching code evaluator to other buffers

README.md

@@ -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)