From 1ab41281f310e934366f5a5a3e8d4d68e39c1df7 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 20 Apr 2019 10:30:01 -0700 Subject: [PATCH] switch from ycm to deoplete for completion --- .gitmodules | 21 +++++++++++++++------ .vim/bundle_extra/YouCompleteMe | 1 - .vim/bundle_extra/deoplete-clangx | 1 + .vim/bundle_extra/deoplete-go | 1 + .vim/bundle_extra/deoplete.nvim | 1 + .vim/bundle_extra/nvim-yarp | 1 + .vim/bundle_extra/tern_for_vim | 1 - .vim/bundle_extra/vim-hug-neovim-rpc | 1 + .vim/options.vim | 2 +- .vim/plugins.vim | 9 ++++----- .vim/ycm.py | 15 --------------- 11 files changed, 25 insertions(+), 29 deletions(-) delete mode 160000 .vim/bundle_extra/YouCompleteMe create mode 160000 .vim/bundle_extra/deoplete-clangx create mode 160000 .vim/bundle_extra/deoplete-go create mode 160000 .vim/bundle_extra/deoplete.nvim create mode 160000 .vim/bundle_extra/nvim-yarp delete mode 160000 .vim/bundle_extra/tern_for_vim create mode 160000 .vim/bundle_extra/vim-hug-neovim-rpc delete mode 100644 .vim/ycm.py diff --git a/.gitmodules b/.gitmodules index ce7f74d..ba1b50a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -85,12 +85,6 @@ [submodule ".vim/bundle/vim-indent-guides"] path = .vim/bundle/vim-indent-guides url = https://github.com/nathanaelkane/vim-indent-guides.git -[submodule ".vim/bundle/YouCompleteMe"] - path = .vim/bundle_extra/YouCompleteMe - url = https://github.com/Valloric/YouCompleteMe.git -[submodule ".vim/bundle/tern_for_vim"] - path = .vim/bundle_extra/tern_for_vim - url = https://github.com/marijnh/tern_for_vim [submodule ".vim/bundle/vim-jdaddy"] path = .vim/bundle/vim-jdaddy url = https://github.com/tpope/vim-jdaddy.git @@ -112,3 +106,18 @@ [submodule ".vim/bundle/fzf.vim"] path = .vim/bundle_extra/fzf.vim url = https://github.com/junegunn/fzf.vim.git +[submodule ".vim/bundle_extra/deoplete.nvim"] + path = .vim/bundle_extra/deoplete.nvim + url = https://github.com/Shougo/deoplete.nvim.git +[submodule ".vim/bundle_extra/nvim-yarp"] + path = .vim/bundle_extra/nvim-yarp + url = https://github.com/roxma/nvim-yarp.git +[submodule ".vim/bundle_extra/vim-hug-neovim-rpc"] + path = .vim/bundle_extra/vim-hug-neovim-rpc + url = https://github.com/roxma/vim-hug-neovim-rpc +[submodule ".vim/bundle_extra/deoplete-go"] + path = .vim/bundle_extra/deoplete-go + url = https://github.com/deoplete-plugins/deoplete-go.git +[submodule ".vim/bundle_extra/deoplete-clangx"] + path = .vim/bundle_extra/deoplete-clangx + url = https://github.com/Shougo/deoplete-clangx.git diff --git a/.vim/bundle_extra/YouCompleteMe b/.vim/bundle_extra/YouCompleteMe deleted file mode 160000 index 25ebc0b..0000000 --- a/.vim/bundle_extra/YouCompleteMe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25ebc0b9abb1b135c809ee850085a0305cbc5533 diff --git a/.vim/bundle_extra/deoplete-clangx b/.vim/bundle_extra/deoplete-clangx new file mode 160000 index 0000000..197738e --- /dev/null +++ b/.vim/bundle_extra/deoplete-clangx @@ -0,0 +1 @@ +Subproject commit 197738ed344f4b1709b726a08cc5f3231fff2f1c diff --git a/.vim/bundle_extra/deoplete-go b/.vim/bundle_extra/deoplete-go new file mode 160000 index 0000000..cb8504f --- /dev/null +++ b/.vim/bundle_extra/deoplete-go @@ -0,0 +1 @@ +Subproject commit cb8504f09a04fac9325a5e2aa4a11c2400b1312d diff --git a/.vim/bundle_extra/deoplete.nvim b/.vim/bundle_extra/deoplete.nvim new file mode 160000 index 0000000..9d4e88f --- /dev/null +++ b/.vim/bundle_extra/deoplete.nvim @@ -0,0 +1 @@ +Subproject commit 9d4e88f6cce63ed1b52ca2401d809c55ab443b25 diff --git a/.vim/bundle_extra/nvim-yarp b/.vim/bundle_extra/nvim-yarp new file mode 160000 index 0000000..1524cf7 --- /dev/null +++ b/.vim/bundle_extra/nvim-yarp @@ -0,0 +1 @@ +Subproject commit 1524cf7988d1e1ed7475ead3654987f64943a1f0 diff --git a/.vim/bundle_extra/tern_for_vim b/.vim/bundle_extra/tern_for_vim deleted file mode 160000 index 994ffbe..0000000 --- a/.vim/bundle_extra/tern_for_vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 994ffbe783da36d67786b6c66a4bf784c5eab300 diff --git a/.vim/bundle_extra/vim-hug-neovim-rpc b/.vim/bundle_extra/vim-hug-neovim-rpc new file mode 160000 index 0000000..55db7af --- /dev/null +++ b/.vim/bundle_extra/vim-hug-neovim-rpc @@ -0,0 +1 @@ +Subproject commit 55db7affbc9527464a88fb2d5f133f4994415f10 diff --git a/.vim/options.vim b/.vim/options.vim index d186ebe..b1dcb75 100644 --- a/.vim/options.vim +++ b/.vim/options.vim @@ -10,7 +10,7 @@ set autowrite set background=dark set backspace=indent,eol,start set complete-=i -set completeopt=longest,menuone +set completeopt=longest,menuone,noinsert set encoding=utf-8 set expandtab set fileformats=unix,dos,mac diff --git a/.vim/plugins.vim b/.vim/plugins.vim index a335a9c..460772f 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -11,6 +11,10 @@ let g:ale_lint_on_text_changed = 'never' let g:ale_lint_on_enter = 'never' let g:ale_linters = {'go': ['gofmt', 'go vet', 'go build']} +" deoplete.nvim +let g:deoplete#enable_at_startup = 1 +inoremap pumvisible() ? "\" : "\" + " fzf let $FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -f -g "" 2> /dev/null' @@ -33,8 +37,3 @@ let g:licenses_copyright_holders_name = g:licenses_authors_name " vim-rooter let g:rooter_silent_chdir = 1 - -" YouCompleteMe -let g:ycm_check_if_ycm_core_present = 0 -let g:ycm_confirm_extra_conf = 0 -let g:ycm_global_ycm_extra_conf = $HOME.'/.vim/ycm.py' diff --git a/.vim/ycm.py b/.vim/ycm.py deleted file mode 100644 index e62604d..0000000 --- a/.vim/ycm.py +++ /dev/null @@ -1,15 +0,0 @@ -def FlagsForFile(filename, **kwargs): - flags = [ - '-Wall', - '-Wextra', - '-Werror' - '-pedantic', - '-std=c++11' - '-I', - '.', - ] - - return { - 'flags': flags, - 'do_cache': True - }