benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-16 10:20:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify node_movement.select_current_node

Browse source
This commit is contained in:
Stephan Seitz 2020-05-03 11:57:41 +02:00
parent 64febc70a6
commit 69f193851c
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lua/nvim-treesitter/node_movement.lua
View file

@ -21,17 +21,30 @@ local function node_start_to_vim(node)
api.nvim_exec(exec_command, false) api.nvim_exec(exec_command, false)
end end
M.do_node_movement = function(kind) function M.get_current_node(buf,line,col)
local buf, line, col = unpack(vim.fn.getpos(".")) if not buf then
buf, line, col = unpack(vim.fn.getpos("."))
end
local current_node = M.current_node[buf] local current_node = M.current_node[buf]
if current_node then if current_node then
local node_line, node_col = current_node:start() local node_line, node_col = current_node:start()
if line-1 ~= node_line or col-1 ~= node_col then if line-1 ~= node_line or col-1 ~= node_col then
current_node = nil current_node = nil
end end
end end
if not current_node then
local root = parsers.get_parser():parse():root()
current_node = root:named_descendant_for_range(line-1, col-1, line-1, col)
end
return current_node
end
M.do_node_movement = function(kind)
local buf, line, col = unpack(vim.fn.getpos("."))
local current_node = M.get_current_node(buf, line, col)
local destination_node local destination_node
if parsers.has_parser() then if parsers.has_parser() then
@ -71,17 +84,7 @@ M.move_right = function() M.do_node_movement(M.NodeMovementKind.right) end
M.select_current_node = function() M.select_current_node = function()
local buf, line, col = unpack(vim.fn.getpos(".")) local buf, line, col = unpack(vim.fn.getpos("."))
local current_node = M.current_node[buf] local current_node = M.get_current_node(buf, line, col)
if current_node then
local node_line, node_col = current_node:start()
if line-1 ~= node_line or col-1 ~= node_col then
current_node = nil
end
end
if not current_node then
local root = parsers.get_parser():parse():root()
current_node = root:named_descendant_for_range(line-1, col-1, line-1, col)
end
utils.node_range_to_vim(current_node) utils.node_range_to_vim(current_node)
end end