diff options
author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-12-26 10:21:28 +0900 |
---|---|---|
committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-12-26 11:03:02 +0900 |
commit | 6477c6528e18b4c05954965ffc513e957db94a3e (patch) | |
tree | dd95258ebb5162aea8a4379a251e7944dd399dd8 /autoload | |
parent | 6a411509fed5a3686639afc1bdf183e09dd4e7f5 (diff) | |
download | deoplete.nvim-6477c6528e18b4c05954965ffc513e957db94a3e.zip |
Add abort flag
Diffstat (limited to 'autoload')
-rw-r--r-- | autoload/deoplete/custom.vim | 6 | ||||
-rw-r--r-- | autoload/deoplete/util.vim | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/autoload/deoplete/custom.vim b/autoload/deoplete/custom.vim index e1c16f3..2b961c5 100644 --- a/autoload/deoplete/custom.vim +++ b/autoload/deoplete/custom.vim @@ -23,12 +23,12 @@ " }}} "============================================================================= -function! deoplete#custom#get(source_name) "{{{ +function! deoplete#custom#get(source_name) abort "{{{ let source = copy(deoplete#custom#get_source_var(a:source_name)) return extend(source, s:custom._, 'keep') endfunction"}}} -function! deoplete#custom#get_source_var(source_name) "{{{ +function! deoplete#custom#get_source_var(source_name) abort "{{{ if !exists('s:custom') let s:custom = {} let s:custom._ = {} @@ -41,7 +41,7 @@ function! deoplete#custom#get_source_var(source_name) "{{{ return s:custom[a:source_name] endfunction"}}} -function! deoplete#custom#set(source_name, option_name, value) "{{{ +function! deoplete#custom#set(source_name, option_name, value) abort "{{{ for key in split(a:source_name, '\s*,\s*') let custom_source = deoplete#custom#get_source_var(key) let custom_source[a:option_name] = a:value diff --git a/autoload/deoplete/util.vim b/autoload/deoplete/util.vim index 9bf61a0..39b8699 100644 --- a/autoload/deoplete/util.vim +++ b/autoload/deoplete/util.vim @@ -23,7 +23,7 @@ " }}} "============================================================================= -function! deoplete#util#set_default(var, val, ...) "{{{ +function! deoplete#util#set_default(var, val, ...) abort "{{{ if !exists(a:var) || type({a:var}) != type(a:val) let alternate_var = get(a:000, 0, '') @@ -31,7 +31,7 @@ function! deoplete#util#set_default(var, val, ...) "{{{ \ {alternate_var} : a:val endif endfunction"}}} -function! deoplete#util#set_pattern(variable, keys, pattern) "{{{ +function! deoplete#util#set_pattern(variable, keys, pattern) abort "{{{ for key in split(a:keys, '\s*,\s*') if !has_key(a:variable, key) let a:variable[key] = a:pattern @@ -39,7 +39,7 @@ function! deoplete#util#set_pattern(variable, keys, pattern) "{{{ endfor endfunction"}}} function! deoplete#util#get_buffer_config( - \ filetype, buffer_var, user_var, default_var, ...) "{{{ + \ filetype, buffer_var, user_var, default_var, ...) abort "{{{ let default_val = get(a:000, 0, '') if exists(a:buffer_var) @@ -52,22 +52,22 @@ function! deoplete#util#get_buffer_config( return get({a:user_var}, filetype, \ get(eval(a:default_var), filetype, default_val)) endfunction"}}} -function! deoplete#util#get_simple_buffer_config(buffer_var, user_var) "{{{ +function! deoplete#util#get_simple_buffer_config(buffer_var, user_var) abort "{{{ return exists(a:buffer_var) ? {a:buffer_var} : {a:user_var} endfunction"}}} -function! deoplete#util#print_error(string) "{{{ +function! deoplete#util#print_error(string) abort "{{{ echohl Error | echomsg '[deoplete] ' . a:string | echohl None endfunction"}}} -function! deoplete#util#print_warning(string) "{{{ +function! deoplete#util#print_warning(string) abort "{{{ echohl WarningMsg | echomsg '[deoplete] ' . a:string | echohl None endfunction"}}} -function! deoplete#util#is_eskk_convertion() "{{{ +function! deoplete#util#is_eskk_convertion() abort "{{{ return exists('*eskk#is_enabled') && eskk#is_enabled() \ && eskk#get_preedit().get_henkan_phase() !=# \ g:eskk#preedit#PHASE_NORMAL endfunction"}}} -function! deoplete#util#convert2list(expr) "{{{ +function! deoplete#util#convert2list(expr) abort "{{{ return type(a:expr) ==# type([]) ? a:expr : [a:expr] endfunction"}}} @@ -127,7 +127,7 @@ function! s:vimoption2python(option) abort "{{{ return join(deoplete#util#uniq(patterns), '') endfunction"}}} -function! deoplete#util#uniq(list) "{{{ +function! deoplete#util#uniq(list) abort "{{{ let list = map(copy(a:list), '[v:val, v:val]') let i = 0 let seen = {} |