Respond to comments.

Author: artasparks

README.md

@@ -88,15 +88,15 @@ augroup autoformat_settings
 augroup END
 ```
 
-# Configuring formatters.
+# Configuring formatters
 
 Most formatters have some options available that can be configured via
 [Glaive](https://www.github.com/google/vim-glaive)
 You can get a quick view of all codefmt flags by executing `:Glaive codefmt`, or
 start typing flag names and use tab completion. See `:help Glaive` for usage
 details.
 
-# Installing and configuring formatters
+# Installing formatters
 
 Codefmt defines several built-in formatters. The easiest way to see the list of
 available formatters is via tab completion: Type `:FormatCode <TAB>` in vim.
@@ -130,7 +130,7 @@ here](https://github.com/google/vim-codefmt/wiki/Formatter-Integration-Guide).
     ```
 
 *   Create a flag in
-    [instant/flags.vim](https://github.com/Kashomon/vim-codefmt/blob/master/instant/flags.vim)
+    [instant/flags.vim](https://github.com/google/vim-codefmt/blob/master/instant/flags.vim)
 
     ```vim
     ""

autoload/codefmt/clangformat.vim

@@ -15,11 +15,14 @@
 
 let s:plugin = maktaba#plugin#Get('codefmt')
 
+function! codefmt#clangformat#IsExecutable(exec) abort
+  return executable(a:exec)
+endfunction
 
 function! s:ClangFormatHasAtLeastVersion(minimum_version) abort
   if !exists('s:clang_format_version')
     let l:executable = s:plugin.Flag('clang_format_executable')
-    if !executable(l:executable)
+    if !codefmt#clangformat#IsExecutable(l:executable)
       return 0
     endif
 

autoload/codefmt/googlejava.vim

@@ -24,7 +24,7 @@ function! codefmt#googlejava#GetFormatter() abort
       \ 'setup_instructions': 'Install google-java formatter ' .
           \ "(https://github.com/google/google-java-format). \n" .
           \ 'Enable with "Glaive codefmt google_java_executable=' .
-          \ '"java -jar /path/to/google-java-format-1.2-all-deps.jar" ' .
+          \ '"java -jar /path/to/google-java-format-VERSION-all-deps.jar" ' .
           \ 'in your vimrc' }
 
   function l:formatter.IsAvailable() abort
@@ -56,7 +56,7 @@ function! codefmt#googlejava#GetFormatter() abort
       call maktaba#ensure#IsNumber(l:startline)
       call maktaba#ensure#IsNumber(l:endline)
     endfor
-    let l:ranges_str = join(map(a:ranges, 'v:val[0] . ":" . v:val[1]'), ',')
+    let l:ranges_str = join(map(copy(a:ranges), 'v:val[0] . ":" . v:val[1]'), ',')
     let l:cmd += ['--lines', l:ranges_str, '-']
 
     let l:input = join(getline(1, line('$')), "\n")
@@ -65,7 +65,6 @@ function! codefmt#googlejava#GetFormatter() abort
     call maktaba#buffer#Overwrite(1, line('$'), l:formatted)
   endfunction
 
-  let s:google_java_format = l:formatter
   return l:formatter
 endfunction
 

vroom/clangformat.vroom

@@ -12,7 +12,11 @@ briefly.
   :function FakeRepeat(...)<CR>
   |  call add(g:repeat_calls, a:000)<CR>
   :endfunction
+  :function ClangExec(...)<CR>
+  |  return 1<CR>
+  :endfunction
   :call maktaba#test#Override('repeat#set', 'FakeRepeat')
+  :call maktaba#test#Override('codefmt#clangformat#IsExecutable', 'ClangExec')
 
   :call codefmt#SetWhetherToPerformIsAvailableChecksForTesting(0)
 
@@ -77,7 +81,7 @@ You can format any buffer with clang-format specifying the formatter explicitly.
 
 Several filetypes will use the clang-format formatter by default: c, cpp,
 javascript, and proto.  If the version of clang-format is >= 3.6, then it will
-also format java files.
+also format java files, but google-java-format is the default.
 
   @clear
   % f();
@@ -101,7 +105,7 @@ also format java files.
   $ f();
 
   :set filetype=java
-  :FormatCode
+  :FormatCode clang-format
   ! clang-format .*
   $ { "Cursor": 0 }
   $ f();