diff options
| author | Stephan Seitz <stephan.seitz@fau.de> | 2020-07-10 22:17:51 +0200 |
|---|---|---|
| committer | Thomas Vigouroux <39092278+vigoux@users.noreply.github.com> | 2020-07-16 09:34:31 +0200 |
| commit | 8cf2dc7f9ad31c7467d28f90aec920018e240b7f (patch) | |
| tree | 3cfa3df9bc6aef2006b2bd6ec0fed530ffece02c /lua/nvim-treesitter/textobjects.lua | |
| parent | a4e2692c7b9fb562eca39ce0bb10ec2544bc7ccb (diff) | |
Refactor locals.lua:
- shared query group stuff -> query.lua
- local-specific stuff from ts_utils -> locals.lua
Diffstat (limited to 'lua/nvim-treesitter/textobjects.lua')
| -rw-r--r-- | lua/nvim-treesitter/textobjects.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lua/nvim-treesitter/textobjects.lua b/lua/nvim-treesitter/textobjects.lua index b6c5d735..2d6a25ff 100644 --- a/lua/nvim-treesitter/textobjects.lua +++ b/lua/nvim-treesitter/textobjects.lua @@ -4,7 +4,6 @@ local ts = vim.treesitter local configs = require "nvim-treesitter.configs" local parsers = require "nvim-treesitter.parsers" local queries = require'nvim-treesitter.query' -local locals = require'nvim-treesitter.locals' local ts_utils = require'nvim-treesitter.ts_utils' local M = {} @@ -20,10 +19,11 @@ function M.select_textobject(query_string) local matches = {} if string.match(query_string, '^@.*') then - matches = locals.get_capture_matches(bufnr, query_string, 'textobjects') + matches = queries.get_capture_matches(bufnr, query_string, 'textobjects') else local parser = parsers.get_parser(bufnr, lang) local root = parser:parse():root() + local start_row, _, end_row, _ = root:range() local query = ts.parse_query(lang, query_string) @@ -41,7 +41,7 @@ function M.select_textobject(query_string) local earliest_start for _, m in pairs(matches) do - if ts_utils.is_in_node_range(m.node, row, col) then + if m.node and ts_utils.is_in_node_range(m.node, row, col) then local length = ts_utils.node_length(m.node) if not match_length or length < match_length then smallest_range = m |