diff --git a/dotfiles/nvim/init.vim b/dotfiles/nvim/init.vim index 40b5356..858221a 100644 --- a/dotfiles/nvim/init.vim +++ b/dotfiles/nvim/init.vim @@ -35,7 +35,19 @@ Plug 'prabirshrestha/asyncomplete.vim' Plug 'prabirshrestha/asyncomplete-lsp.vim' - Plug 'prabirshrestha/asyncomplete-file.vim' + Plug 'prabigshrestha/asyncomplete-file.vim' + + Plug 'SirVer/ultisnips' + Plug 'prabirshrestha/async.vim' + Plug 'thomasfaingnaert/vim-lsp-snippets' + Plug 'thomasfaingnaert/vim-lsp-ultisnips' + + let g:UltiSnipsExpandTrigger="" + let g:UltiSnipsJumpForwardTrigger="" + let g:UltiSnipsJumpBackwardTrigger="" + + set completeopt+=menuone + set cot+=preview {%@@ elif lsp == "coc" @@%} Plug 'neoclide/coc.nvim', {'branch': 'release'} {%@@ endif @@%} @@ -57,7 +69,7 @@ Plug 'junegunn/fzf.vim' " Completions - " Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } + Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " HTML shortcuts Plug 'mattn/emmet-vim' @@ -287,13 +299,13 @@ call plug#end() autocmd FileType json syntax match Comment +\/\/.\+$+ " Workaround for bug - let g:lsp_documentation_float = 0 + " let g:lsp_documentation_float = 0 " Complete - inoremap pumvisible() ? "\" : "\" - inoremap pumvisible() ? "\" : "\" - inoremap pumvisible() ? "\" : "\" - imap (asyncomplete_force_refresh) + inoremap pumvisible() ? "\" : "\" + inoremap pumvisible() ? "\" : "\" + inoremap pumvisible() ? "\" : "\" + imap (asyncomplete_force_refresh) " Fix nmap gf (lsp-document-format)