From 1afc100fb8de25fd6ecf50e59e1ece8f447474b1 Mon Sep 17 00:00:00 2001 From: Tuowen Zhao Date: Tue, 21 Jan 2020 11:23:42 -0700 Subject: ycm initial commit --- .gitmodules | 24 ++----------- bundle/YouCompleteMe | 1 + bundle/deoplete | 1 - bundle/deoplete-clangx | 1 - bundle/neco-ghc | 1 - bundle/neoinclude | 1 - bundle/nvim-yarp | 1 - bundle/vim-hug-neovim-rpc | 1 - bundle/vimproc | 1 - config/bindings.vim | 87 ----------------------------------------------- config/deoplete.vim | 7 ---- vimrc | 2 +- 12 files changed, 5 insertions(+), 123 deletions(-) create mode 160000 bundle/YouCompleteMe delete mode 160000 bundle/deoplete delete mode 160000 bundle/deoplete-clangx delete mode 160000 bundle/neco-ghc delete mode 160000 bundle/neoinclude delete mode 160000 bundle/nvim-yarp delete mode 160000 bundle/vim-hug-neovim-rpc delete mode 160000 bundle/vimproc delete mode 100644 config/bindings.vim delete mode 100644 config/deoplete.vim diff --git a/.gitmodules b/.gitmodules index 8b6df92..8ec5da9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,6 @@ [submodule "bundle/unbundle"] path = bundle/unbundle url = https://github.com/sunaku/vim-unbundle.git -[submodule "bundle/neco-ghc"] - path = bundle/neco-ghc - url = https://github.com/eagletmt/neco-ghc -[submodule "bundle/vimproc"] - path = bundle/vimproc - url = https://github.com/Shougo/vimproc.vim [submodule "bundle/markdown"] path = bundle/markdown url = https://github.com/plasticboy/vim-markdown.git @@ -28,18 +22,6 @@ [submodule "bundle/clang-format"] path = bundle/clang-format url = https://github.com/rhysd/vim-clang-format.git -[submodule "bundle/deoplete"] - path = bundle/deoplete - url = https://github.com/Shougo/deoplete.nvim.git -[submodule "bundle/nvim-yarp"] - path = bundle/nvim-yarp - url = https://github.com/roxma/nvim-yarp.git -[submodule "bundle/vim-hug-neovim-rpc"] - path = bundle/vim-hug-neovim-rpc - url = https://github.com/roxma/vim-hug-neovim-rpc.git -[submodule "bundle/deoplete-clangx"] - path = bundle/deoplete-clangx - url = https://github.com/Shougo/deoplete-clangx.git -[submodule "bundle/neoinclude"] - path = bundle/neoinclude - url = https://github.com/Shougo/neoinclude.vim.git +[submodule "bundle/YouCompleteMe"] + path = bundle/YouCompleteMe + url = https://github.com/ycm-core/YouCompleteMe.git diff --git a/bundle/YouCompleteMe b/bundle/YouCompleteMe new file mode 160000 index 0000000..d9a9ce4 --- /dev/null +++ b/bundle/YouCompleteMe @@ -0,0 +1 @@ +Subproject commit d9a9ce47de8b88100e4230805bf44d394197476d diff --git a/bundle/deoplete b/bundle/deoplete deleted file mode 160000 index 5be2559..0000000 --- a/bundle/deoplete +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5be25591770c5abc7214e8899c4d451c479ac2ec diff --git a/bundle/deoplete-clangx b/bundle/deoplete-clangx deleted file mode 160000 index 197738e..0000000 --- a/bundle/deoplete-clangx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 197738ed344f4b1709b726a08cc5f3231fff2f1c diff --git a/bundle/neco-ghc b/bundle/neco-ghc deleted file mode 160000 index 682869a..0000000 --- a/bundle/neco-ghc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 682869aca5dd0bde71a09ba952acb59c543adf7d diff --git a/bundle/neoinclude b/bundle/neoinclude deleted file mode 160000 index 5125e73..0000000 --- a/bundle/neoinclude +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5125e73de0a8b4f2c399e4896e21be1b8f7b3d39 diff --git a/bundle/nvim-yarp b/bundle/nvim-yarp deleted file mode 160000 index 83c6f4e..0000000 --- a/bundle/nvim-yarp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 83c6f4e61aa73e2a53796ea6690fb7e5e64db50a diff --git a/bundle/vim-hug-neovim-rpc b/bundle/vim-hug-neovim-rpc deleted file mode 160000 index 701ecbb..0000000 --- a/bundle/vim-hug-neovim-rpc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 701ecbb0a1f904c0b44c6beaafef35e1de998a94 diff --git a/bundle/vimproc b/bundle/vimproc deleted file mode 160000 index 51f4664..0000000 --- a/bundle/vimproc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 51f4664c92f0f1b121127c84d3b1c901e1c698f0 diff --git a/config/bindings.vim b/config/bindings.vim deleted file mode 100644 index 3ddc4f9..0000000 --- a/config/bindings.vim +++ /dev/null @@ -1,87 +0,0 @@ -" set leader to , -let mapleader="," -let g:mapleader="," - -cnoremap -cnoremap -inoremap -inoremap -inoremap -inoremap - -" indent jumps -" <[l>, <]l>: exclusive jump to prev/next line with lower indent -" -" exclusive (bool): true: Motion is exclusive -" false: Motion is inclusive -" fwd (bool): true: Go to next line -" false: Go to previous line -" lowerlevel (bool): true: Go to line with lower indentation level -" false: Go to line with the same indentation level -" skipblanks (bool): true: Skip blank lines -" false: Don't skip blank lines -function! NextIndent(exclusive, fwd, lowerlevel, skipblanks) - let line = line('.') - let column = col('.') - let lastline = line('$') - let indent = indent(line) - let stepvalue = a:fwd ? 1 : -1 - while (line > 0 && line <= lastline) - let line = line + stepvalue - if ( ! a:lowerlevel && indent(line) == indent || - \ a:lowerlevel && indent(line) < indent) - if (! a:skipblanks || strlen(getline(line)) > 0) - if (a:exclusive) - let line = line - stepvalue - endif - exe line - exe "normal " column . "|" - return - endif - endif - endwhile -endfunction -" Moving back and forth between lines of same or lower indentation. -nnoremap [l :call NextIndent(1, 0, 1, 1) -nnoremap ]l :call NextIndent(1, 1, 1, 1) -vnoremap [l :call NextIndent(1, 0, 1, 1)m'gv'' -vnoremap ]l :call NextIndent(1, 1, 1, 1)m'gv'' -onoremap [l :call NextIndent(1, 0, 1, 1) -onoremap ]l :call NextIndent(1, 1, 1, 1) - -:command GT GhcModType -:command GTC GhcModTypeClear -:command GC GhcModCheckAndLintAsync - -" Type of expression under cursor -nmap ht :GhcModType -" Insert type of expression under cursor -nmap hT :GhcModTypeInsert -" GHC errors and warnings -nmap hc :SyntasticCheck ghc_mod -" Haskell Lint -nmap hl :SyntasticCheck hlint - -" Hoogle the word under the cursor -nnoremap hh :Hoogle - -" Hoogle and prompt for input -nnoremap hH :Hoogle - -" Hoogle for detailed documentation (e.g. "Functor") -nnoremap hi :HoogleInfo - -" Hoogle for detailed documentation and prompt for input -nnoremap hI :HoogleInfo - -" Hoogle, close the Hoogle window -nnoremap hz :HoogleClose - -" thanks to vim-slime, we can send v-mode selection to tmux by Ctrl-C Ctrl-C - -:command SP ConqueTermSplit zsh -:command VSP ConqueTermVSplit zsh -:command NL NeoCompleteLock -:command Black colors badwolf -:command Pretty colors solarized - diff --git a/config/deoplete.vim b/config/deoplete.vim deleted file mode 100644 index 3e2de67..0000000 --- a/config/deoplete.vim +++ /dev/null @@ -1,7 +0,0 @@ -" Change clang binary path -" call deoplete#custom#var('clangx', 'clang_binary', '/home/ztuowen/sycl/install/bin/clang') -call deoplete#custom#var('clangx', 'clang_binary', '/usr/bin/clang') - -" Change clang options -call deoplete#custom#var('clangx', 'default_c_options', '') -call deoplete#custom#var('clangx', 'default_cpp_options', '') diff --git a/vimrc b/vimrc index 5c15c3a..81f87cb 100644 --- a/vimrc +++ b/vimrc @@ -1,5 +1,5 @@ let g:airline_powerline_fonts=1 -let g:deoplete#enable_at_startup = 1 +let g:ycm_use_clangd = 0 set laststatus=2 " set UTF-8 encoding -- cgit v1.2.3-70-g09d2