Update end_line when using g:neoformat_run_all_formatters

Picked from: sbdchd#257
novadev94 · Sep 5, 2021 · 7c6d3f2 · 7c6d3f2
1 parent 3924dad
commit 7c6d3f2
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/autoload/neoformat.vim b/autoload/neoformat.vim
@@ -16,12 +16,14 @@ function! neoformat#Neoformat(bang, user_input, start_line, end_line) abort
 endfunction
 
 function! s:neoformat(bang, user_input, start_line, end_line) abort
+    let start_line = a:start_line
+    let end_line = a:end_line
 
     if !&modifiable
         return neoformat#utils#warn('buffer not modifiable')
     endif
 
-    let using_visual_selection = a:start_line != 1 || a:end_line != line('$')
+    let using_visual_selection = start_line != 1 || end_line != line('$')
 
     let inputs = split(a:user_input)
     if a:bang
@@ -80,7 +82,7 @@ function! s:neoformat(bang, user_input, start_line, end_line) abort
             continue
         endif
 
-        let stdin = getbufline(bufnr('%'), a:start_line, a:end_line)
+        let stdin = getbufline(bufnr('%'), start_line, end_line)
         let original_buffer = getbufline(bufnr('%'), 1, '$')
 
         call neoformat#utils#log(stdin)
@@ -114,8 +116,8 @@ function! s:neoformat(bang, user_input, start_line, end_line) abort
         endif
         if process_ran_succesfully
             " 1. append the lines that are before and after the formatterd content
-            let lines_after = getbufline(bufnr('%'), a:end_line + 1, '$')
-            let lines_before = getbufline(bufnr('%'), 1, a:start_line - 1)
+            let lines_after = getbufline(bufnr('%'), end_line + 1, '$')
+            let lines_before = getbufline(bufnr('%'), 1, start_line - 1)
 
             let new_buffer = lines_before + stdout + lines_after
             if new_buffer !=# original_buffer
@@ -133,6 +135,9 @@ function! s:neoformat(bang, user_input, start_line, end_line) abort
             if !neoformat#utils#var('neoformat_run_all_formatters')
                 return neoformat#utils#msg(endmsg)
             endif
+            " If the number of lines changed, update the end_line so that the
+            " next formatter grabs the correct lines
+            let end_line = a:start_line + len(stdout)
             call neoformat#utils#log('running next formatter')
         else
             call add(formatters_failed, cmd.name)