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

textobj: little refactor

Browse source
This commit is contained in:
Thomas Vigouroux 2020-04-23 12:15:03 +02:00
parent c62685841e
commit 7c7d4e5270
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,42 +17,41 @@ 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("'>"))
local node = nil
if parsers.has_parser() then
local root = parsers.get_parser():parse():root()
local node = root:named_descendant_for_range(sel_start_line-1, sel_start_col-1, sel_end_line-1, sel_end_col)
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
return node_range_to_vim(node:parent() or node)
else
return node_range_to_vim(node)
-- 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
else
return node_range_to_vim()
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()
local 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))
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
return node_range_to_vim(utils.smallest_containing_scope(node:parent() or node))
else
return node_range_to_vim(node)
node = utils.smallest_containing_scope(node:parent() or node)
end
else
return node_range_to_vim()
end
return node_range_to_vim(node)
end
return M

2
lua/nvim-treesitter/utils.lua
View file

@ -75,6 +75,8 @@ function M.setup_commands(mod, commands)
})
api.nvim_command(table.concat(parts, " "))
end
end
--- Gets the smallest scope which contains @param node
function M.smallest_containing_scope(node, bufnr)
local bufnr = bufnr or api.nvim_get_current_buf()