Merge branch 'fix/check_command'

Author: rhysd

autoload/clang_format.vim

@@ -75,6 +75,34 @@ function! clang_format#get_version()
         endif
     endtry
 endfunction
+
+function! clang_format#is_invalid()
+    if !exists('s:command_available')
+        if ! executable(g:clang_format#command)
+            return 1
+        endif
+        let s:command_available = 1
+    endif
+
+    if !exists('s:version')
+        let v = clang_format#get_version()
+        if v[0] < 3 || (v[0] == 3 && v[1] < 4)
+            return 2
+        endif
+        let s:version = v
+    endif
+
+    return 0
+endfunction
+
+function! s:verify_command()
+    let invalidity = clang_format#is_invalid()
+    if invalidity == 1
+        echoerr "clang-format is not found. check g:clang_format#command."
+    elseif invalidity == 2
+        echoerr 'clang-format 3.3 or earlier is not supported for the lack of aruguments'
+    endif
+endfunction
 " }}}
 
 " variable definitions {{{
@@ -89,13 +117,6 @@ function! s:getg(name, default)
 endfunction
 
 let g:clang_format#command = s:getg('clang_format#command', 'clang-format')
-if ! executable(g:clang_format#command)
-    echoerr "clang-format is not found. check g:clang_format#command."
-    let &cpo = s:save_cpo
-    unlet s:save_cpo
-    finish
-endif
-
 let g:clang_format#extra_args = s:getg('clang_format#extra_args', "")
 if type(g:clang_format#extra_args) == type([])
     let g:clang_format#extra_args = join(g:clang_format#extra_args, " ")
@@ -109,13 +130,6 @@ let g:clang_format#auto_format = s:getg('clang_format#auto_format', 0)
 let g:clang_format#auto_format_on_insert_leave = s:getg('clang_format#auto_format_on_insert_leave', 0)
 " }}}
 
-" check version of clang-format "{{{
-let s:version = clang_format#get_version()
-if s:version[0] < 3 || (s:version[0] == 3 && s:version[1] < 4)
-    echoerr 'clang-format 3.3 or earlier is not supported for the lack of aruguments'
-endif
-"}}}
-
 " format codes {{{
 function! s:detect_style_file()
     let dirname = expand('%:p:h')
@@ -138,6 +152,9 @@ endfunction
 
 " replace buffer {{{
 function! clang_format#replace(line1, line2)
+
+    call s:verify_command()
+
     let pos_save = getpos('.')
     let sel_save = &l:selection
     let &l:selection = "inclusive"
@@ -157,6 +174,8 @@ function! clang_format#replace(line1, line2)
         let &l:selection = sel_save
         call setpos('.', pos_save)
     endtry
+
+    return 1
 endfunction
 " }}}
 

plugin/clang_format.vim

@@ -14,8 +14,8 @@ command! -range=% -nargs=0 ClangFormatEchoFormattedCode echo clang_format#format
 
 augroup plugin-clang-format-auto-format
     autocmd!
-    autocmd BufWritePre * if &ft ==# 'cpp' && g:clang_format#auto_format | call clang_format#replace(1, line('$')) | endif
-    autocmd FileType c,cpp,objc if g:clang_format#auto_format_on_insert_leave | call clang_format#enable_format_on_insert() | endif
+    autocmd BufWritePre * if &ft =~# '^\%(c\|cpp\|objc\)$' && g:clang_format#auto_format && !clang_format#is_invalid() | call clang_format#replace(1, line('$')) | endif
+    autocmd FileType c,cpp,objc if g:clang_format#auto_format_on_insert_leave && !clang_format#is_invalid() | call clang_format#enable_format_on_insert() | endif
 augroup END
 
 let g:loaded_clang_format = 1

t/clang-format-dummy.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo 'Ubuntu clang-format version 3.2.0-1~exp1 (trunk) (based on LLVM 3.2.0)'

t/clang_format_spec.vim

@@ -44,6 +44,18 @@ set rtp +=~/.vim/bundle/vim-operator-user
 runtime! plugin/clang_format.vim
 
 call vspec#customize_matcher('to_be_empty', function('empty'))
+
+function! RaisesException(cmd)
+    try
+        execute a:cmd
+        return 0
+    catch
+        return 1
+    endtry
+endfunction
+
+call vspec#customize_matcher('to_throw_exception', function('RaisesException'))
+
 "}}}
 
 " test for default settings {{{
@@ -131,6 +143,30 @@ describe 'clang_format#format()'
         Expect pos == getpos('.')
     end
 end
+
+describe 'clang_format#replace()'
+    before
+        let g:clang_format#detect_style_file = 0
+        new
+        execute 'silent' 'edit!' './'.s:root_dir.'t/test.cpp'
+        let s:cmd_tmp = g:clang_format#command
+    end
+
+    after
+        bdelete!
+        let g:clang_format#command = s:cmd_tmp
+    end
+
+    it 'throws an error when command is not found'
+        let g:clang_format#command = "clang_format_not_exist"
+        Expect "call clang_format#replace(1, line('$'))" to_throw_exception
+    end
+
+    it 'throws an error when command is not found'
+        let g:clang_format#command = './' . s:root_dir . 't/clang-format-dummy.sh'
+        Expect "call clang_format#replace(1, line('$'))" to_throw_exception
+    end
+end
 " }}}
 
 " test for <Plug>(operator-clang-format) {{{