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

Add node_movement.select_current_node

Browse source
This commit is contained in:
Stephan Seitz 2020-05-03 11:35:57 +02:00
parent 5cc7407c7f
commit e1763cadf3
4 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lua/nvim-treesitter/configs.lua
View file

@ -232,6 +232,7 @@ local config = {
move_down = "<a-j>",
move_left = "<a-h>",
move_right = "<a-l>",
select_current_node = "grn",
},
},
-- folding = {

19
lua/nvim-treesitter/incremental_selection.lua
View file

@ -3,23 +3,6 @@ local utils = require'nvim-treesitter.utils'
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("'<"))
@ -37,7 +20,7 @@ local function select_incremental(increment_func)
end
end
return node_range_to_vim(node)
return utils.node_range_to_vim(node)
end
end

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

@ -69,6 +69,22 @@ M.move_down = function() M.do_node_movement(M.NodeMovementKind.down) end
M.move_left = function() M.do_node_movement(M.NodeMovementKind.left) end
M.move_right = function() M.do_node_movement(M.NodeMovementKind.right) end
M.select_current_node = function()
local buf, line, col = unpack(vim.fn.getpos("."))
local current_node = M.current_node[buf]
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)
end
function M.attach(bufnr)
local buf = bufnr or api.nvim_get_current_buf()

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

@ -152,4 +152,21 @@ function M.get_previous_node(node, allow_switch_parents, allow_previous_parent)
return destination_node
end
function M.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
return M