Refactoring mappings

config/.config/nvim/lazy-lock.json

@@ -3,7 +3,7 @@
   "asyncrun.vim": { "branch": "master", "commit": "7191d0c30dd105e5d7f897b9a6ee19cabe734466" },
   "auto-session": { "branch": "main", "commit": "21033c6815f249a7839c3a85fc8a6b44d74925c9" },
   "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" },
-  "catppuccin": { "branch": "main", "commit": "2df7036c5c303c9184869936e40ca18935e4afcb" },
+  "catppuccin": { "branch": "main", "commit": "ad6305594737e16155c41c176c611e865c26bb6d" },
   "ciderlsp_nvim": { "branch": "main", "commit": "7007e1881eb421a4d6f7ef1f31e973f7cc0b4d8d" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
@@ -21,49 +21,48 @@
   "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
   "factorus": { "branch": "master", "commit": "19816e370df82fe96ca96856cf2be4d1c82302da" },
-  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "fzf": { "branch": "master", "commit": "3e9efd1401404da8afdcf9757ac9996f5c48290f" },
+  "fidget.nvim": { "branch": "main", "commit": "f1c375ba68839eaa4a65efdf2aa078c0da0548fe" },
+  "fzf": { "branch": "master", "commit": "d471067e3f46f64e6401d1c5717424535fe4c96c" },
   "fzf.vim": { "branch": "master", "commit": "1dcdb21db618055134cd611f4f5918f6d00a5df0" },
   "git-conflict.nvim": { "branch": "main", "commit": "8d962d83cae924a314965f738ed1e05a4000d682" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f1c5aa10509e8e109f449499b69567191d25320f" },
   "go.nvim": { "branch": "master", "commit": "a8095eb334495caec3099b717cc7f5b1fbc3e628" },
   "google_comments": { "branch": "main", "commit": "ad50cd3c71a7553c92a966dba6a03232a81e3812" },
   "guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" },
-  "hg": { "branch": "main", "commit": "f9bab452d778f74976430f091a8830ec2d8a3720" },
-  "impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" },
+  "hg": { "branch": "main", "commit": "1c4bdf80174ec840ba76c4dc7032c4313db62199" },
   "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
   "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
-  "lazy.nvim": { "branch": "main", "commit": "678179543e0d27650c328d8659f2c2cab4d854ef" },
-  "libp.nvim": { "branch": "main", "commit": "db62a17ad68946d970bca0b0736e854058d3b307" },
+  "lazy.nvim": { "branch": "main", "commit": "10d4371745f88837c78c8daab00c5be6e48abea4" },
+  "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lsp-zero.nvim": { "branch": "v2.x", "commit": "8fda9a849d6ab4196ecf129905764ddefdfb64b5" },
+  "lsp-zero.nvim": { "branch": "v2.x", "commit": "cf38e6034f2d776ebd16304a334b79543d1ffa60" },
   "lsp_lines.nvim": { "branch": "main", "commit": "3b57922d2d79762e6baedaf9d66d8ba71f822816" },
   "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
   "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" },
-  "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "d381fcb78d7a562c3244e1c8f76406954649db36" },
+  "mason.nvim": { "branch": "main", "commit": "4be1226f48bc2011024110f37b17f5ee468df58f" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa" },
   "nerdcommenter": { "branch": "master", "commit": "b0b09ea46c9f0509556257bd8b838b40f493d6a0" },
-  "nui.nvim": { "branch": "main", "commit": "062e366afcdf2bc1e9d28313a1df4ff14f05cb4e" },
+  "nui.nvim": { "branch": "main", "commit": "e916f67b6bae1d290efa7c824ae4e04023cdfb20" },
   "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" },
-  "nvim-cmp": { "branch": "main", "commit": "09ff53ff579cfa3368f8051b0dbe88406891aabe" },
+  "nvim-cmp": { "branch": "main", "commit": "b8c2a62b3bd3827aa059b43be3dd4b5c45037d65" },
   "nvim-lightbulb": { "branch": "master", "commit": "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7" },
