Skip to content

Commit

Permalink
Update end_line when using g:neoformat_run_all_formatters
Browse files Browse the repository at this point in the history
Picked from: sbdchd#257
  • Loading branch information
novadev94 committed Jun 22, 2021
1 parent 1a49552 commit b211cf8
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions autoload/neoformat.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit b211cf8

Please sign in to comment.