benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-02 19:46:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(textobj): use configs and don't use VimL

Browse source
This commit is contained in:
Thomas Vigouroux 2020-04-25 16:35:10 +02:00
parent 7c7d4e5270
commit cadb3ee1ff
4 changed files with 78 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

107
lua/nvim-treesitter/textobj.lua
View file

@ -4,54 +4,83 @@ local parsers = require'nvim-treesitter.parsers'
local M = {}
local function node_range_to_vim(node)
if not node then return end
local start_row, start_col, end_row, end_col = node:range()
local select_range = [[
call cursor(%d, %d)
normal v
call cursor(%d, %d)
]]
local exec_command = string.format(select_range,
start_row+1, start_col+1,
end_row+1, end_col+1)
api.nvim_exec(exec_command, false)
end
local function select_incremental(increment_func)
return function()
local buf, sel_start_line, sel_start_col, _ = unpack(vim.fn.getpos("'<"))
local buf, sel_end_line, sel_end_col, _ = unpack(vim.fn.getpos("'>"))
local node = nil
if parsers.has_parser() then
local root = parsers.get_parser():parse():root()
node = root:named_descendant_for_range(sel_start_line-1, sel_start_col-1, sel_end_line-1, sel_end_col)
local node_start_row, node_start_col, node_end_row, node_end_col = node:range()
if (sel_start_line-1) == node_start_row and (sel_start_col-1) == node_start_col
and (sel_end_line-1) == node_end_row and sel_end_col == node_end_col then
node = increment_func(node)
end
end
return node_range_to_vim(node)
end
end
M.node_incremental = select_incremental(function(node)
if node then
local start_row, start_col, end_row, end_col = node:range()
return node:parent() or node
end
end)
return {{start_row, start_col}, {end_row, end_col}}
else
return {{}, {}}
M.scope_incremental = select_incremental(function(node)
if node then
return utils.smallest_containing_scope(node:parent() or node)
end
end)
function M.attach(bufnr)
local buf = bufnr or api.nvim_get_current_buf()
local function textobj_create(mapping, funcname)
api.nvim_buf_set_keymap(buf, 'v', mapping,
string.format(":lua require'nvim-treesitter.textobj'.%s()<CR>", funcname), { silent = true })
api.nvim_buf_set_keymap(buf, 'o', mapping,
string.format(":normal v%s<CR>", mapping), { silent = true })
end
local config = require'nvim-treesitter.configs'.get_config().textobj
for funcname, mapping in pairs(config.keymaps) do
textobj_create(mapping, funcname)
end
end
function M.node_incremental()
local buf, sel_start_line, sel_start_col, _ = unpack(vim.fn.getpos("'<"))
local buf, sel_end_line, sel_end_col, _ = unpack(vim.fn.getpos("'>"))
function M.detach(bufnr)
local buf = bufnr or api.nvim_get_current_buf()
local node = nil
if parsers.has_parser() then
local root = parsers.get_parser():parse():root()
node = root:named_descendant_for_range(sel_start_line-1, sel_start_col-1, sel_end_line-1, sel_end_col)
local node_start_row, node_start_col, node_end_row, node_end_col = node:range()
if (sel_start_line-1) == node_start_row and (sel_start_col-1) == node_start_col
and (sel_end_line-1) == node_end_row and sel_end_col == node_end_col then
-- TODO(vigoux): actually it is not really the parent here
-- it might be needed to climb more than only one parent, but a strictly growing node
node = node:parent() or node
end
local function textobj_delete(mapping)
api.nvim_buf_del_keymap(buf, 'v', default_mapping)
api.nvim_buf_del_keymap(buf, 'o', default_mapping)
end
return node_range_to_vim(node)
end
function M.scope_incremental()
local _, sel_start_line, sel_start_col, _ = unpack(vim.fn.getpos("'<"))
local _, sel_end_line, sel_end_col, _ = unpack(vim.fn.getpos("'>"))
local node = nil
if parsers.has_parser() then
local root = parsers.get_parser():parse():root()
node = utils.smallest_containing_scope(
root:named_descendant_for_range(sel_start_line-1, sel_start_col-1, sel_end_line-1, sel_end_col))
local node_start_row, node_start_col, node_end_row, node_end_col = node:range()
if (sel_start_line-1) == node_start_row and (sel_start_col-1) == node_start_col
and (sel_end_line-1) == node_end_row and sel_end_col == node_end_col then
node = utils.smallest_containing_scope(node:parent() or node)
end
local config = require'nvim-treesitter.configs'.get_config().textobj
for _, mapping in pairs(config.keymaps) do
textobj_delete(mapping)
end
return node_range_to_vim(node)
end
return M