-  "nvim-lspconfig": { "branch": "master", "commit": "0f598b9ab9f2a6d7e137074be99c8d89af44b990" },
+  "nvim-lspconfig": { "branch": "master", "commit": "295c646488d5baa63c6c4da68fe61171b9257375" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
   "nvim-osc52": { "branch": "main", "commit": "3e96035d62290183fe7a11418db2b254fcfcaee3" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
-  "nvim-treesitter": { "branch": "master", "commit": "51dfcfdfdea564c7a6bf155cf5b7c9831193ddae" },
+  "nvim-treesitter": { "branch": "master", "commit": "5822a8c6886f0238a315b57e5e96acdd74d04448" },
   "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" },
   "nvim_figtree": { "branch": "main", "commit": "9bc3025f46e34732382da1019e256a9d8bec1e55" },
-  "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" },
-  "refactoring.nvim": { "branch": "master", "commit": "a85dfff2602b739627b9f8a831de8c3e7b2993ae" },
+  "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" },
+  "refactoring.nvim": { "branch": "master", "commit": "08bcc40638cd4debd5184f934971858e1c5acff4" },
   "registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" },
   "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
   "telekasten.nvim": { "branch": "main", "commit": "36dad2692974a5cc69813441442ccce8c53fbfd4" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "fc70589a93d7bb42f4671ad75c8628a29995bcbe" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "87dfaa9a9c251388cf4f01b9d4078c29d1fc8803" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
   "telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },
   "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
@@ -79,7 +78,6 @@
   "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" },
   "vim-searchindex": { "branch": "master", "commit": "b0788c8213210b3bd23b62847dd5a9ebbe4ad648" },
   "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" },
-  "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
   "vim-tmux-focus-events": { "branch": "master", "commit": "b1330e04ffb95ede8e02b2f7df1f238190c67056" },

vim/.vim/lua/config/google.lua

