change to coc

zhoupro · zhoupro · commit 357bd5f5e4da · 2019-06-23T07:08:18.000+08:00
diff --git a/tools/neovim/init.vim b/tools/neovim/init.vim
@@ -2,14 +2,7 @@ call plug#begin('~/.local/share/nvim/plugged')
     "lint
     Plug 'w0rp/ale', { 'on':  'ALEToggle' }
     "complete
-    Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-    "viml complete source
-    Plug 'Shougo/neco-vim'
-    "language server
-    Plug 'autozimu/LanguageClient-neovim', {
-    \ 'branch': 'next',
-    \ 'do': 'bash install.sh',
-    \ }
+    Plug 'neoclide/coc.nvim', {'branch': 'release'}
     "outline
     Plug 'majutsushi/tagbar'
     Plug 'vim-airline/vim-airline'
@@ -74,14 +67,6 @@ call plug#end()
 let mapleader=","
 set noswapfile
 map <leader>js :call json_format#parse("l")<cr>
-" deoplete
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#ignore_sources = get(g:, 'deoplete#ignore_sources', {})
-set hidden
-let g:LanguageClient_diagnosticsEnable = 0
-let g:LanguageClient_serverCommands = {
-    \ 'python': ['pyls'],
-    \ }
 " <TAB>: completion.
 inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
 
@@ -142,7 +127,6 @@ let g:go_highlight_operators = 1
 let g:go_highlight_structs = 1
 let g:go_highlight_types = 1
 
-"  
 func! RunProgram()
     exec "w"
     if &filetype == 'c'
@@ -366,8 +350,6 @@ let s:bot = {
 \ }
 \ }
 let g:vwm#layouts = [s:bot]
-"https://github.com/Shougo/deoplete.nvim/issues/440
-let g:deoplete#auto_complete_delay = 150
 
 " clang_format
 let g:clang_format#style_options = {
diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh
@@ -37,8 +37,7 @@ function python_ins(){
     echo "python ins"
 }
 function java_ins(){
-    ! (grep -F 'jdtls' ~/.config/nvim/init.vim &>/dev/null ) && \
-    sed -i "/LanguageClient_serverCommands/a \\\\\ 'java': ['/usr/local/bin/jdtls', '-data', getcwd()]," ~/.config/nvim/init.vim
+    echo "java ins"
 }
 function lua_ins(){
     ! (grep -F 'lua-lsp' ~/.config/nvim/init.vim &>/dev/null ) && \

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ function python_ins(){`
`37`	`37`	`echo "python ins"`
`38`	`38`	`}`
`39`	`39`	`function java_ins(){`
`40`		`- ! (grep -F 'jdtls' ~/.config/nvim/init.vim &>/dev/null ) && \`
`41`		`- sed -i "/LanguageClient_serverCommands/a \\\\\ 'java': ['/usr/local/bin/jdtls', '-data', getcwd()]," ~/.config/nvim/init.vim`
	`40`	`+ echo "java ins"`
`42`	`41`	`}`
`43`	`42`	`function lua_ins(){`
`44`	`43`	`! (grep -F 'lua-lsp' ~/.config/nvim/init.vim &>/dev/null ) && \`