From 39da51bbd12b8cda64226f905dba6556cc9d9b75 Mon Sep 17 00:00:00 2001 From: Thomas Vigouroux Date: Sat, 2 May 2020 11:33:32 +0200 Subject: [PATCH] modules: move textobj to incremental_selection As suggested in #37, rename the textobj module to incremental_selection. Also adds a utility function to get the config of a module. --- lua/nvim-treesitter/configs.lua | 6 +++++- .../{textobj.lua => incremental_selection.lua} | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) rename lua/nvim-treesitter/{textobj.lua => incremental_selection.lua} (87%) 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 similarity index 87% rename from lua/nvim-treesitter/textobj.lua rename to 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()", funcname), { silent = true }) + string.format(":lua require'nvim-treesitter.incremental_selection'.%s()", funcname), { silent = true }) api.nvim_buf_set_keymap(buf, 'o', mapping, string.format(":normal v%s", 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)