@@ -1,6 +1,4 @@
-source /usr/share/vim/google/glug/bootstrap.vim
-source /usr/share/vim/google/core.vim
-
+vim.cmd([[
 let g:VCSCommandDisableMappings = 1
 
 let g:signify_skip_filename_pattern = ['\.pipertmp.*']
@@ -133,6 +131,4 @@ nnoremap <leader>cc :CritiqueUnresolvedComments<space><cr>
 nmap <leader>rbs ss <leader>rb
 
 nmap <leader>yb :let @+ = join(blaze#GetTargets(), ' ')<cr>
-
-Glug corpweb
-nnoremap <leader>csw :CorpWebCsFile<cr>
+]])

vim/.vim/lua/config/lsp.lua

@@ -126,7 +126,7 @@ end
 cmp.setup.cmdline({ '/', '?' }, {
     mapping = cmp.mapping.preset.cmdline(),
     sources = {
-        { name = 'buffer' }
+        { name = 'buffer', max_item_count = 5 }
     }
 })
 
@@ -150,7 +150,7 @@ local conditionalSources = {
     { name = "treesitter" },
     { name = "crates" },
     { name = "vim_vsnip" },
-    { name = "buffer", keyword_length = 5, group_index = 2 },
+    { name = "buffer", max_item_count = 5, keyword_length = 5, group_index = 2 },
     {
         name = 'spell',
         option = {
@@ -163,6 +163,8 @@ local conditionalSources = {
 }
 
 if use_google() then
+    require('cmp_nvim_ciderlsp').setup()
+
     local cider_lsp_handlers = {
         ["textDocument/publishDiagnostics"] = vim.lsp.with(
         vim.lsp.diagnostic.on_publish_diagnostics, {

vim/.vim/lua/config/telescope.lua

@@ -34,48 +34,13 @@ require('telescope').setup {
         end,
     },
     extensions = { -- this block is optional, and if omitted, defaults will be used
-    codesearch = {
-        experimental = true           -- enable results from google3/experimental
+        file_browser = {
+            -- disables netrw and use telescope-file-browser in its place
+            hijack_netrw = true,
+        },
+        codesearch = {
+            experimental = true           -- enable results from google3/experimental
+        }
     }
 }
-}
-
-local map = require("utils").map
-
-map('n', '<leader>tb', ":Telescope file_buffers", { desc = '[T]elescope [B]uffers' })
-map('n', '<leader>tf', [[:lua require('telescope.builtin').find_files{ find_command = {'rg', '--files', '--hidden', '-g', '!node_modules/**'} }<cr>]], { desc = '[T]elescope [F]iles' })
-map('n', '<leader>th', require('telescope.builtin').help_tags, { desc = '[T]elescope [H]elp' })
-map('n', '<leader>tw', require('telescope.builtin').grep_string, { desc = '[T]elescope current [W]ord' })
-map('n', '<leader>tg', require('telescope.builtin').live_grep, { desc = '[T]elescope by [G]rep' })
-
-if use_google() then
-    -- These custom mappings let you open telescope-codesearch quickly:
-    map('n', '<C-P>',
-    [[<cmd>lua require('telescope').extensions.codesearch.find_files{}<CR>]],
-    { noremap = true, silent=true }
-    )
-
-    -- Search using codesearch queries.
-    map(
-    "n",
-    "<leader>cs",
-    [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
-    { noremap = true, silent = true }
-    )
-
-    -- Search for the word under cursor.
-    map(
-    "n",
-    "<leader>CS",
-    [[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]],
-    { noremap = true, silent = true }
-    )
-
-    -- Search for text selected in Visual mode.
-    map(
-    "v",
-    "<leader>cs",
-    [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
-    { noremap = true, silent = true }
-    )
-end
+require("telescope").load_extension "file_browser"

vim/.vim/lua/plugins/base.lua

@@ -6,12 +6,10 @@ return
     'kyazdani42/nvim-web-devicons',
 
     'jghauser/mkdir.nvim',
-    'lewis6991/impatient.nvim',
-    'dstein64/vim-startuptime',
     'will133/vim-dirdiff',
     'renerocksai/calendar-vim',
     'google/vim-searchindex',
-    'apalmer1377/factorus',
+    -- 'apalmer1377/factorus',
     'hrsh7th/vim-vsnip',
     'kosayoda/nvim-lightbulb',
     'tpope/vim-surround',
@@ -146,7 +144,7 @@ return
         },
         keys = {
             { '<leader>tb', ":Telescope file_buffers", desc = '[T]elescope [B]uffers' } ,
-            { '<leader>tf', [[:lua require('telescope.builtin').find_files{ find_command = {'rg', '--files', '--hidden', '-g', '!node_modules/**'} }<cr>]], desc = '[T]elescope [F]iles' },
+            { '<leader>tf', [[:lua require "telescope".extensions.file_browser.file_browser{}<cr>]], desc = '[T]elescope [F]iles' },
             { '<leader>th', [[:lua require('telescope.builtin').help_tags<cr>]],  desc = '[T]elescope [H]elp' },
             { '<leader>tw', [[:lua require('telescope.builtin').grep_string<cr>]],  desc = '[T]elescope current [W]ord' },
             { '<leader>tg', [[:lua require('telescope.builtin').live_grep<cr>]],  desc = '[T]elescope by [G]rep' },
@@ -188,7 +186,25 @@ return
         },
         config = function()
             require("config.refactoring")
-        end
+        end,
+        keys = {
+            -- remap to open the Telescope refactoring menu in visual mode
+            {"<leader>rr", "<Esc><cmd>lua require('telescope').extensions.refactoring.refactors()<CR>", { noremap = true }},
+
+            -- Remaps for the refactoring operations currently offered by the plugin
+            { "<leader>rx", [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function')<CR>]], mode ="v", {noremap = true, silent = true, expr = false}},
+            { "<leader>rxf", [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]],mode ="v",  {noremap = true, silent = true, expr = false}},
+            { "<leader>rxv", [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]], mode ="v" , {noremap = true, silent = true, expr = false}},
+            { "<leader>ri", [[ <Esc><Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]], mode ="v",  {noremap = true, silent = true, expr = false}},
+
+            -- Extract block doesn't need visual mode
+            { "<leader>rxb", [[ <Cmd>lua require('refactoring').refactor('Extract Block')<CR>]], {noremap = true, silent = true, expr = false}},
+            { "<leader>rxbf", [[ <Cmd>lua require('refactoring').refactor('Extract Block To File')<CR>]], {noremap = true, silent = true, expr = false}},
+
+            -- Inline variable can also pick up the identifier currently under the cursor without visual mode
+            { "<leader>ri", [[ <Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]], {noremap = true, silent = true, expr = false}},
+            { "<leader>rx", [[ <Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]], {noremap = true, silent = true, expr = false}},
+        }
     },
     {'andymass/vim-matchup', event = 'VimEnter'},
 

vim/.vim/lua/plugins/google.lua

@@ -22,7 +22,6 @@ if use_google() then
         goog("glaive"),
         goog("alert"),
         goog("csearch"),
-        goog("codefmt"),
         goog("codefmt-google"),
         goog("languages"),
         goog("googlestyle"),
@@ -41,6 +40,14 @@ if use_google() then
         goog("g4"),
         goog("outline-window"),
         goog("fzf-query"),
+        {
+            name = "codefmt",
+            dir = "/usr/share/vim/google/codefmt",
+            dependencies = { "maktaba", "glaive" },
+            config = function()
+                vim.cmd([[Glaive codefmt ktfmt_executable=`["/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt_deploy.jar", "--google-style"]`]])
+            end
+        },
         {
             name = "imp-google",
             dir = "/usr/share/vim/google/imp-google",
@@ -116,3 +123,4 @@ if use_google() then
 else
     return {}
 end
+

vim/.vim/prefs/'

@@ -1,82 +0,0 @@
--- Imports the plugin's additional Lua modules.
--- local fetch = require("example-plugin.fetch")
--- local update = require("example-plugin.update")
-
--- Creates an object for the module. All of the module's
--- functions are associated with this object, which is
--- returned when the module is called with `require`.
-local M = {}
-
--- Routes calls made to this module to functions in the
--- plugin's other modules.
--- M.fetch_todos = fetch.fetch_todos
--- M.insert_todo = update.insert_todo
--- M.complete_todo = update.complete_todo
-
-function M.setup()
-    vim.api.nvim_create_user_command('CritiqueHelloWorld', M.hello_world, {})
-    -- vim.api.nvim_create_user_command('CritiqueOpenTree', M.open_window, {})
-end
-
-local buf, win
-
-function M.hello_world()
-  vim.notify("HELLO WORLD!!!")
-end
-
-function M.open_window()
-  buf = vim.api.nvim_create_buf(false, true) -- create new emtpy buffer
-
-  vim.api.nvim_buf_set_option(buf, 'bufhidden', 'wipe')
-
-  -- get dimensions
-  local width = vim.api.nvim_get_option("columns")
-  local height = vim.api.nvim_get_option("lines")
-
-  -- calculate our floating window size
-  local win_height = math.ceil(height * 0.8 - 4)
-  local win_width = math.ceil(width * 0.8)
-
-  -- and its starting position
-  local row = math.ceil((height - win_height) / 2 - 1)
-  local col = math.ceil((width - win_width) / 2)
-
-  -- set some options
-  local opts = {
-    style = "minimal",
-    relative = "editor",
-    width = win_width,
-    height = win_height,
-    row = row,
-    col = col
-  }
-
-  -- and finally create it with buffer attached
-  win = vim.api.nvim_open_win(buf, true, opts)
-end
-
-local function update_view()
-  -- we will use vim systemlist function which run shell
-  -- command and return result as list
-  local result = vim.fn.systemlist('hg xl')
-
-  -- with small indentation results will look better
-  for k,v in pairs(result) do
-    result[k] = '  '..result[k]
-  end
-
-  api.nvim_buf_set_lines(buf, 0, -1, false, {
-      center('Critique'),
-      ''
-  })
-
-  api.nvim_buf_set_lines(buf, 0, -1, false, result)
-end
-
-local function center(str)
-  local width = api.nvim_win_get_width(0)
-  local shift = math.floor(width / 2) - math.floor(string.len(str) / 2)
-  return string.rep(' ', shift) .. str
-end
-
-return M

vim/.vim/prefs/1

@@ -1,15 +0,0 @@
-" perl plugins
-
-
-" node plugins
-
-
-" python3 plugins
-
-
-" ruby plugins
-
-
-" python plugins
-
-

vim/.vimrc

@@ -190,6 +190,4 @@ endfun
 filetype plugin indent on
 syntax on
 
-if filereadable(expand("~/use_google"))
-  source ~/.vim/prefs/google.vim
-endif
+lua require("config.google")

zsh/.aliases.sh

@@ -39,3 +39,10 @@ alias lr='ls -R | grep ":$" | sed -e '\''s/:$//'\'' -e '\''s/[^-][^\/]*\//--/g'\
 
 # recursively  delete .DS_Store files
 alias ds_clean='find ./ -name ".DS_Store" -depth -exec rm {} \;'
+
+swap_files () {
+  tmp_name=$(TMPDIR=$(dirname -- "$1") mktemp) &&
+  mv -f -- "$1" "$tmp_name" &&
+  mv -f -- "$2" "$1" &&
+  mv -f -- "$tmp_name" "$2"
+}