From c67df922a13f4fdc09b5be670f63183c344de40e Mon Sep 17 00:00:00 2001
From: Nachuan Tang <tang.1208@osu.edu>
Date: Fri, 17 Mar 2023 23:12:05 -0400
Subject: [PATCH] .

---
 .vimrc         |  2 +-
 .vimrc.bundles | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.vimrc b/.vimrc
index 9c06536..4ef63e4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -150,7 +150,7 @@
     set list                        " Display unprintable characters f12 - switches
 
     " stop inserting the current comment leader after hitting 'o' or 'O' in Normal mode
-    au FileType java setlocal formatoptions-=o
+    au FileType * setlocal formatoptions-=o
 
     set listchars=tab:•\ ,trail:•,extends:»,precedes:« " Unprintable chars mapping
 
diff --git a/.vimrc.bundles b/.vimrc.bundles
index d818a9e..95139ca 100644
--- a/.vimrc.bundles
+++ b/.vimrc.bundles
@@ -88,15 +88,14 @@
 
             endif
             if g:vim_version >= 0.7
-                Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+                Plug 'nvim-treesitter/nvim-treesitter', Cond(!exists('g:vscode') && executable('make'), {'do': ':TSUpdate'})
 
                 " for telescope
                 Plug 'nvim-lua/plenary.nvim', Cond(!exists('g:vscode'))
                 Plug 'nvim-telescope/telescope.nvim', Cond(!exists('g:vscode'), { 'tag': '0.1.x' })
-                if executable('make')
-                    " c plugin for telescope to make it faster
-                    Plug 'nvim-telescope/telescope-fzf-native.nvim', Cond(!exists('g:vscode'), { 'do': 'make' })
-                endif
+
+                " c plugin for telescope to make it faster
+                Plug 'nvim-telescope/telescope-fzf-native.nvim', Cond(!exists('g:vscode') && executable('make'), { 'do': 'make' })
 
                 " comment out this plugin if the machine doesn't have required
                 " font install
@@ -158,7 +157,11 @@ endfunction
 " {
 
     if HasPlug('vista.vim')
-        let g:vista_default_executive = 'coc'
+        if HasPlug('coc.nvim')
+            let g:vista_default_executive = 'coc'
+        elseif HasPlug('coc.nvim')
+            let g:vista_default_executive = 'ctags'
+        endif
         nnoremap <silent> <leader>v :Vista!!<CR>
         let g:vista_cursor_delay = 0
         let g:vista_echo_cursor = 0