From 74af7a2a528ff9e26de2dac039d717caae63acf1 Mon Sep 17 00:00:00 2001 From: Stanley Chan Date: Tue, 6 Oct 2020 22:56:08 -0500 Subject: [PATCH 1/2] Move modules --- .../refactor}/highlight_current_scope.lua | 0 .../refactor}/highlight_definitions.lua | 0 .../refactor}/navigation.lua | 0 .../refactor}/smart_rename.lua | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename lua/{nvim-treesitter-refactor => nvim-treesitter/refactor}/highlight_current_scope.lua (100%) rename lua/{nvim-treesitter-refactor => nvim-treesitter/refactor}/highlight_definitions.lua (100%) rename lua/{nvim-treesitter-refactor => nvim-treesitter/refactor}/navigation.lua (100%) rename lua/{nvim-treesitter-refactor => nvim-treesitter/refactor}/smart_rename.lua (100%) diff --git a/lua/nvim-treesitter-refactor/highlight_current_scope.lua b/lua/nvim-treesitter/refactor/highlight_current_scope.lua similarity index 100% rename from lua/nvim-treesitter-refactor/highlight_current_scope.lua rename to lua/nvim-treesitter/refactor/highlight_current_scope.lua diff --git a/lua/nvim-treesitter-refactor/highlight_definitions.lua b/lua/nvim-treesitter/refactor/highlight_definitions.lua similarity index 100% rename from lua/nvim-treesitter-refactor/highlight_definitions.lua rename to lua/nvim-treesitter/refactor/highlight_definitions.lua diff --git a/lua/nvim-treesitter-refactor/navigation.lua b/lua/nvim-treesitter/refactor/navigation.lua similarity index 100% rename from lua/nvim-treesitter-refactor/navigation.lua rename to lua/nvim-treesitter/refactor/navigation.lua diff --git a/lua/nvim-treesitter-refactor/smart_rename.lua b/lua/nvim-treesitter/refactor/smart_rename.lua similarity index 100% rename from lua/nvim-treesitter-refactor/smart_rename.lua rename to lua/nvim-treesitter/refactor/smart_rename.lua From f4cd1d6fe173d3a63368c153cded9624e7aa55a6 Mon Sep 17 00:00:00 2001 From: Stanley Chan Date: Tue, 6 Oct 2020 23:00:54 -0500 Subject: [PATCH 2/2] Module paths and config paths --- lua/nvim-treesitter-refactor.lua | 8 ++++---- lua/nvim-treesitter/refactor/highlight_definitions.lua | 6 +++--- lua/nvim-treesitter/refactor/navigation.lua | 2 +- lua/nvim-treesitter/refactor/smart_rename.lua | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lua/nvim-treesitter-refactor.lua b/lua/nvim-treesitter-refactor.lua index f2f79e2..305f84a 100644 --- a/lua/nvim-treesitter-refactor.lua +++ b/lua/nvim-treesitter-refactor.lua @@ -6,19 +6,19 @@ function M.init() require "nvim-treesitter".define_modules { refactor = { highlight_definitions = { - module_path = 'nvim-treesitter-refactor.highlight_definitions', + module_path = 'nvim-treesitter.refactor.highlight_definitions', enable = false, disable = {}, is_supported = queries.has_locals }, highlight_current_scope = { - module_path = 'nvim-treesitter-refactor.highlight_current_scope', + module_path = 'nvim-treesitter.refactor.highlight_current_scope', enable = false, disable = {}, is_supported = queries.has_locals, }, smart_rename = { - module_path = 'nvim-treesitter-refactor.smart_rename', + module_path = 'nvim-treesitter.refactor.smart_rename', enable = false, disable = {}, is_supported = queries.has_locals, @@ -27,7 +27,7 @@ function M.init() } }, navigation = { - module_path = 'nvim-treesitter-refactor.navigation', + module_path = 'nvim-treesitter.refactor.navigation', enable = false, disable = {}, is_supported = queries.has_locals, diff --git a/lua/nvim-treesitter/refactor/highlight_definitions.lua b/lua/nvim-treesitter/refactor/highlight_definitions.lua index 432fb71..d430d38 100644 --- a/lua/nvim-treesitter/refactor/highlight_definitions.lua +++ b/lua/nvim-treesitter/refactor/highlight_definitions.lua @@ -42,9 +42,9 @@ function M.attach(bufnr) cmd(string.format('augroup NvimTreesitterUsages_%d', bufnr)) cmd 'au!' -- luacheck: push ignore 631 - cmd(string.format([[autocmd CursorHold lua require'nvim-treesitter-refactor.highlight_definitions'.highlight_usages(%d)]], bufnr, bufnr)) - cmd(string.format([[autocmd CursorMoved lua require'nvim-treesitter-refactor.highlight_definitions'.clear_usage_highlights(%d)]], bufnr, bufnr)) - cmd(string.format([[autocmd InsertEnter lua require'nvim-treesitter-refactor.highlight_definitions'.clear_usage_highlights(%d)]], bufnr, bufnr)) + cmd(string.format([[autocmd CursorHold lua require'nvim-treesitter.refactor.highlight_definitions'.highlight_usages(%d)]], bufnr, bufnr)) + cmd(string.format([[autocmd CursorMoved lua require'nvim-treesitter.refactor.highlight_definitions'.clear_usage_highlights(%d)]], bufnr, bufnr)) + cmd(string.format([[autocmd InsertEnter lua require'nvim-treesitter.refactor.highlight_definitions'.clear_usage_highlights(%d)]], bufnr, bufnr)) -- luacheck: pop cmd 'augroup END' end diff --git a/lua/nvim-treesitter/refactor/navigation.lua b/lua/nvim-treesitter/refactor/navigation.lua index 2985232..54cba21 100644 --- a/lua/nvim-treesitter/refactor/navigation.lua +++ b/lua/nvim-treesitter/refactor/navigation.lua @@ -154,7 +154,7 @@ function M.attach(bufnr) local config = configs.get_module('refactor.navigation') for fn_name, mapping in pairs(config.keymaps) do - local cmd = string.format([[:lua require'nvim-treesitter-refactor.navigation'.%s(%d)]], fn_name, bufnr) + local cmd = string.format([[:lua require'nvim-treesitter.refactor.navigation'.%s(%d)]], fn_name, bufnr) api.nvim_buf_set_keymap(bufnr, 'n', mapping, cmd, { silent = true, noremap = true }) end diff --git a/lua/nvim-treesitter/refactor/smart_rename.lua b/lua/nvim-treesitter/refactor/smart_rename.lua index 2caf83b..711ab99 100644 --- a/lua/nvim-treesitter/refactor/smart_rename.lua +++ b/lua/nvim-treesitter/refactor/smart_rename.lua @@ -49,7 +49,7 @@ function M.attach(bufnr) local config = configs.get_module('refactor.smart_rename') for fn_name, mapping in pairs(config.keymaps) do - local cmd = string.format([[:lua require'nvim-treesitter-refactor.smart_rename'.%s(%d)]], fn_name, bufnr) + local cmd = string.format([[:lua require'nvim-treesitter.refactor.smart_rename'.%s(%d)]], fn_name, bufnr) api.nvim_buf_set_keymap(bufnr, 'n', mapping, cmd, { silent = true, noremap = true }) end end