Change helpers back to accept syscall-like args, but consistently

Author: dbarnett

autoload/codefmt/autopep8.vim

@@ -69,15 +69,15 @@ function! codefmt#autopep8#GetFormatter() abort
     call maktaba#ensure#IsNumber(a:endline)
 
     if s:autopep8_supports_range
-      call codefmt#formatterhelpers#Format(maktaba#syscall#Create([
+      call codefmt#formatterhelpers#Format([
           \ l:executable,
           \ '--range', string(a:startline), string(a:endline),
-          \ '-']))
+          \ '-'])
     else
       call codefmt#formatterhelpers#AttemptFakeRangeFormatting(
           \ a:startline,
           \ a:endline,
-          \ maktaba#syscall#Create([l:executable, '-']))
+          \ [l:executable, '-'])
     endif
   endfunction
 

autoload/codefmt/buildifier.vim

@@ -48,7 +48,7 @@ function! codefmt#buildifier#GetFormatter() abort
     try
       " NOTE: Ignores any line ranges given and formats entire buffer.
       " buildifier does not support range formatting.
-      call codefmt#formatterhelpers#Format(maktaba#syscall#Create(l:cmd))
+      call codefmt#formatterhelpers#Format(l:cmd)
     catch
       " Parse all the errors and stick them in the quickfix list.
       let l:errors = []

autoload/codefmt/dartfmt.vim

@@ -43,7 +43,7 @@ function! codefmt#dartfmt#GetFormatter() abort
       " dartfmt does not support range formatting yet:
       " https://github.com/dart-lang/dart_style/issues/92
       call codefmt#formatterhelpers#AttemptFakeRangeFormatting(
-        \ a:startline, a:endline, maktaba#syscall#Create(l:cmd))
+        \ a:startline, a:endline, l:cmd)
     catch /ERROR(ShellError):/
       " Parse all the errors and stick them in the quickfix list.
       let l:errors = []

autoload/codefmt/formatterhelpers.vim

@@ -13,27 +13,15 @@
 " limitations under the License.
 
 
-function! s:EnsureIsSyscall(Value) abort
-  if type(a:Value) == type({}) &&
-      \ has_key(a:Value, 'Call') &&
-      \ maktaba#function#HasSameName(
-          \ a:Value.Call, function('maktaba#syscall#Call'))
-    return a:Value
-  endif
-  throw maktaba#error#BadValue(
-      \ 'Not a valid matkaba.Syscall: %s', string(a:Value))
-endfunction
-
-
 ""
 " @public
-" Format lines in the current buffer via a formatter invoked by {cmd} (a
-" |maktaba.Syscall|). The command includes the explicit range line numbers to
-" use, if any.
+" Format lines in the current buffer via a formatter invoked by {cmd}, which
+" is a system call represented by either a |maktaba.Syscall| or any argument
+" accepted by |maktaba#syscall#Create()|. The command includes any arguments
+" for the explicit range line numbers to use, if any.
 "
 " @throws ShellError if the {cmd} system call fails
 function! codefmt#formatterhelpers#Format(cmd) abort
-  call s:EnsureIsSyscall(a:cmd)
   let l:lines = getline(1, line('$'))
   let l:input = join(l:lines, "\n")
 
@@ -47,8 +35,11 @@ endfunction
 " @public
 " Attempt to format a range of lines from {startline} to {endline} in the
 " current buffer via a formatter that doesn't natively support range
-" formatting (invoked by {cmd}, a |maktaba.Syscall|), using a hacky strategy
-" of sending those lines to the formatter in isolation.
+" formatting, which is invoked via {cmd} (a system call represented by either
+" a |maktaba.Syscall| or any argument accepted by |maktaba#syscall#Create()|).
+" It uses a hacky strategy of sending those lines to the formatter in
+" isolation, which gives bad results if the code on those lines isn't
+" a self-contained block of syntax or is part of a larger indent.
 "
 " If invoking this hack, please make sure to file a feature request against
 " the tool for range formatting and post a URL for that feature request above
@@ -59,12 +50,11 @@ function! codefmt#formatterhelpers#AttemptFakeRangeFormatting(
     \ startline, endline, cmd) abort
   call maktaba#ensure#IsNumber(a:startline)
   call maktaba#ensure#IsNumber(a:endline)
-  call s:EnsureIsSyscall(a:cmd)
 
   let l:lines = getline(1, line('$'))
   let l:input = join(l:lines[a:startline - 1 : a:endline - 1], "\n")
 
