diff --git a/config/plugins/deoplete.vim b/config/plugins/deoplete.vim index c2c168846..46941fd05 100644 --- a/config/plugins/deoplete.vim +++ b/config/plugins/deoplete.vim @@ -12,59 +12,59 @@ let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{}) let g:deoplete#omni_patterns = get(g:, 'deoplete#omni_patterns', {}) " java && jsp -let g:deoplete#omni#input_patterns.java = get(g:, 'deoplete#omni#input_patterns', [ +let g:deoplete#omni#input_patterns.java = get(g:deoplete#omni#input_patterns, 'java', [ \'[^. \t0-9]\.\w*', \'[^. \t0-9]\->\w*', \'[^. \t0-9]\::\w*', \]) -let g:deoplete#omni#input_patterns.jsp = get(g:, 'deoplete#omni#input_patterns', ['[^. \t0-9]\.\w*']) +let g:deoplete#omni#input_patterns.jsp = get(g:deoplete#omni#input_patterns, 'jsp', ['[^. \t0-9]\.\w*']) if g:spacevim_enable_javacomplete2_py - let g:deoplete#ignore_sources.java = get(g:, 'deoplete#ignore_sources', ['omni']) + let g:deoplete#ignore_sources.java = get(g:deoplete#ignore_sources, 'java', ['omni']) call deoplete#custom#set('javacomplete2', 'mark', '') else - let g:deoplete#ignore_sources.java = get(g:, 'deoplete#ignore_sources', ['javacomplete2']) + let g:deoplete#ignore_sources.java = get(g:deoplete#ignore_sources, 'java', ['javacomplete2']) call deoplete#custom#set('omni', 'mark', '') endif " go -let g:deoplete#ignore_sources.go = get(g:, 'deoplete#ignore_sources', ['omni']) +let g:deoplete#ignore_sources.go = get(g:deoplete#ignore_sources, 'go', ['omni']) call deoplete#custom#set('go', 'mark', '') call deoplete#custom#set('go', 'rank', 9999) " perl -let g:deoplete#omni#input_patterns.perl = get(g:, 'deoplete#omni#input_patterns', [ +let g:deoplete#omni#input_patterns.perl = get(g:deoplete#omni#input_patterns, 'perl', [ \'[^. \t0-9]\.\w*', \'[^. \t0-9]\->\w*', \'[^. \t0-9]\::\w*', \]) " javascript -let g:deoplete#omni#input_patterns.javascript = get(g:, 'deoplete#omni#input_patterns', ['[^. \t0-9]\.\w*']) +let g:deoplete#omni#input_patterns.javascript = get(g:deoplete#omni#input_patterns, 'javascript', ['[^. \t0-9]\.\w*']) " php -let g:deoplete#omni#input_patterns.php = get(g:, 'deoplete#omni#input_patterns', [ +let g:deoplete#omni#input_patterns.php = get(g:deoplete#omni#input_patterns, 'php', [ \'[^. \t0-9]\.\w*', \'[^. \t0-9]\->\w*', \'[^. \t0-9]\::\w*', \]) -let g:deoplete#ignore_sources.php = get(g:, 'deoplete#ignore_sources', ['omni', 'around', 'member']) +let g:deoplete#ignore_sources.php = get(g:deoplete#ignore_sources, 'php', ['omni', 'around', 'member']) call deoplete#custom#set('phpcd', 'mark', '') call deoplete#custom#set('phpcd', 'input_pattern', '\w*|[^. \t]->\w*|\w*::\w*') " lua -let g:deoplete#omni_patterns.lua = get(g:, 'deoplete#omni_patterns', '.') +let g:deoplete#omni_patterns.lua = get(g:deoplete#omni_patterns, 'lua', '.') " c c++ call deoplete#custom#set('clang2', 'mark', '') -let g:deoplete#ignore_sources.c = get(g:, 'deoplete#ignore_sources', ['omni']) +let g:deoplete#ignore_sources.c = get(g:deoplete#ignore_sources, 'c', ['omni']) " rust -let g:deoplete#ignore_sources.rust = get(g:, 'deoplete#ignore_sources', ['omni']) +let g:deoplete#ignore_sources.rust = get(g:deoplete#ignore_sources, 'rust', ['omni']) call deoplete#custom#set('racer', 'mark', '') " public settings call deoplete#custom#set('_', 'matchers', ['matcher_full_fuzzy']) -let g:deoplete#ignore_sources._ = get(g:, 'deoplete#ignore_sources', ['around']) +let g:deoplete#ignore_sources._ = get(g:deoplete#ignore_sources, '_', ['around']) inoremap deoplete#mappings#smart_close_popup()."\" inoremap deoplete#mappings#smart_close_popup()."\" set isfname-== diff --git a/config/plugins/neocomplcache.vim b/config/plugins/neocomplcache.vim index 1ee77b82c..721d3b99d 100644 --- a/config/plugins/neocomplcache.vim +++ b/config/plugins/neocomplcache.vim @@ -47,18 +47,18 @@ if !exists('g:neocomplcache_force_omni_patterns') endif let g:neocomplcache_enable_auto_close_preview = get(g:, 'neocomplcache_enable_auto_close_preview', 1) " let g:neocomplcache_force_omni_patterns.ruby = get(g:, ': ,[^. *\t]\.\w*\|\h\w*::') -let g:neocomplcache_omni_patterns.ruby = get(g:, 'neocomplcache_omni_patterns', +let g:neocomplcache_omni_patterns.ruby = get(g:neocomplcache_omni_patterns, 'ruby', \ '[^. *\t]\.\w*\|\h\w*::') -let g:neocomplcache_omni_patterns.java = get(g:, 'neocomplcache_omni_patterns', +let g:neocomplcache_omni_patterns.java = get(g:neocomplcache_omni_patterns, 'java', \ '[^. *\t]\.\w*\|\h\w*::') -let g:neocomplcache_force_omni_patterns.java = get(g:, 'neocomplcache_force_omni_patterns', +let g:neocomplcache_force_omni_patterns.java = get(g:neocomplcache_force_omni_patterns, 'java', \ '[^. *\t]\.\w*\|\h\w*::') " For clang_complete. let g:neocomplcache_force_overwrite_completefunc = get(g:, 'neocomplcache_force_overwrite_completefunc', 1) -let g:neocomplcache_force_omni_patterns.c = get(g:, 'neocomplcache_force_omni_patterns', +let g:neocomplcache_force_omni_patterns.c = get(g:neocomplcache_force_omni_patterns, 'c', \ '[^.[:digit:] *\t]\%(\.\|->\)') -let g:neocomplcache_force_omni_patterns.cpp = get(g:, 'neocomplcache_force_omni_patterns', +let g:neocomplcache_force_omni_patterns.cpp = get(g:neocomplcache_force_omni_patterns, 'cpp', \ '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::') let g:clang_complete_auto = get(g:, 'clang_complete_auto', 0) let g:clang_auto_select = get(g:, 'clang_auto_select', 0) diff --git a/config/plugins/neocomplete.vim b/config/plugins/neocomplete.vim index 1c6922a03..7c6296b35 100644 --- a/config/plugins/neocomplete.vim +++ b/config/plugins/neocomplete.vim @@ -1,4 +1,4 @@ -let g:neocomplete#data_directory= get(g:, 'neocomplete#data_directory','~/.cache/neocomplete') +let g:neocomplete#data_directory= get(g:, 'neocomplete#data_directory', '~/.cache/neocomplete') let g:acp_enableAtStartup = get(g:, 'acp_enableAtStartup', 0) let g:neocomplete#enable_at_startup = get(g:, 'neocomplete#enable_at_startup', 1) " Use smartcase. @@ -25,8 +25,7 @@ let g:neocomplete#enable_auto_delimiter = get(g:, 'neocomplete#enable_auto_delim if !exists('g:neocomplete#keyword_patterns') let g:neocomplete#keyword_patterns = {} endif -let g:neocomplete#keyword_patterns._ = '\h\k*(\?' - +let g:neocomplete#keyword_patterns._ = get(g:neocomplete#keyword_pattern, '_', '\h\k*(\?') " AutoComplPop like behavior. let g:neocomplete#enable_auto_select = 0 @@ -35,10 +34,12 @@ if !exists('g:neocomplete#sources#omni#input_patterns') let g:neocomplete#sources#omni#input_patterns = {} endif -let g:neocomplete#sources#omni#input_patterns.perl = '\h\w*->\h\w*\|\h\w*::' -let g:neocomplete#sources#omni#input_patterns.java ='[^. \t0-9]\.\w*' -let g:neocomplete#sources#omni#input_patterns.lua ='[^. \t0-9]\.\w*' -let g:neocomplete#force_omni_input_patterns = {} +let g:neocomplete#sources#omni#input_patterns.perl = get(g:neocomplete#sources#omni#input_patterns, 'perl', '\h\w*->\h\w*\|\h\w*::') +let g:neocomplete#sources#omni#input_patterns.java = get(g:neocomplete#sources#omni#input_patterns, 'java','[^. \t0-9]\.\w*') +let g:neocomplete#sources#omni#input_patterns.lua = get(g:neocomplete#sources#omni#input_patterns, 'lua','[^. \t0-9]\.\w*') +if !exists('g:neocomplete#force_omni_input_patterns') + let g:neocomplete#force_omni_input_patterns = {} +endif "let g:neocomplete#force_omni_input_patterns.java = '^\s*' " , : close popup and delete backword char. inoremap neocomplete#smart_close_popup()."\"