Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update end_line when using g:neoformat_run_all_formatters. #257

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions autoload/neoformat.vim
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ function! neoformat#Neoformat(bang, user_input, start_line, end_line) abort
endfunction

function! s:neoformat(bang, user_input, start_line, end_line) abort
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 = a:start_line != 1 || end_line != line('$')

let inputs = split(a:user_input)
if a:bang
Expand Down Expand Up @@ -80,7 +81,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('%'), a:start_line, end_line)
let original_buffer = getbufline(bufnr('%'), 1, '$')

call neoformat#utils#log(stdin)
Expand Down Expand Up @@ -114,7 +115,7 @@ 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_after = getbufline(bufnr('%'), end_line + 1, '$')
let lines_before = getbufline(bufnr('%'), 1, a:start_line - 1)

let new_buffer = lines_before + stdout + lines_after
Expand All @@ -133,6 +134,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