From f03836022cc0eb177cdf4f98a4f88a718d247aff Mon Sep 17 00:00:00 2001 From: Antoine Marteau <antoine.marteau@g2elab.grenoble-inp.org> Date: Thu, 19 Nov 2020 15:39:23 +0100 Subject: [PATCH] ajout fuzzy finder et support git --- init.vim | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 2 deletions(-) diff --git a/init.vim b/init.vim index 993c3b1..daa01e6 100644 --- a/init.vim +++ b/init.vim @@ -9,10 +9,18 @@ set nowrap set smartcase set nobackup set incsearch +" coc plugin related +set hidden +set nobackup +set nowritebackup +set cmdheight=2 +set updatetime=300 +set shortmess+=c set colorcolumn=80 highlight ColorColumn ctermbg=0 guibg=lightgrey +"Coloration syntaxique des .pro comme pour .cpp autocmd BufNewFile,BufReadPost *.pro set filetype=cpp "Pugins @@ -20,8 +28,20 @@ call plug#begin('~/.config/nvim/plugged') Plug 'vim-airline/vim-airline' " status bar (needs special fonts) Plug 'ryanoasis/vim-devicons' " various symbols (linux, rust, python, ...) -Plug 'gruvbox-community/gruvbox' -Plug 'ThePrimeagen/vim-be-good' +Plug 'gruvbox-community/gruvbox' " color scheme + +Plug 'junegunn/fzf', {'do': { -> fzf#install() } } " autocompletion recherches +Plug 'junegunn/fzf.vim' + +Plug 'tpope/vim-fugitive' "git integrations +Plug 'stsewd/fzf-checkout.vim' "gestion branches et tags avec fzf + +Plug 'neoclide/coc.nvim', {'branch': 'release'} " completion + +" c++/C config + + +Plug 'ThePrimeagen/vim-be-good' " vim tutorial game by The Primeagen call plug#end() @@ -50,3 +70,175 @@ nnoremap <leader>h :wincmd h<CR> nnoremap <leader>j :wincmd j<CR> nnoremap <leader>k :wincmd k<CR> nnoremap <leader>l :wincmd l<CR> + +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +"""""""""" COC config +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + +" Always show the signcolumn, otherwise it would shift the text each time +" diagnostics appear/become resolved. +if has("patch-8.1.1564") + " Recently vim can merge signcolumn and number column into one + set signcolumn=number +else + set signcolumn=yes +endif + +" Use tab for trigger completion with characters ahead and navigate. +" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by +" other plugin before putting this into your config. +inoremap <silent><expr> <TAB> + \ pumvisible() ? "\<C-n>" : + \ <SID>check_back_space() ? "\<TAB>" : + \ coc#refresh() +inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>" + +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" Use <c-space> to trigger completion. +if has('nvim') + inoremap <silent><expr> <c-space> coc#refresh() +else + inoremap <silent><expr> <c-@> coc#refresh() +endif + +" Make <CR> auto-select the first completion item and notify coc.nvim to +" format on enter, <cr> could be remapped by other vim plugin +inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm() + \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>" + +" Use `[g` and `]g` to navigate diagnostics +" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. +nmap <silent> [g <Plug>(coc-diagnostic-prev) +nmap <silent> ]g <Plug>(coc-diagnostic-next) + +" GoTo code navigation. +nmap <silent> gd <Plug>(coc-definition) +nmap <silent> gy <Plug>(coc-type-definition) +nmap <silent> gi <Plug>(coc-implementation) +nmap <silent> gr <Plug>(coc-references) + +" Use K to show documentation in preview window. +nnoremap <silent> K :call <SID>show_documentation()<CR> + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('<cword>') + elseif (coc#rpc#ready()) + call CocActionAsync('doHover') + else + execute '!' . &keywordprg . " " . expand('<cword>') + endif +endfunction + +" Highlight the symbol and its references when holding the cursor. +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Symbol renaming. +nmap <leader>rn <Plug>(coc-rename) + +" Formatting selected code. +xmap <leader>f <Plug>(coc-format-selected) +nmap <leader>f <Plug>(coc-format-selected) + +augroup mygroup + autocmd! + " Setup formatexpr specified filetype(s). + autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') + " Update signature help on jump placeholder. + autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') +augroup end + +" Applying codeAction to the selected region. +" Example: `<leader>aap` for current paragraph +xmap <leader>a <Plug>(coc-codeaction-selected) +nmap <leader>a <Plug>(coc-codeaction-selected) + +" Remap keys for applying codeAction to the current buffer. +nmap <leader>ac <Plug>(coc-codeaction) +" Apply AutoFix to problem on the current line. +nmap <leader>qf <Plug>(coc-fix-current) + +" Map function and class text objects +" NOTE: Requires 'textDocument.documentSymbol' support from the language server. +xmap if <Plug>(coc-funcobj-i) +omap if <Plug>(coc-funcobj-i) +xmap af <Plug>(coc-funcobj-a) +omap af <Plug>(coc-funcobj-a) +xmap ic <Plug>(coc-classobj-i) +omap ic <Plug>(coc-classobj-i) +xmap ac <Plug>(coc-classobj-a) +omap ac <Plug>(coc-classobj-a) + +" Remap <C-f> and <C-b> for scroll float windows/popups. +" Note coc#float#scroll works on neovim >= 0.4.0 or vim >= 8.2.0750 +nnoremap <nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>" +nnoremap <nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>" +inoremap <nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>" +inoremap <nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>" + +" NeoVim-only mapping for visual mode scroll +" Useful on signatureHelp after jump placeholder of snippet expansion +if has('nvim') + vnoremap <nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#nvim_scroll(1, 1) : "\<C-f>" + vnoremap <nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#nvim_scroll(0, 1) : "\<C-b>" +endif + +" Use CTRL-S for selections ranges. +" Requires 'textDocument/selectionRange' support of language server. +nmap <silent> <C-s> <Plug>(coc-range-select) +xmap <silent> <C-s> <Plug>(coc-range-select) + +" Add `:Format` command to format current buffer. +command! -nargs=0 Format :call CocAction('format') + +" Add `:Fold` command to fold current buffer. +command! -nargs=? Fold :call CocAction('fold', <f-args>) + +" Add `:OR` command for organize imports of the current buffer. +command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') + +" Add (Neo)Vim's native statusline support. +" NOTE: Please see `:h coc-status` for integrations with external plugins that +" provide custom statusline: lightline.vim, vim-airline. +set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} + +" Mappings for CoCList +" Show all diagnostics. +nnoremap <silent><nowait> <space>a :<C-u>CocList diagnostics<cr> +" Manage extensions. +nnoremap <silent><nowait> <space>e :<C-u>CocList extensions<cr> +" Show commands. +nnoremap <silent><nowait> <space>c :<C-u>CocList commands<cr> +" Find symbol of current document. +nnoremap <silent><nowait> <space>o :<C-u>CocList outline<cr> +" Search workspace symbols. +nnoremap <silent><nowait> <space>s :<C-u>CocList -I symbols<cr> +" Do default action for next item. +nnoremap <silent><nowait> <space>j :<C-u>CocNext<CR> +" Do default action for previous item. +nnoremap <silent><nowait> <space>k :<C-u>CocPrev<CR> +" Resume latest coc list. +nnoremap <silent><nowait> <space>p :<C-u>CocListResume<CR> + +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +"""""""""" Fugitive Git Pluggin +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + +nnoremap <leader>gs :G<CR> +nnoremap <leader>gc :GCheckout<CR> + +" keep "ours" in merge (left part) +nnoremap <leader>ga :diffget //2<CR> +" keep "theirs" in merge (right part) +nnoremap <leader>gp :diffget //3<CR> + +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +"""""""""" Fuzzy Finder fzf Pluggin +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + +" faire apparaitre le fenettre fuzzy au milieu de l'ecran +let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.8 } } -- GitLab