From 03bb42fa5195e9ed20932771938fb44eb506e458 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Wed, 22 Feb 2023 17:23:56 -0600
Subject: [PATCH] Fix vim-imp

---
 vim/.vim/lua/config/fig.lua |  2 +-
 vim/.vim/lua/config/imp.lua | 25 +++++++++++++++++++++++++
 vim/.vim/lua/plugins.lua    | 19 +++++++++++++++++++
 vim/.vim/prefs/imp.vim      | 16 ----------------
 vim/.vimrc                  |  1 -
 5 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 vim/.vim/lua/config/imp.lua

diff --git a/vim/.vim/lua/config/fig.lua b/vim/.vim/lua/config/fig.lua
index f92efd7..81c3bcc 100644
--- a/vim/.vim/lua/config/fig.lua
+++ b/vim/.vim/lua/config/fig.lua
@@ -30,5 +30,5 @@ if use_google() then
     -- [F]ig [U]pload
     map('n', '<leader>fu', [[<cmd>Hg upload tree<CR>]])
 
-    map('n', '<Leader>f', ':Figtree<CR>', { silent = true })
+    -- map('n', '<Leader>f', ':Figtree<CR>', { silent = true })
 end
diff --git a/vim/.vim/lua/config/imp.lua b/vim/.vim/lua/config/imp.lua
new file mode 100644
index 0000000..f38f6db
--- /dev/null
+++ b/vim/.vim/lua/config/imp.lua
@@ -0,0 +1,25 @@
+local map = require("utils").map
+local use_google = require("utils").use_google
+
+map("n", "<leader>csi", ":ImpSuggest <C-r><C-w><cr>")
+map("n", "<leader>ii", ":ImpSuggest <C-r><C-w><cr>")
+map("n", "<leader>if", ":ImpSuggest <C-r><C-w><cr>")
+
+if use_google() then
+    vim.cmd([[Glug! glaive]])
+
+-- vim.cmd([[Glaive imp Pick[default]=fzf Suggest[default]=buffer,primp,csearch,prompt Report[default]=echo]])
+
+    vim.cmd([[
+    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
+    ]])
+    -- To search for imports in the file's parent directory before using Code Search across all of google3, install ripgrep and try
+    vim.cmd([[
+Glaive imp Suggest[gcl]=buffer,ripgrep,csearch,prompt
+    \ Suggest[borg]=buffer,ripgrep,csearch,prompt
+    \ Location[gcl]=parent Location[borg]=parent
+    ]])
+end
diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua
index c46f979..b29fdca 100644
--- a/vim/.vim/lua/plugins.lua
+++ b/vim/.vim/lua/plugins.lua
@@ -21,6 +21,23 @@ require('packer').startup(function(use)
     use 'lewis6991/impatient.nvim'
     use 'dstein64/vim-startuptime'
 
+    use {
+        'google/vim-maktaba',
+        config = [[ vim.cmd("call glaive#Install()")]],
+        disable = use_google(),
+        after  =  {
+            'flwyd/vim-imp',
+        }
+    }
+    use {
+        'flwyd/vim-imp',
+        disable = use_google(),
+    }
+    use {
+        'google/vim-glaive',
+        disable = use_google(),
+    }
+
     use {
         'nvim-treesitter/nvim-treesitter',
         run = ':TSUpdate',
@@ -279,3 +296,5 @@ require('packer').startup(function(use)
 
     vim.opt.spell = true
     vim.opt.spelllang = { 'en_us' }
+
+    require("config.imp")
diff --git a/vim/.vim/prefs/imp.vim b/vim/.vim/prefs/imp.vim
index 2cca10f..e69de29 100644
--- a/vim/.vim/prefs/imp.vim
+++ b/vim/.vim/prefs/imp.vim
@@ -1,16 +0,0 @@
-if filereadable(expand("~/use_google"))
-    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! glaive
-    " Glaive imp Suggest[default]=buffer,primp,csearch,prompt Report[default]=popupnotify
-    " Glaive imp Suggest[default]=buffer,csearch,prompt,primp Report[default]=popupnotify
-    " Glaive imp Pick[default]=inputlist Suggest[default]=buffer,primp,csearch,prompt Report[default]=echo
-    Glaive imp Pick[default]=fzf Suggest[default]=buffer,primp,csearch,prompt Report[default]=echo
-    "
-    " nnoremap <leader>csi :CsImporter<cr>
-    nnoremap <leader>csi :ImpSuggest <C-r><C-w><cr>
-    nnoremap <leader>ii :ImpSuggest <C-r><C-w><cr>
-    nnoremap <leader>if :ImpFirst <C-r><C-w><cr>
-
-endif
diff --git a/vim/.vimrc b/vim/.vimrc
index 6d63f38..cc72b02 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -98,7 +98,6 @@ call plug#begin('~/.vim/plugged')
    source ~/.vim/prefs/ui.vim
    source ~/.vim/prefs/ultisnips.vim
    source ~/.vim/prefs/ripgrep.vim
-    source ~/.vim/prefs/imp.vim
    source ~/.vim/prefs/fzf.vim
 call plug#end()            " required