feat: evaluate char selection

Author: YaroSpace

lua/lua-console/config.lua

@@ -7,6 +7,7 @@ local default_config = {
     autosave = true, -- autosave on console hide / close
     load_on_start = true, -- load saved session on start
     preserve_context = true, -- preserve results between evaluations
+    print_one_line_results = true,
   },
   window = {
     relative = 'editor',

lua/lua-console/mappings.lua

@@ -129,7 +129,7 @@ M.set_evaluator_mappings = function(buf, toggle)
     callback = function()
       utils.eval_code_in_buffer(buf)
     end,
-  }, { 'n', 'v' })
+  }, { 'n', 'x' })
 
   set_map(buf, m.eval_buffer, {
     desc = 'Eval code in current buffer',

lua/lua-console/utils.lua

@@ -169,7 +169,7 @@ local get_last_assignment = function()
   for i = lnum - 1, 0, -1 do
     line = vim.api.nvim_buf_get_lines(0, i, i + 1, false)[1]
 
-    if line:match('^%s*' .. last_var .. '%s*=') then break end
+    if line:match('^%s*' .. last_var .. '%s*,?[^=]-=') then break end
     offset = offset + 1
   end
 
@@ -232,11 +232,20 @@ local append_current_buffer = function(buf, lines, lnum)
 
     virtual_text = get_line_assignment(vim.fn.getbufline(buf, lnum, lnum)) or line -- ! resets env._last_assignment by calling evaluator
 
-    if not last_assignment_lnum then show_virtual_text(buf, 4, prefix .. virtual_text, lnum - 1, 'eol', 'Comment') end
+    if last_assignment_lnum ~= lnum then
+      show_virtual_text(buf, 4, prefix .. virtual_text, lnum - 1, 'eol', 'Comment')
+    end
   end
 
   if #lines == 0 then return end
 
+  if #lines == 1 and last_assignment_lnum ~= lnum and not config.buffer.show_one_line_results then
+    virtual_text = lines[1]
+    show_virtual_text(buf, 4, prefix .. virtual_text, lnum - 1, 'eol', 'Comment')
+
+    return
+  end
+
   lines[1] = prefix .. lines[1]
   table.insert(lines, 1, '') -- insert an empty line
 
@@ -429,23 +438,23 @@ end
 ---@param buf number
 ---@param range number[]
 ---@return string
-local function get_lang(buf, range)
+local function get_lang(buf, lnum)
   local pattern = ('^.*' .. config.external_evaluators.lang_prefix .. '(%w+)%s*$')
   local line, lang
 
-  line = vim.api.nvim_buf_get_lines(buf, math.max(0, range[1] - 2), range[2], false)[1]
-  lang = line:match(pattern)
+  line = vim.api.nvim_buf_get_lines(buf, math.max(0, lnum - 1), lnum, false)[1]
+  lang = line and line:match(pattern)
   if lang then return lang end
 
   line = vim.api.nvim_buf_get_lines(buf, 0, 1, false)[1]
-  lang = line:match(pattern)
+  lang = line and line:match(pattern)
   if lang then return lang end
 
   return vim.bo[buf].filetype
 end
 
-local get_evaluator = function(buf, range)
-  local lang = get_lang(buf, range)
+local get_evaluator = function(buf, lnum)
+  local lang = get_lang(buf, lnum)
 
   if lang == '' then
     vim.notify('Plese specify the language to evaluate or set the filetype', vim.log.levels.WARN)
@@ -461,30 +470,35 @@ end
 ---@param full? boolean evaluate full buffer
 local eval_code_in_buffer = function(buf, full)
   buf = buf or vim.fn.bufnr()
-  local win = vim.fn.bufwinid(buf)
 
-  if vim.api.nvim_get_mode().mode == 'V' then
-    LOG('here')
-    vim.api.nvim_input('<Esc>')
-  end
+  local mode = vim.api.nvim_get_mode().mode
+  if mode == 'V' or mode == 'v' then vim.api.nvim_input('<Esc>') end
+
+  local v_start, v_end, lines
 
-  local v_start, v_end
   if full then
     v_start, v_end = 1, vim.api.nvim_buf_line_count(buf)
-  else
-    v_start, v_end = vim.fn.line('.', win), vim.fn.line('v', win)
+  elseif mode == 'v' or mode == 'V' then
+    v_start, v_end = vim.fn.getpos('.'), vim.fn.getpos('v')
+    lines = vim.fn.getregion(v_start, v_end, { type = mode })
+
+    v_start, v_end = v_start[2], v_end[2]
+
     if v_start > v_end then
       v_start, v_end = v_end, v_start
     end
+  else
+    v_start = vim.fn.line('.')
+    v_end = v_start
   end
 
-  vim.api.nvim_win_set_cursor(win, { v_end, 0 })
+  vim.fn.cursor(v_end, 0)
 
-  local lines = vim.api.nvim_buf_get_lines(buf, v_start - 1, v_end, false)
+  lines = lines or vim.api.nvim_buf_get_lines(buf, v_start - 1, v_end, false)
   lines = remove_empty_lines(lines)
   if #lines == 0 then return end
 
-  local evaluator = get_evaluator(buf, { v_start, v_end })
+  local evaluator = get_evaluator(buf, v_start - 1)
   if not evaluator then return end
 
   local result = evaluator(lines)

spec/spec_helper.lua

@@ -61,17 +61,18 @@ M.send_keys = function(keys)
 end
 
 M.get_virtual_text = function(buf, line_start, line_end)
-  local ns = vim.api.nvim_create_namespace('Lua-console')
-  local ids = vim.api.nvim_buf_get_extmarks(buf, ns, { line_start or 0, 0 }, { line_end or -1, -1 }, {})
+  local ids = vim.api.nvim_buf_get_extmarks(buf, -1, { line_start or 0, 0 }, { line_end or -1, -1 }, { details = true })
 
   if vim.tbl_isempty(ids) then
     _G.LOG('No extmarks found')
     return ''
   end
 
-  local mark = vim.api.nvim_buf_get_extmark_by_id(buf, ns, ids[1][1], { details = true })
+  local marks = vim.tbl_map(function(mark)
+    return mark[4].virt_text[1][1]
+  end, ids)
 
-  return mark[3].virt_text[1][1]
+  return marks
 end
 
 ---Collects paths for nested keys

spec/unit/mappings_spec.lua

@@ -29,6 +29,7 @@ describe('lua-console.nvim - mappings', function()
       buffer = {
         load_on_start = false,
         save_path = vim.fn.stdpath('state') .. '/lua-console-test.lua',
+        show_one_line_results = true,
       },
     }
 
@@ -264,6 +265,7 @@ describe('lua-console.nvim - mappings', function()
       utils.attach_toggle(other_buf)
     end)
 
+    --TODO: finish spec
     it('cretes mappings for attached buffer', function()
       -- code
     end)
@@ -328,6 +330,7 @@ describe('lua-console.nvim - mappings', function()
       -- code
     end)
 
+    --TODO: finish spec
     it('removes mappings for dettached buffer', function()
       -- code
     end)

spec/unit/utils_spec.lua

@@ -1,14 +1,16 @@
 local assert = require('luassert.assert')
 local h = require('spec_helper')
 
+--TODO: add multiple assigmnets andchar selection
+
 describe('lua-console.utils', function()
   _G.Lua_console = {}
   local buf, config, utils
 
   setup(function()
     utils = require('lua-console.utils')
     config = require('lua-console.config')
-    config.setup()
+    config.setup { buffer = { show_one_line_results = true } }
   end)
 
   before_each(function()
@@ -332,6 +334,23 @@ describe('lua-console.utils', function()
         assert.has_string(result, expected)
       end)
 
+      it('single line - char selection', function()
+        content = h.to_table([[
+					Some text
+					LOG(vim.bo.filetype)
+					Some text
+  			]])
+
+        h.set_buffer(buf, content)
+
+        vim.api.nvim_win_set_cursor(win, { 2, 4 })
+        h.send_keys('v14l')
+        utils.eval_code_in_buffer()
+
+        result = h.get_buffer(buf)
+        assert.has_string(result, 'lua')
+      end)
+
       it('multiline', function()
         vim.api.nvim_win_set_cursor(win, { 2, 0 })
         vim.cmd.exe("'normal V3j'")
@@ -495,7 +514,27 @@ describe('lua-console.utils', function()
 
         expected = config.buffer.result_prefix .. '5'
 
-        result = h.get_virtual_text(buf, 0, 0)
+        result = h.get_virtual_text(buf)
+        assert.has_string(result, expected)
+      end)
+
+      it('shows value of the multiple assignments as virtual text', function()
+        vim.api.nvim_win_set_cursor(win, { 1, 0 })
+        h.send_keys('V4j')
+
+        content = h.to_table([[
+					a = 5
+					for i = 1, 5 do
+						i = i + 5
+					end
+					vim.bo.filetype, c = tostring(a + 5) .. 'test', 200
+  			]])
+        h.set_buffer(buf, content)
+        utils.eval_code_in_buffer()
+
+        expected = config.buffer.result_prefix .. '[1]"10test", [2] 200'
+
+        result = h.get_virtual_text(buf)
         assert.has_string(result, expected)
       end)