aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKiyan Yazdani <yazdani.kiyan@protonmail.com>2020-05-02 14:37:46 +0200
committerGitHub <noreply@github.com>2020-05-02 14:37:46 +0200
commit0207836eb2aaa876d52ffddd1ec89ec347c67996 (patch)
treef9e6cb3830f3e88a637205cedca11216c8deb70d
parentMerge pull request #36 from theHamsta/community-parsers (diff)
parentmodules: move textobj to incremental_selection (diff)
downloadnvim-treesitter-0207836eb2aaa876d52ffddd1ec89ec347c67996.tar
nvim-treesitter-0207836eb2aaa876d52ffddd1ec89ec347c67996.tar.gz
nvim-treesitter-0207836eb2aaa876d52ffddd1ec89ec347c67996.tar.bz2
nvim-treesitter-0207836eb2aaa876d52ffddd1ec89ec347c67996.tar.lz
nvim-treesitter-0207836eb2aaa876d52ffddd1ec89ec347c67996.tar.xz
nvim-treesitter-0207836eb2aaa876d52ffddd1ec89ec347c67996.tar.zst
nvim-treesitter-0207836eb2aaa876d52ffddd1ec89ec347c67996.zip
Merge pull request #39 from vigoux/incremental_selection
Move textobj module to incremental_selection.
-rw-r--r--lua/nvim-treesitter/configs.lua6
-rw-r--r--lua/nvim-treesitter/incremental_selection.lua (renamed from lua/nvim-treesitter/textobj.lua)6
2 files changed, 8 insertions, 4 deletions
diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index 9363c9e68..10dcc9605 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -214,7 +214,7 @@ local config = {
return queries.get_query(ft, 'highlights') ~= nil
end
},
- textobj = {
+ incremental_selection = {
enable = false,
disable = {},
keymaps = {
@@ -403,4 +403,8 @@ function M.available_modules()
return vim.tbl_keys(config.modules)
end
+function M.get_module(mod)
+ return config.modules[mod]
+end
+
return M
diff --git a/lua/nvim-treesitter/textobj.lua b/lua/nvim-treesitter/incremental_selection.lua
index c2bcc30f0..70eefe37c 100644
--- a/lua/nvim-treesitter/textobj.lua
+++ b/lua/nvim-treesitter/incremental_selection.lua
@@ -56,10 +56,10 @@ end)
function M.attach(bufnr)
local buf = bufnr or api.nvim_get_current_buf()
- local config = require'nvim-treesitter.configs'.get_config().textobj
+ local config = require'nvim-treesitter.configs'.get_module('incremental_selection')
for funcname, mapping in pairs(config.keymaps) do
api.nvim_buf_set_keymap(buf, 'v', mapping,
- string.format(":lua require'nvim-treesitter.textobj'.%s()<CR>", funcname), { silent = true })
+ string.format(":lua require'nvim-treesitter.incremental_selection'.%s()<CR>", funcname), { silent = true })
api.nvim_buf_set_keymap(buf, 'o', mapping,
string.format(":normal v%s<CR>", mapping), { silent = true })
end
@@ -68,7 +68,7 @@ end
function M.detach(bufnr)
local buf = bufnr or api.nvim_get_current_buf()
- local config = require'nvim-treesitter.configs'.get_config().textobj
+ local config = require'nvim-treesitter.configs'.get_module('incremental_selection')
for _, mapping in pairs(config.keymaps) do
api.nvim_buf_del_keymap(buf, 'v', mapping)
api.nvim_buf_del_keymap(buf, 'o', mapping)