vim: test YCM, add semiworking neocomplte+clang_complete config

Signed-off-by: Florian Pritz <bluewind@xinu.at>

1 files changed, 86 insertions, 40 deletions

diff --git a/.vimrc b/.vimrc
index ce62a24..574d79e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -41,27 +41,47 @@ set wildmenu
 set wildmode=full
 set wildignore=*.o,*.a,*.class,*.mo,*.la,*.swp,*.jpg,*.png,*.xpm,*.gif,*.pyc,*~,.git,.svn,.hg,
 
+set completeopt-=preview
 
-let mapleader = ","
+set complete+=k " enable dictionary completion
+set completeopt=menuone,menu,longest
 
-"call pathogen#infect()
+let mapleader = ","
 
 let g:sudo_no_gui = 1
+let g:ycm_extra_conf_globlist = ['~/.ycm_extra_conf.py']
 
 filetype off
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
-
-Bundle 'scrooloose/syntastic'
-"Bundle 'Valloric/YouCompleteMe'
-Bundle 'Shougo/neocomplete.vim'
-Bundle 'SirVer/ultisnips'
-Bundle 'tpope/vim-unimpaired'
-Bundle 'tpope/vim-fugitive'
-Bundle 'tpope/vim-repeat'
-Bundle 'SudoEdit'
-
-filetype plugin indent on
+set runtimepath+=~/.vim/bundle/neobundle.vim/
+call neobundle#rc(expand('~/.vim/bundle/'))
+NeoBundleFetch 'Shougo/neobundle.vim'
+
+NeoBundle 'scrooloose/syntastic'
+"NeoBundle 'Rip-Rip/clang_complete'
+"NeoBundle 'Shougo/neocomplete.vim'
+"NeoBundle 'Shougo/neosnippet.vim'
+"NeoBundle 'Shougo/neosnippet-snippets'
+
+"NeoBundle 'Shougo/vimproc.vim', {
+	  "\ 'build' : {
+	  "\     'windows' : 'make -f make_mingw32.mak',
+	  "\     'cygwin' : 'make -f make_cygwin.mak',
+	  "\     'mac' : 'make -f make_mac.mak',
+	  "\     'unix' : 'make -f make_unix.mak',
+	  "\    },
+	  "\ }
+"NeoBundle 'osyo-manga/vim-reunions'
+"NeoBundle 'osyo-manga/vim-marching'
+"
+NeoBundle 'Valloric/YouCompleteMe'
+NeoBundle 'SirVer/ultisnips'
+"
+NeoBundle 'tpope/vim-unimpaired'
+NeoBundle 'tpope/vim-fugitive'
+NeoBundle 'tpope/vim-repeat'
+NeoBundle 'SudoEdit'
+
+NeoBundleCheck
 
 "aliases
 cnorea w!! w !sudo tee "%" > /dev/null
@@ -116,42 +136,68 @@ noremap <C-h> :nohl<CR>
 inoremap <C-h> <ESC>:nohl<CR>a
 
 let g:UltiSnipsJumpForwardTrigger="<tab>"
+let g:UltiSnipsExpandTrigger="<c-j>"
 
+" #### Neocomplete config ####
 let g:acp_enableAtStartup = 0
-let g:neocomplcache_enable_at_startup = 1
-" Use smartcase.
-let g:neocomplcache_enable_smart_case = 1
-" Set minimum syntax keyword length.
-let g:neocomplcache_min_syntax_length = 2
-
-" <CR>: close popup and save indent.
+let g:neocomplete#enable_at_startup = 1
+let g:neocomplete#force_overwrite_completefunc = 1
+let g:neocomplete#enable_smart_case = 1
+let g:neocomplete#sources#syntax#min_keyword_length = 2
+let g:neocomplete#disable_auto_complete = 0
+let g:neocomplete#enable_auto_close_preview = 0
+
+imap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
+"imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+			"\ "\<Plug>(neosnippet_expand_or_jump)"
+			"\: pumvisible() ? "\<C-n>" : "\<TAB>"
+"smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+			"\ "\<Plug>(neosnippet_expand_or_jump)"
+			"\: pumvisible() ? "\<C-n>" : "\<TAB>"
+			""\: "\<TAB>"
 "inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
 "function! s:my_cr_function()
-  "return neocomplcache#smart_close_popup() . "\<CR>"
-  "" For no inserting <CR> key.
-  ""return pumvisible() ? neocomplcache#close_popup() : "\<CR>"
+	""return neocomplete#close_popup() . "\<CR>"
+	"" For no inserting <CR> key.
+	"return pumvisible() ? neocomplete#close_popup() : "\<CR>"
 "endfunction
-" <TAB>: completion.
-inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
-" <C-h>, <BS>: close popup and delete backword char.
-inoremap <expr><C-h> neocomplcache#smart_close_popup()."\<C-h>"
-"inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
-inoremap <expr><C-y>  neocomplcache#close_popup()
-inoremap <expr><C-e>  neocomplcache#cancel_popup()
-" Close popup by <Space>.
-"inoremap <expr><Space> pumvisible() ? neocomplcache#close_popup() : "\<Space>"
+
+" For snippet_complete marker.
+if has('conceal')
+	set conceallevel=2 concealcursor=vin
+endif
 
 " Enable heavy omni completion.
-if !exists('g:neocomplcache_omni_patterns')
-  let g:neocomplcache_omni_patterns = {}
+if !exists('g:neocomplete_omni_patterns')
+  let g:neocomplete_omni_patterns = {}
+endif
+let g:neocomplete_omni_patterns.php = '[^. \t]->\h\w*\|\h\w*::'
+let g:neocomplete_omni_patterns.c = '[^.[:digit:] *\t]\%(\.\|->\)'
+let g:neocomplete_omni_patterns.cpp = '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::'
+
+" clang_complete support
+if !exists('g:neocomplete#force_omni_input_patterns')
+	let g:neocomplete#force_omni_input_patterns = {}
 endif
-let g:neocomplcache_omni_patterns.php = '[^. \t]->\h\w*\|\h\w*::'
-let g:neocomplcache_omni_patterns.c = '[^.[:digit:] *\t]\%(\.\|->\)'
-let g:neocomplcache_omni_patterns.cpp = '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::'
+let g:neocomplete#force_overwrite_completefunc = 1
+let g:neocomplete#force_omni_input_patterns.c = '[^.[:digit:] *\t]\%(\.\|->\)\w*'
+let g:neocomplete#force_omni_input_patterns.cpp = '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*'
+let g:neocomplete#force_omni_input_patterns.objc = '[^.[:digit:] *\t]\%(\.\|->\)\w*'
+let g:neocomplete#force_omni_input_patterns.objcpp = '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*'
+let g:clang_complete_auto = 0
+let g:clang_auto_select = 0
+
+let g:clang_complete_macros = 1
+let g:clang_complete_patterns = 1
+
+let g:clang_snippets=1
+let g:clang_conceal_snippets=1
+let g:clang_snippets_engine='clang_complete'
+
 
 " For perlomni.vim setting.
 " https://github.com/c9s/perlomni.vim
-let g:neocomplcache_omni_patterns.perl = '\h\w*->\h\w*\|\h\w*::'
+let g:neocomplete_omni_patterns.perl = '\h\w*->\h\w*\|\h\w*::'
 
 autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
 autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags