mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-03-23 17:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

treesitter: Fix linter warning and add helper function to remove duplicated logic

Browse Source 
This function returns the start and stop value if set else the node's range is used
When the node's range is used, the stop is incremented by 1 to make the search inclusive
This commit is contained in:
“jvgrootveld”
2021-01-18 08:17:12 +01:00
parent a2818819bb
commit 9bed991cfb
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/lua/vim/treesitter/query.lua
View File

@@ -340,6 +340,19 @@ function Query:apply_directives(match, pattern, source, metadata)
end
end
--- Returns the start and stop value if set else the node's range.
-- When the node's range is used, the stop is incremented by 1
-- to make the search inclusive.
local function value_or_node_range(start, stop, node)
if start == nil and stop == nil then
local node_start, _, node_stop, _ = node:range()
return node_start, node_stop + 1 -- Make stop inclusive
end
return start, stop
end
--- Iterates of the captures of self on a given range.
--
-- @param node The node under witch the search will occur
@@ -354,10 +367,7 @@ function Query:iter_captures(node, source, start, stop)
source = vim.api.nvim_get_current_buf()
end
if start == nil and stop == nil then
start, _, stop, _ = node:range()
stop = stop + 1 -- Make stop inclusive
end
start, stop = value_or_node_range(start, stop, node)
local raw_iter = node:_rawquery(self.query, true, start, stop)
local function iter()
@@ -392,10 +402,7 @@ function Query:iter_matches(node, source, start, stop)
source = vim.api.nvim_get_current_buf()
end
if start == nil and stop == nil then
start, _, stop, _ = node:range()
stop = stop + 1 -- Make stop inclusive
end
start, stop = value_or_node_range(start, stop, node)
local raw_iter = node:_rawquery(self.query, false, start, stop)
local function iter()