Tab S-Tab neocomplcache

supasate · Nov 26, 2012 · 8d0096f · 8d0096f
1 parent 0c238cc
commit 8d0096f
Showing 1 changed file with 74 additions and 76 deletions.
diff --git a/.vimrc b/.vimrc
@@ -413,82 +413,79 @@
      "}
 
      " neocomplcache {
-         let g:acp_enableAtStartup = 0
-         let g:neocomplcache_enable_at_startup = 1
-         let g:neocomplcache_enable_smart_case = 1
-         let g:neocomplcache_min_syntax_length = 3
-         let g:neocomplcache_lock_buffer_name_pattern = '\*ku\*'
-
-         " Define dictionary.
-         let g:neocomplcache_dictionary_filetype_lists = {
-                     \ 'default' : '',
-                     \ 'vimshell' : $HOME.'/.vimshell_hist',
-                     \ 'scheme' : $HOME.'/.gosh_completions'
-                     \ }
-
-         " Define keyword.
-         if !exists('g:neocomplcache_keyword_patterns')
-             let g:neocomplcache_keyword_patterns = {}
-         endif
-         let g:neocomplcache_keyword_patterns['default'] = '\h\w*'
-
-         " Plugin key-mappings.
-         inoremap <expr><C-g> neocomplcache#undo_completion()
-         inoremap <expr><C-l> neocomplcache#complete_common_string()
-
-         " Recommended key-mappings.
-         " <CR>: close popup and save indent.
-         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>"
-         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()
-
-         " Enable omni completion.
-         autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
-         autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
-         autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
-         autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
-         autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
-         autocmd FileType ruby setlocal omnifunc=rubycomplete#Complete
-
-         " Enable heavy omni completion.
-         if !exists('g:neocomplcache_omni_patterns')
-             let g:neocomplcache_omni_patterns = {}
-         endif
-         let g:neocomplcache_omni_patterns.ruby = '[^. *\t]\.\h\w*\|\h\w*::'
-         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*::'
-     " }
-
-     " neosnippet {
-         " use honza's snippets
-         let g:neosnippet#snippets_directory='~/.vim/bundle/snipmate-snippets/snippets'
-
-         " Plugin key-mappings.
-         imap <C-k> <Plug>(neosnippet_expand_or_jump)
-         smap <C-k> <Plug>(neosnippet_expand_or_jump)
-         xmap <C-k> <Plug>(neosnippet_expand_target)
-         xmap <C-l> <Plug>(neosnippet_start_unite_snippet_target)
-
-         " SuperTab like snippets behavior.
-         imap <expr><TAB> neosnippet#expandable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
-         smap <expr><TAB> neosnippet#expandable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
-
-         " For snippet_complete marker.
-         if has('conceal')
-             set conceallevel=2 concealcursor=i
-         endif
-
+        let g:acp_enableAtStartup = 0
+        let g:neocomplcache_enable_at_startup = 1
+        let g:neocomplcache_enable_camel_case_completion = 1
+        let g:neocomplcache_enable_smart_case = 1
+        let g:neocomplcache_enable_underbar_completion = 1
+        let g:neocomplcache_enable_auto_delimiter = 1
+        let g:neocomplcache_max_list = 15
+        let g:neocomplcache_force_overwrite_completefunc = 1
+
+        " SuperTab like snippets behavior.
+        imap <silent><expr><TAB> neosnippet#expandable() ?
+            \ "\<Plug>(neosnippet_expand_or_jump)" : (pumvisible() ?
+            \ "\<C-e>" : "\<TAB>")
+        smap <TAB> <Right><Plug>(neosnippet_jump_or_expand)
+
+        " Define dictionary.
+        let g:neocomplcache_dictionary_filetype_lists = {
+            \ 'default' : '',
+            \ 'vimshell' : $HOME.'/.vimshell_hist',
+            \ 'scheme' : $HOME.'/.gosh_completions'
+            \ }
+
+        " Define keyword.
+        if !exists('g:neocomplcache_keyword_patterns')
+            let g:neocomplcache_keyword_patterns = {}
+        endif
+        let g:neocomplcache_keyword_patterns._ = '\h\w*'
+
+        " Plugin key-mappings.
+        imap <C-k> <Plug>(neosnippet_expand_or_jump)
+        smap <C-k> <Plug>(neosnippet_expand_or_jump)
+        inoremap <expr><C-g> neocomplcache#undo_completion()
+        inoremap <expr><C-l> neocomplcache#complete_common_string()
+        inoremap <expr><CR> neocomplcache#complete_common_string()
+
+        " <TAB>: completion.
+        inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
+        inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
+
+        " <CR>: close popup
+        " <s-CR>: close popup and save indent.
+        inoremap <expr><s-CR> pumvisible() ? neocomplcache#close_popup()"\<CR>" : "\<CR>"
+        inoremap <expr><CR> pumvisible() ? neocomplcache#close_popup() : "\<CR>"
+
+        " <C-h>, <BS>: close popup and delete backword char.
+        inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
+        inoremap <expr><C-y> neocomplcache#close_popup()
+
+        " Enable omni completion.
+        autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
+        autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
+        autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
+        autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
+        autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
+        autocmd FileType ruby setlocal omnifunc=rubycomplete#Complete
+
+        " Enable heavy omni completion.
+        if !exists('g:neocomplcache_omni_patterns')
+            let g:neocomplcache_omni_patterns = {}
+        endif
+        let g:neocomplcache_omni_patterns.php = '[^. \t]->\h\w*\|\h\w*::'
+        let g:neocomplcache_omni_patterns.perl = '\h\w*->\h\w*\|\h\w*::'
+        let g:neocomplcache_omni_patterns.c = '[^.[:digit:] *\t]\%(\.\|->\)'
+        let g:neocomplcache_omni_patterns.cpp = '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::'
+        let g:neocomplcache_omni_patterns.ruby = '[^. *\t]\.\h\w*\|\h\w*::'
+
+        " use honza's snippets
+        let g:neosnippet#snippets_directory='~/.vim/bundle/snipmate-snippets/snippets'
+
+        " For snippet_complete marker.
+        if has('conceal')
+            set conceallevel=2 concealcursor=i
+        endif
      " }
 
      " UndoTree {
@@ -598,6 +595,7 @@ endfunction
         source ~/.vimrc.fork
     endif
 " }
+
 " Use local vimrc if available {
     if filereadable(expand("~/.vimrc.local"))
         source ~/.vimrc.local