@@ -15,8 +15,9 @@ Bundle 'tpope/vim-fugitive'
15
15
Bundle ' tpope/vim-surround'
16
16
Bundle ' tpope/vim-endwise'
17
17
Bundle ' tpope/vim-markdown'
18
- Bundle ' Shougo/neocomplcache'
19
- Bundle ' Shougo/vimproc'
18
+ Bundle ' Valloric/YouCompleteMe'
19
+ " Bundle 'Shougo/neocomplcache'
20
+ " Bundle 'Shougo/vimproc'
20
21
" Bundle 'Shougo/neosnippet'
21
22
Bundle ' scrooloose/nerdcommenter'
22
23
Bundle ' scrooloose/syntastic'
@@ -222,7 +223,7 @@ function! s:my_cr_function()
222
223
return pumvisible () ? neocomplcache#close_popup () : " \<CR> "
223
224
endfunction
224
225
225
- inoremap <silent> <CR> <C-r> =<SID> my_cr_function()<CR>
226
+ " inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
226
227
227
228
" ==================== Jedi ====================
228
229
let g: jedi #auto_initialization = 1
@@ -266,3 +267,14 @@ let g:ackprg = 'ag --nogroup --nocolor --column'
266
267
" ==================== UltiSnips ====================
267
268
let g: ultisnips_python_style = " sphinx"
268
269
let g: UltiSnipsSnippetDirectories = [" UltiSnips" , " ultisnips-snippets" ]
270
+ let g: UltiSnipsDontReverseSearchPath= 1
271
+
272
+ " ==================== YouCompleteMe ====================
273
+ " Disable completion previews with function prototypes, etc.
274
+ " set completeopt=menu
275
+ " let g:ycm_add_preview_to_completeopt = 0
276
+ let g: ycm_autoclose_preview_window_after_completion = 1
277
+ let g: ycm_complete_in_comments_and_strings = 1
278
+ let g: ycm_collect_identifiers_from_comments_and_strings = 1
279
+ let g: ycm_general_completers = [' ultisnips_completer' ]
280
+
0 commit comments