-  let l:result = a:cmd.WithStdin(l:input).Call()
+  let l:result = maktaba#syscall#Create(a:cmd).WithStdin(l:input).Call()
   let l:formatted = split(l:result.stdout, "\n")
   " Special case empty slice: neither l:lines[:0] nor l:lines[:-1] is right.
   let l:before = a:startline > 1 ? l:lines[ : a:startline - 2] : []

autoload/codefmt/gofmt.vim

@@ -43,7 +43,7 @@ function! codefmt#gofmt#GetFormatter() abort
       " gofmt does not support range formatting.
       " TODO: File a feature request with gofmt and link it here.
       call codefmt#formatterhelpers#AttemptFakeRangeFormatting(
-          \ a:startline, a:endline, maktaba#syscall#Create(l:cmd))
+          \ a:startline, a:endline, l:cmd)
     catch /ERROR(ShellError):/
       " Parse all the errors and stick them in the quickfix list.
       let l:errors = []

autoload/codefmt/googlejava.vim

@@ -59,7 +59,7 @@ function! codefmt#googlejava#GetFormatter() abort
     let l:ranges_str = join(map(copy(a:ranges), 'v:val[0] . ":" . v:val[1]'), ',')
     let l:cmd += ['--lines', l:ranges_str, '-']
 
-    call codefmt#formatterhelpers#Format(maktaba#syscall#Create(l:cmd))
+    call codefmt#formatterhelpers#Format(l:cmd)
   endfunction
 
   return l:formatter

autoload/codefmt/jsbeautify.vim

@@ -55,7 +55,7 @@ function! codefmt#jsbeautify#GetFormatter() abort
     " js-beautify does not support range formatting yet:
     " https://github.com/beautify-web/js-beautify/issues/610
     call codefmt#formatterhelpers#AttemptFakeRangeFormatting(
-        \ a:startline, a:endline, maktaba#syscall#Create(l:cmd))
+        \ a:startline, a:endline, l:cmd)
   endfunction
 
   return l:formatter

autoload/codefmt/rustfmt.vim

@@ -55,7 +55,7 @@ function! codefmt#rustfmt#GetFormatter() abort
       " NOTE: Ignores any line ranges given and formats entire buffer.
       " Even though rustfmt supports formatting ranges through the --file-lines
       " flag, it is not still enabled in the stable binaries.
-      call codefmt#formatterhelpers#Format(maktaba#syscall#Create(l:cmd))
+      call codefmt#formatterhelpers#Format(l:cmd)
     catch /ERROR(ShellError):/
       " Parse all the errors and stick them in the quickfix list.
       let l:errors = []

autoload/codefmt/shfmt.vim

@@ -55,7 +55,7 @@ function! codefmt#shfmt#GetFormatter() abort
       call codefmt#formatterhelpers#AttemptFakeRangeFormatting(
           \ a:startline,
           \ a:endline,
-          \ maktaba#syscall#Create(l:cmd))
+          \ l:cmd)
     catch /ERROR(ShellError):/
       " Parse all the errors and stick them in the quickfix list.
       let l:errors = []

doc/codefmt.txt

@@ -226,18 +226,22 @@ codefmt#FormatMap({type})                                *codefmt#FormatMap()*
   ignored since formatting only works on complete lines.
 
 codefmt#formatterhelpers#Format({cmd})     *codefmt#formatterhelpers#Format()*
-  Format lines in the current buffer via a formatter invoked by {cmd} (a
-  |maktaba.Syscall|). The command includes the explicit range line numbers to
-  use, if any.
+  Format lines in the current buffer via a formatter invoked by {cmd}, which
+  is a system call represented by either a |maktaba.Syscall| or any argument
+  accepted by |maktaba#syscall#Create()|. The command includes any arguments
+  for the explicit range line numbers to use, if any.
 
   Throws ERROR(ShellError) if the {cmd} system call fails
 
 codefmt#formatterhelpers#AttemptFakeRangeFormatting({startline}, {endline},
   {cmd})               *codefmt#formatterhelpers#AttemptFakeRangeFormatting()*
   Attempt to format a range of lines from {startline} to {endline} in the
   current buffer via a formatter that doesn't natively support range
-  formatting (invoked by {cmd}, a |maktaba.Syscall|), using a hacky strategy
-  of sending those lines to the formatter in isolation.
+  formatting, which is invoked via {cmd} (a system call represented by either
+  a |maktaba.Syscall| or any argument accepted by |maktaba#syscall#Create()|).
+  It uses a hacky strategy of sending those lines to the formatter in
+  isolation, which gives bad results if the code on those lines isn't a
+  self-contained block of syntax or is part of a larger indent.
 
   If invoking this hack, please make sure to file a feature request against
   the tool for range formatting and post a URL for that feature request above