diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2014-10-31 16:19:09 +0100 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2014-10-31 16:19:10 +0100 |
| commit | ecbc3019da246bafe62034c636bb839ad8a4fd8e (patch) | |
| tree | 8f4a4dca8587864d24a559a051808b856820d592 | |
| parent | 053de2b98f1c8bac6482125335ea6fc17dbc99c5 (diff) | |
| download | dotfiles-ecbc3019da246bafe62034c636bb839ad8a4fd8e.tar.gz dotfiles-ecbc3019da246bafe62034c636bb839ad8a4fd8e.tar.bz2 dotfiles-ecbc3019da246bafe62034c636bb839ad8a4fd8e.zip | |
[vim] YCM
| -rw-r--r-- | .vim/bundles.vim | 3 | ||||
| -rw-r--r-- | .vim/ftplugin/haskell.vim | 1 | ||||
| -rw-r--r-- | .vimrc | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/.vim/bundles.vim b/.vim/bundles.vim index 4d11f3f..9de46a3 100644 --- a/.vim/bundles.vim +++ b/.vim/bundles.vim @@ -74,5 +74,8 @@ Plugin 'lukerandall/haskellmode-vim' Plugin 'eagletmt/ghcmod-vim' Plugin 'eagletmt/neco-ghc' +" YCM +Plugin 'Valloric/YouCompleteMe' + call vundle#end() filetype plugin indent on " required! diff --git a/.vim/ftplugin/haskell.vim b/.vim/ftplugin/haskell.vim index a1ad287..8063e58 100644 --- a/.vim/ftplugin/haskell.vim +++ b/.vim/ftplugin/haskell.vim @@ -6,6 +6,7 @@ set shiftwidth=4 "An indent is 4 spaces set shiftround "Round indent to nearest shiftwidth multiple let g:haskellmode_completion_ghc=0 +let g:haskellmode_completion_haddock=0 let g:necoghc_enable_detailed_browse=1 set omnifunc=necoghc#omnifunc @@ -96,9 +96,6 @@ nmap <silent> <Leader>L <Plug>TaskList nmap <silent> <Leader>P <Plug>ToggleProject " others -map <C-Tab> gt -map <C-S-Tab> gT -"imap <S-Tab> <C-X><C-O> nmap <silent> <F4> :ls<CR>:buf nmap <Leader>t :ToggleWord<CR> @@ -159,7 +156,12 @@ let g:GPGUsePipes = 1 let g:UltiSnipsEditSplit = "vertical" " vundle inserts UltiSnips BEFORE our ~/.vim let g:UltiSnipsDontReverseSearchPath="1" +let g:UltiSnipsListSnippets="<C-l>" +let g:UltiSnipsExpandTrigger="<C-j>" +let g:UltiSnipsJumpForwardTrigger="<C-j>" +" YCM +let g:ycm_semantic_triggers = {'haskell' : ['re!\w\.']} " ======================================================= " FINAL |