mark all functions as 'abort'

Author: rhysd

autoload/clang_format.vim

@@ -4,7 +4,7 @@ set cpo&vim
 let s:on_windows = has('win32') || has('win64')
 
 " helper functions {{{
-function! s:has_vimproc()
+function! s:has_vimproc() abort
     if !exists('s:exists_vimproc')
         try
             silent call vimproc#version()
@@ -16,7 +16,7 @@ function! s:has_vimproc()
     return s:exists_vimproc
 endfunction
 
-function! s:system(str, ...)
+function! s:system(str, ...) abort
     let command = a:str
     let input = a:0 >= 1 ? a:1 : ''
 
@@ -49,7 +49,7 @@ function! s:stringize_options(opts) abort
     return join(keyvals, ',')
 endfunction
 
-function! s:build_extra_options()
+function! s:build_extra_options() abort
     let extra_options = ''
 
     let opts = copy(g:clang_format#style_options)
@@ -62,7 +62,7 @@ function! s:build_extra_options()
     return extra_options
 endfunction
 
-function! s:make_style_options()
+function! s:make_style_options() abort
     let extra_options = s:build_extra_options()
     return printf("'{BasedOnStyle: %s, IndentWidth: %d, UseTab: %s%s}'",
                         \ g:clang_format#code_style,
@@ -71,12 +71,12 @@ function! s:make_style_options()
                         \ extra_options)
 endfunction
 
-function! s:success(result)
+function! s:success(result) abort
     return (s:has_vimproc() ? vimproc#get_last_status() : v:shell_error) == 0
                 \ && a:result !~# '^YAML:\d\+:\d\+: error: unknown key '
 endfunction
 
-function! s:error_message(result)
+function! s:error_message(result) abort
     echoerr 'clang-format has failed to format.'
     if a:result =~# '^YAML:\d\+:\d\+: error: unknown key '
         echohl ErrorMsg
@@ -101,7 +101,7 @@ function! s:restore_screen_pos(prev_screen) abort
     execute "normal!" keys
 endfunction
 
-function! clang_format#get_version()
+function! clang_format#get_version() abort
     if &shell =~# 'csh$' && executable('/bin/bash')
         let shell_save = &shell
         set shell=/bin/bash
@@ -122,7 +122,7 @@ function! clang_format#get_version()
     endtry
 endfunction
 
-function! clang_format#is_invalid()
+function! clang_format#is_invalid() abort
     if !exists('s:command_available')
         if !executable(g:clang_format#command)
             return 1
@@ -145,7 +145,7 @@ function! clang_format#is_invalid()
     return 0
 endfunction
 
-function! s:verify_command()
+function! s:verify_command() abort
     let invalidity = clang_format#is_invalid()
     if invalidity == 1
         echoerr "clang-format is not found. check g:clang_format#command."
@@ -167,7 +167,7 @@ endfunction
 " }}}
 
 " variable definitions {{{
-function! s:getg(name, default)
+function! s:getg(name, default) abort
     " backward compatibility
     if exists('g:operator_'.substitute(a:name, '#', '_', ''))
         echoerr 'g:operator_'.substitute(a:name, '#', '_', '').' is deprecated. Please use g:'.a:name
@@ -194,12 +194,12 @@ let g:clang_format#auto_formatexpr = s:getg('clang_format#auto_formatexpr', 0)
 " }}}
 
 " format codes {{{
-function! s:detect_style_file()
+function! s:detect_style_file() abort
     let dirname = fnameescape(expand('%:p:h'))
     return findfile('.clang-format', dirname.';') != '' || findfile('_clang-format', dirname.';') != ''
 endfunction
 
-function! clang_format#format(line1, line2)
+function! clang_format#format(line1, line2) abort
     let args = printf(' -lines=%d:%d', a:line1, a:line2)
     if ! (g:clang_format#detect_style_file && s:detect_style_file())
         let args .= printf(' -style=%s ', s:make_style_options())
@@ -217,7 +217,7 @@ endfunction
 " }}}
 
 " replace buffer {{{
-function! clang_format#replace(line1, line2)
+function! clang_format#replace(line1, line2) abort
 
     call s:verify_command()
 
@@ -249,7 +249,7 @@ endfunction
 " auto formatting on insert leave {{{
 let s:pos_on_insertenter = []
 
-function! s:format_inserted_area()
+function! s:format_inserted_area() abort
     let pos = getpos('.')
     " When in the same buffer
     if &modified && ! empty(s:pos_on_insertenter) && s:pos_on_insertenter[0] == pos[0]
@@ -258,7 +258,7 @@ function! s:format_inserted_area()
     endif
 endfunction
 
-function! clang_format#enable_format_on_insert()
+function! clang_format#enable_format_on_insert() abort
     augroup plugin-clang-format-auto-format-insert
         autocmd!
         autocmd InsertEnter <buffer> let s:pos_on_insertenter = getpos('.')
@@ -268,7 +268,7 @@ endfunction
 " }}}
 
 " toggle auto formatting {{{
-function! clang_format#toggle_auto_format()
+function! clang_format#toggle_auto_format() abort
     let g:clang_format#auto_format = !g:clang_format#auto_format
     if g:clang_format#auto_format
         echo 'Auto clang-format: enabled'
@@ -279,13 +279,13 @@ endfunction
 " }}}
 
 " enable auto formatting {{{
-function! clang_format#enable_auto_format()
+function! clang_format#enable_auto_format() abort
     let g:clang_format#auto_format = 1
 endfunction
 " }}}
 
 " disable auto formatting {{{
-function! clang_format#disable_auto_format()
+function! clang_format#disable_auto_format() abort
     let g:clang_format#auto_format = 0
 endfunction
 " }}}

autoload/operator/clang_format.vim

@@ -1,8 +1,8 @@
-function! s:is_empty_region(begin, end)
+function! s:is_empty_region(begin, end) abort
     return a:begin[1] > a:end[1] || (a:begin[1] == a:end[1] && a:end[2] < a:begin[2])
 endfunction
 
-function! s:restore_screen_pos()
+function! s:restore_screen_pos() abort
     let line_diff = line('w0') - g:operator#clang_format#save_screen_pos
     if line_diff > 0
         execute 'silent normal!' line_diff."\<C-y>"
@@ -11,7 +11,7 @@ function! s:restore_screen_pos()
     endif
 endfunction
 
-function! operator#clang_format#do(motion_wise)
+function! operator#clang_format#do(motion_wise) abort
     if s:is_empty_region(getpos("'["), getpos("']"))
         return
     endif

t/clang_format_spec.vim

@@ -3,7 +3,7 @@
 
 " helpers "{{{
 " clang-format detection
-function! s:detect_clang_format()
+function! s:detect_clang_format() abort
     if $CLANG_FORMAT !=# '' && executable($CLANG_FORMAT)
         return $CLANG_FORMAT
     endif
@@ -18,23 +18,23 @@ function! s:detect_clang_format()
 endfunction
 let g:clang_format#command = s:detect_clang_format()
 
-function! Chomp(s)
+function! Chomp(s) abort
     return a:s =~# '\n$'
                 \ ? a:s[0:len(a:s)-2]
                 \ : a:s
 endfunction
 
-function! ChompHead(s)
+function! ChompHead(s) abort
     return a:s =~# '^\n'
                 \ ? a:s[1:len(a:s)-1]
                 \ : a:s
 endfunction
 
-function! GetBuffer()
+function! GetBuffer() abort
     return join(getline(1, '$'), "\n")
 endfunction
 
-function! ClangFormat(line1, line2, ...)
+function! ClangFormat(line1, line2, ...) abort
     let opt = printf("-lines=%d:%d -style='{BasedOnStyle: Google, IndentWidth: %d, UseTab: %s", a:line1, a:line2, &l:shiftwidth, &l:expandtab==1 ? "false" : "true")
     let file = 'test.cpp'
 
@@ -65,7 +65,7 @@ runtime! plugin/clang_format.vim
 
 call vspec#customize_matcher('to_be_empty', function('empty'))
 
-function! RaisesException(cmd)
+function! RaisesException(cmd) abort
     try
         execute a:cmd
         return 0
@@ -118,7 +118,7 @@ end
 "}}}
 
 " test for clang_format#format() {{{
-function! s:expect_the_same_output(line1, line2)
+function! s:expect_the_same_output(line1, line2) abort
     Expect clang_format#format(a:line1, a:line2) ==# ClangFormat(a:line1, a:line2)
 endfunction