From 056df5ec195378f1acd381ca610008698454a0fa Mon Sep 17 00:00:00 2001
From: Autumn Naber <autumn.naber@solidigm.com>
Date: Tue, 12 Mar 2024 09:05:54 -0700
Subject: [PATCH] Added Yaifa and TagBar, Removed TagList

---
 .gitmodules        |  9 ++++++---
 vim/bundle/tagbar  |  1 +
 vim/bundle/taglist |  1 -
 vim/bundle/yaifa   |  1 +
 vimrc              | 19 ++++++++-----------
 5 files changed, 16 insertions(+), 15 deletions(-)
 create mode 160000 vim/bundle/tagbar
 delete mode 160000 vim/bundle/taglist
 create mode 160000 vim/bundle/yaifa

diff --git a/.gitmodules b/.gitmodules
index d4bced5..b235089 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "vim/bundle/supertab"]
 	path = vim/bundle/supertab
 	url = https://github.com/ervandew/supertab.git
-[submodule "vim/bundle/taglist"]
-	path = vim/bundle/taglist
-	url = https://github.com/vim-scripts/taglist.vim.git
 [submodule "vim/bundle/lightline"]
 	path = vim/bundle/lightline
 	url = https://github.com/itchyny/lightline.vim.git
@@ -40,3 +37,9 @@
 [submodule "vim/bundle/YouCompleteMe"]
 	path = vim/bundle/YouCompleteMe
 	url = https://github.com/ycm-core/YouCompleteMe.git
+[submodule "vim/bundle/tagbar"]
+	path = vim/bundle/tagbar
+	url = https://github.com/preservim/tagbar.git
+[submodule "vim/bundle/yaifa"]
+	path = vim/bundle/yaifa
+	url = https://github.com/vim-scripts/yaifa.vim.git
diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar
new file mode 160000
index 0000000..12edcb5
--- /dev/null
+++ b/vim/bundle/tagbar
@@ -0,0 +1 @@
+Subproject commit 12edcb59449b335555652898f82dd6d5c59d519a
diff --git a/vim/bundle/taglist b/vim/bundle/taglist
deleted file mode 160000
index 53041fb..0000000
--- a/vim/bundle/taglist
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 53041fbc45398a9af631a20657e109707a455339
diff --git a/vim/bundle/yaifa b/vim/bundle/yaifa
new file mode 160000
index 0000000..ab87aa4
--- /dev/null
+++ b/vim/bundle/yaifa
@@ -0,0 +1 @@
+Subproject commit ab87aa42cb7c51e9357c3ea05057a2d9d6cb3aea
diff --git a/vimrc b/vimrc
index 361afe1..3fc427d 100644
--- a/vimrc
+++ b/vimrc
@@ -56,17 +56,11 @@ nnoremap <leader>n :NERDTreeFocus<CR>
 nnoremap <C-n> :NERDTreeToggle<CR>
 nnoremap <C-f> :NERDTreeFind<CR>
 
-"""" Taglist
-set tags=./tags; " Recursively search backwards for ctags file
-" CTRL-l to open taglist
-nnoremap <C-l> :TlistToggle<CR>
-" CTRL-p to show function name in status bar
-nnoremap <C-p> :TlistShowPrototype<CR>
-let Tlist_Use_Right_Window = 1              " Move window to right side
-let Tlist_Exit_OnlyWindow = 1               " Close if only window left
-let Tlist_Hightlight_Tag_On_BufEnter  = 1   " Hightlight current tag
-let Tlist_Display_Prototypte = 1            " Show full prototype at bottom
-let Tlist_Ctags_Cmd = 'ctags --extra=-q --c++-kinds=-p'
+"""" Tagbar
+set tags=./tags;    " Recursively search backwards for ctags file
+set tagbsearch      " Use binary search in tags file (assumes sorted)
+set tagcase=match   " Match case when searching tags (much faster)
+nnoremap <C-l> :TagbarToggle<CR>
 
 """" vim-rainbow
 let g:rainbow_active = 1
@@ -148,6 +142,9 @@ nnoremap <C-y> :SyntasticToggleMode<CR>
 "let g:ycm_echo_current_diagnostic = 1            " Echo line's diagnostic that cursor is on
 "let g:ycm_min_num_of_chars_for_completion = 4    " Wait for 4 characters before completion
 "
+"let g:ycm_confirm_extra_conf = 0
+"" \y to apply FixIt command
+"nnoremap <leader>y :YcmCompleter FixIt<CR>
 "" Show compilation errors
 "nnoremap <silent> <C-y> :YcmDiags<CR>
 "" Toggle documentation popup (\D)