vim/vim-autoformat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Chiel92 2015-10-31 19:01:31 +01:00
commit 02627f491b
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugin/autoformat.vim
View File

@ -146,13 +146,23 @@ if stderrdata:
print('Failing config: {} '.format(repr(formatprg), stderrdata)) print('Failing config: {} '.format(repr(formatprg), stderrdata))
vim.command('return 0') vim.command('return 0')
else: else:
# It is not certain what kind of line endings are being used by the format program.
# Therefore we simply split on all possible eol characters.
possible_eols = ['\r\n', os.linesep, '\r', '\n']
# Often shell commands will append a newline at the end of their output. # Often shell commands will append a newline at the end of their output.
# It is not entirely clear when and why that happens. # It is not entirely clear when and why that happens.
# However, extra newlines are almost never required, while there are linters that complain # However, extra newlines are almost never required, while there are linters that complain
# about superfluous newlines, so we remove one empty newline at the end of the file. # about superfluous newlines, so we remove one empty newline at the end of the file.
if stdoutdata[-1] == os.linesep: for eol in possible_eols:
stdoutdata = stdoutdata[:-1] if stdoutdata[-1] == eol:
vim.current.buffer[:] = stdoutdata.split(os.linesep) stdoutdata = stdoutdata[:-1]
lines = [stdoutdata]
for eol in possible_eols:
lines = [splitline for line in lines for splitline in line.split(eol)]
vim.current.buffer[:] = lines
EOF EOF
return 1 return 1
@ -184,14 +194,25 @@ if stderrdata:
print('Failing config: {} '.format(repr(formatprg), stderrdata)) print('Failing config: {} '.format(repr(formatprg), stderrdata))
vim.command('return 0') vim.command('return 0')
else: else:
# It is not certain what kind of line endings are being used by the format program.
# Therefore we simply split on all possible eol characters.
possible_eols = ['\r\n', os.linesep, '\r', '\n']
stdoutdata = stdoutdata.decode('utf-8')
# Often shell commands will append a newline at the end of their output. # Often shell commands will append a newline at the end of their output.
# It is not entirely clear when and why that happens. # It is not entirely clear when and why that happens.
# However, extra newlines are almost never required, while there are linters that complain # However, extra newlines are almost never required, while there are linters that complain
# about superfluous newlines, so we remove one empty newline at the end of the file. # about superfluous newlines, so we remove one empty newline at the end of the file.
stdoutdata = stdoutdata.decode('utf-8') for eol in possible_eols:
if stdoutdata[-1] == os.linesep: if stdoutdata[-1] == eol:
stdoutdata = stdoutdata[:-1] stdoutdata = stdoutdata[:-1]
vim.current.buffer[:] = stdoutdata.split(os.linesep)
lines = [stdoutdata]
for eol in possible_eols:
lines = [splitline for line in lines for splitline in line.split(eol)]
vim.current.buffer[:] = lines
EOF EOF
return 1 return 1