Revert "Do fmt and ast-check steps separately"

This reverts commit 29ceb12.

Author: andrewrk

README.md

@@ -37,20 +37,6 @@ This plugin enables automatic code formatting on save by default using
 let g:zig_fmt_autosave = 0
 ```
 
-Additionally, `zig ast-check` is run after formatting, to disable this,
-set the following:
-
-```
-let g:zig_ast_check_autosave = 0
-```
-
-The above `zig fmt` and `zig ast-check` are done in separate steps, to do them
-in one step (as `zig fmt --ast-check`) set the following:
-
-```
-let g:zig_fmt_ast_check_autosave = 1
-```
-
 The default compiler which gets used by `:make` (`:help :compiler` for details)
 is `zig_build` and it runs `zig build`.  The other options are:
  * `:compiler zig_test` which runs `zig test` on the current file.

autoload/zig/fmt.vim

@@ -4,7 +4,7 @@
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
 
-function! zig#fmt#Format(do_astcheck) abort
+function! zig#fmt#Format() abort
   " Save cursor position and many other things.
   let view = winsaveview()
 
@@ -13,10 +13,7 @@ function! zig#fmt#Format(do_astcheck) abort
     return
   endif
 
-  let cmdline = 'zig fmt --stdin'
-  if a:do_astcheck
-    let cmdline .= ' --ast-check'
-  endif
+  let cmdline = 'zig fmt --stdin --ast-check'
   let current_buf = bufnr('')
 
   " The formatted code is output on stdout, the errors go on stderr.
@@ -80,38 +77,6 @@ function! zig#fmt#Format(do_astcheck) abort
   syntax sync fromstart
 endfunction
 
-function! zig#fmt#Astcheck() abort
-  if !executable('zig')
-    echohl Error | echomsg "no zig binary found in PATH" | echohl None
-    return
-  endif
-
-  let cmdline = 'zig ast-check'
-  let current_buf = bufnr('')
-  if exists('*systemlist')
-    silent let out = systemlist(cmdline, current_buf)
-  else
-    silent let out = split(system(cmdline, current_buf))
-  endif
-  let err = v:shell_error
-
-  if err == 0
-    call setloclist(0, [], 'r')
-    lclose
-  else
-    let errors = s:parse_errors(expand('%'), out)
-
-    call setloclist(0, [], 'r', {
-        \ 'title': 'Errors',
-        \ 'items': errors,
-        \ })
-
-    let max_win_height = get(g:, 'zig_fmt_max_window_height', 5)
-    let win_height = min([max_win_height, len(errors)])
-    execute 'silent! lwindow ' . win_height
-  endif
-endfunction
-
 " parse_errors parses the given errors and returns a list of parsed errors
 function! s:parse_errors(filename, lines) abort
   " list of errors to be put into location list

plugin/zig.vim

@@ -3,22 +3,15 @@ if exists("g:zig_loaded")
 endif
 let g:zig_loaded = 1
 
-function! s:on_save()
-  if get(g:, "zig_fmt_ast_check_autosave", 0)
-    call zig#fmt#Format(v:true)
-  else
-    if get(g:, "zig_fmt_autosave", 1)
-      call zig#fmt#Format(v:false)
-    endif
-    if get(g:, "zig_ast_check_autosave", 1)
-      call zig#fmt#Astcheck()
-    endif
+function! s:fmt_autosave()
+  if get(g:, "zig_fmt_autosave", 1)
+    call zig#fmt#Format()
   endif
 endfunction
 
 augroup vim-zig
   autocmd!
-  autocmd BufWritePre *.zig call s:on_save()
+  autocmd BufWritePre *.zig call s:fmt_autosave()
 augroup end
 
 " vim: sw=2 ts=2 et