X-Git-Url: https://git.xinqibao.xyz/dotfiles.git/blobdiff_plain/31c7165b0830fb690d133d7d6bced251775ecf94..37c72c84b198107618b6642e73a3b2574d5dcd07:/.config/nvim/init.vim?ds=sidebyside

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index ecc9745..185fe8a 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -11,7 +11,7 @@ set t_ut=""
 let &termencoding=&encoding
 set fileencodings=utf-8,gbk
 set fileformat=unix
-set foldmethod=manual
+set foldmethod=indent
 set encoding=utf-8 "required for ycm
 
 set tabstop=4
@@ -79,15 +79,18 @@ call plug#begin()
 
     Plug 'mbbill/undotree'
     Plug 'preservim/nerdtree'
+    Plug 'majutsushi/tagbar'
+
     Plug 'plasticboy/vim-markdown'
 
     Plug 'tpope/vim-fugitive'
+    Plug 'airblade/vim-gitgutter'
     Plug 'kdheepak/lazygit.nvim'
 
     "Plug 'ycm-core/YouCompleteMe'
     "Plug 'rhysd/vim-clang-format'
 
-    Plug 'neoclide/coc.nvim'
+    Plug 'neoclide/coc.nvim', {'branch': 'release'}
 
     Plug 'nvim-treesitter/nvim-treesitter'
     "Plug 'mfussenegger/nvim-dap'
@@ -128,7 +131,7 @@ endif
 " undotree setting
 "----------------------
 if has_key(plugs, 'undotree')
-    nnoremap <leader>u :UndotreeShow<CR>
+    nnoremap <leader>u :UndotreeToggle<CR>
 endif
 
 "----------------------
@@ -141,6 +144,13 @@ if has_key(plugs, 'nerdtree')
     nnoremap <leader>n :NERDTreeToggle<CR>
 endif
 
+"----------------------
+" tagbar setting
+"----------------------
+if has_key(plugs, 'tagbar')
+    nnoremap <leader>t :TagbarToggle<CR>
+endif
+
 "----------------------
 " YouCompleteMe setting
 "----------------------
@@ -182,6 +192,9 @@ if has_key(plugs, "coc.nvim")
     xmap <leader>f  <Plug>(coc-format-selected)
     nmap <leader>f  <Plug>(coc-format-selected)
 
+    " Apply AutoFix to problem on the current line.
+    nmap <leader>qf  <Plug>(coc-fix-current)
+
     " clangd
     nmap <leader>gh :CocCommand clangd.switchSourceHeader<CR>
 
@@ -196,6 +209,21 @@ if has_key(plugs, "coc.nvim")
         execute '!' . &keywordprg . " " . expand('<cword>')
       endif
     endfunction
+
+    let g:coc_default_semantic_highlight_groups = 1
+    let g:coc_global_extensions = [
+                \'coc-marketplace',
+                \'coc-highlight',
+                \'coc-clangd',
+                \'coc-pyright',
+                \'coc-lua',
+                \'coc-sh',
+                \'coc-cmake',
+                \'coc-xmake',
+                \'coc-json',
+                \'coc-yaml',
+                \'coc-vimlsp',
+                \]
 endif
 
 "----------------------
@@ -203,6 +231,10 @@ endif
 "----------------------
 if has_key(plugs, 'nvim-treesitter')
     lua require('plugin-config/nvim-treesitter')
+
+    set foldmethod=expr
+    set foldexpr=nvim_treesitter#foldexpr()
+    set foldlevel=99
 endif
 
 
@@ -221,6 +253,9 @@ nnoremap <silent> <Leader>- :resize -5<CR>
 nnoremap <silent> <Leader>v+ :vertical resize +5<CR>
 nnoremap <silent> <Leader>v- :vertical resize -5<CR>
 
+" shortcut for folding
+nnoremap <silent> <Leader>fi :set foldmethod=indent<CR>
+nnoremap <silent> <Leader>fd :set foldmethod=manual<CR>ggVGzD
 
 "HighLight trailing whitespace"
 highlight ExtraWhitespace ctermbg=red guibg=red