From 2987b5d89b073556a366a312774540646dbacbb4 Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Wed, 3 May 2023 16:36:25 -0500 Subject: [PATCH] mappings n stuff --- vim/.vim/lua/config/fig.lua | 1 - vim/.vim/lua/config/imp.lua | 2 +- vim/.vim/lua/config/refactoring.lua | 22 +++++++++++++++++----- vim/.vim/lua/config/symbols-outline.lua | 4 ++-- vim/.vim/lua/config/telescope.lua | 2 +- vim/.vim/lua/plugins.lua | 4 ++++ 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/vim/.vim/lua/config/fig.lua b/vim/.vim/lua/config/fig.lua index 81c3bcc..9911871 100644 --- a/vim/.vim/lua/config/fig.lua +++ b/vim/.vim/lua/config/fig.lua @@ -2,7 +2,6 @@ local map = require("utils").map local use_google = require("utils").use_google if use_google() then - map("n", "tw", ":Telescope citc workspaces") map("n", "tm", ":Telescope citc modified") map("n", "tb", ":Telescope file_browser") diff --git a/vim/.vim/lua/config/imp.lua b/vim/.vim/lua/config/imp.lua index c4dd2bc..8d88186 100644 --- a/vim/.vim/lua/config/imp.lua +++ b/vim/.vim/lua/config/imp.lua @@ -14,7 +14,7 @@ if use_google() then set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/vim-imp set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/imp-csearch Glug imp-google - Glaive imp Suggest[default]=buffer,csearch,prompt + Glaive imp Suggest[default]=buffer,csearch,prompt Pick[default]=fzf ]]) -- To search for imports in the file's parent directory before using Code Search across all of google3, install ripgrep and try vim.cmd([[ diff --git a/vim/.vim/lua/config/refactoring.lua b/vim/.vim/lua/config/refactoring.lua index 3929685..a4cfd89 100644 --- a/vim/.vim/lua/config/refactoring.lua +++ b/vim/.vim/lua/config/refactoring.lua @@ -1,14 +1,26 @@ require('refactoring').setup({}) +-- load refactoring Telescope extension +require("telescope").load_extension("refactoring") + +-- remap to open the Telescope refactoring menu in visual mode +vim.api.nvim_set_keymap( + "v", + "rr", + "lua require('telescope').extensions.refactoring.refactors()", + { noremap = true } +) + -- Remaps for the refactoring operations currently offered by the plugin -vim.api.nvim_set_keymap("v", "re", [[ lua require('refactoring').refactor('Extract Function')]], {noremap = true, silent = true, expr = false}) -vim.api.nvim_set_keymap("v", "rf", [[ lua require('refactoring').refactor('Extract Function To File')]], {noremap = true, silent = true, expr = false}) -vim.api.nvim_set_keymap("v", "rv", [[ lua require('refactoring').refactor('Extract Variable')]], {noremap = true, silent = true, expr = false}) +vim.api.nvim_set_keymap("v", "rx", [[ lua require('refactoring').refactor('Extract Function')]], {noremap = true, silent = true, expr = false}) +vim.api.nvim_set_keymap("v", "rxf", [[ lua require('refactoring').refactor('Extract Function To File')]], {noremap = true, silent = true, expr = false}) +vim.api.nvim_set_keymap("v", "rxv", [[ lua require('refactoring').refactor('Extract Variable')]], {noremap = true, silent = true, expr = false}) vim.api.nvim_set_keymap("v", "ri", [[ lua require('refactoring').refactor('Inline Variable')]], {noremap = true, silent = true, expr = false}) -- Extract block doesn't need visual mode --- vim.api.nvim_set_keymap("n", "rb", [[ lua require('refactoring').refactor('Extract Block')]], {noremap = true, silent = true, expr = false}) --- vim.api.nvim_set_keymap("n", "rbf", [[ lua require('refactoring').refactor('Extract Block To File')]], {noremap = true, silent = true, expr = false}) +vim.api.nvim_set_keymap("n", "rxb", [[ lua require('refactoring').refactor('Extract Block')]], {noremap = true, silent = true, expr = false}) +vim.api.nvim_set_keymap("n", "rxbf", [[ lua require('refactoring').refactor('Extract Block To File')]], {noremap = true, silent = true, expr = false}) -- Inline variable can also pick up the identifier currently under the cursor without visual mode vim.api.nvim_set_keymap("n", "ri", [[ lua require('refactoring').refactor('Inline Variable')]], {noremap = true, silent = true, expr = false}) +vim.api.nvim_set_keymap("n", "rx", [[ lua require('refactoring').refactor('Extract Variable')]], {noremap = true, silent = true, expr = false}) diff --git a/vim/.vim/lua/config/symbols-outline.lua b/vim/.vim/lua/config/symbols-outline.lua index b207bb0..3ee942f 100644 --- a/vim/.vim/lua/config/symbols-outline.lua +++ b/vim/.vim/lua/config/symbols-outline.lua @@ -3,9 +3,9 @@ require("symbols-outline").setup( show_relative_numbers = true, keymaps = { -- These keymaps can be a string or a table for multiple keys -- close = {"", "q"}, - -- goto_location = "", + goto_location = "", -- focus_location = "o", - -- hover_symbol = "", + hover_symbol = "", toggle_preview = "L", -- rename_symbol = "r", -- code_actions = "a", diff --git a/vim/.vim/lua/config/telescope.lua b/vim/.vim/lua/config/telescope.lua index f274b16..b3bbde0 100644 --- a/vim/.vim/lua/config/telescope.lua +++ b/vim/.vim/lua/config/telescope.lua @@ -42,7 +42,7 @@ require('telescope').setup { local map = require("utils").map -map('n', 'tb', ":Telescope file_browser", { desc = '[T]elescope [B]rowse' }) +map('n', 'tb', ":Telescope file_buffers", { desc = '[T]elescope [B]uffers' }) map('n', 'tf', [[:lua require('telescope.builtin').find_files{ find_command = {'rg', '--files', '--hidden', '-g', '!node_modules/**'} }]], { desc = '[T]elescope [F]iles' }) map('n', 'th', require('telescope.builtin').help_tags, { desc = '[T]elescope [H]elp' }) map('n', 'tw', require('telescope.builtin').grep_string, { desc = '[T]elescope current [W]ord' }) diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua index 54acff9..d5c4a96 100644 --- a/vim/.vim/lua/plugins.lua +++ b/vim/.vim/lua/plugins.lua @@ -149,6 +149,10 @@ require('packer').startup(function(use) use { 'ThePrimeagen/refactoring.nvim', + requires = { + {"nvim-lua/plenary.nvim"}, + {"nvim-treesitter/nvim-treesitter"} + }, config = [[ require("config.refactoring") ]] } use 'apalmer1377/factorus'