From afd5d11519dbf8188151072ea194d388a15eed8f Mon Sep 17 00:00:00 2001 From: Thomas Vigouroux Date: Thu, 22 Apr 2021 15:53:28 +0200 Subject: feat(incremental_selection): don't require locals --- lua/nvim-treesitter/configs.lua | 2 +- lua/nvim-treesitter/incremental_selection.lua | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'lua') diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua index 4fe98bb2c..f6815a80f 100644 --- a/lua/nvim-treesitter/configs.lua +++ b/lua/nvim-treesitter/configs.lua @@ -37,7 +37,7 @@ local builtin_modules = { scope_incremental="grc", node_decremental="grm" }, - is_supported = queries.has_locals + is_supported = function() return true end }, indent = { module_path = 'nvim-treesitter.indent', diff --git a/lua/nvim-treesitter/incremental_selection.lua b/lua/nvim-treesitter/incremental_selection.lua index ac2c98386..8a6f326ac 100644 --- a/lua/nvim-treesitter/incremental_selection.lua +++ b/lua/nvim-treesitter/incremental_selection.lua @@ -4,6 +4,7 @@ local configs = require'nvim-treesitter.configs' local ts_utils = require'nvim-treesitter.ts_utils' local locals = require'nvim-treesitter.locals' local parsers = require'nvim-treesitter.parsers' +local queries = require'nvim-treesitter.query' local M = {} @@ -114,7 +115,12 @@ M.node_incremental = select_incremental(function(node) end) M.scope_incremental = select_incremental(function(node) - return locals.containing_scope(node:parent() or node) + local lang = parsers.get_buf_lang() + if queries.has_locals(lang) then + return locals.containing_scope(node:parent() or node) + else + return node + end end) function M.node_decremental() -- cgit v1.2.3-70-g09d2