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

Try all possible new line characters to split on.

Browse Source
This commit is contained in:
Chiel ten Brinke 2015-10-28 13:57:22 +01:00
parent d3d07cb23e
commit 8a740ab186
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugin/autoformat.vim
View File

@ -152,7 +152,14 @@ else:
# 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: if stdoutdata[-1] == os.linesep:
stdoutdata = stdoutdata[:-1] stdoutdata = stdoutdata[:-1]
vim.current.buffer[:] = stdoutdata.split(os.linesep)
# 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.
lines = [stdoutdata]
for eol in ['\r\n', '\r', '\n', os.linesep]:
lines = [splitline for line in lines for splitline in line.split(eol)]
vim.current.buffer[:] = lines
EOF EOF
return 1 return 1
@ -190,7 +197,16 @@ else:
# 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: if stdoutdata[-1] == os.linesep:
stdoutdata = stdoutdata[:-1] stdoutdata = stdoutdata[:-1]
vim.current.buffer[:] = stdoutdata.split(os.linesep)
stdoutdata = stdoutdata.decode('utf-8')
# 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.
lines = [stdoutdata]
for eol in [b'\r\n', b'\r', b'\n', os.linesep.decode('utf-8')]:
lines = [splitline for line in lines for splitline in line.split(eol)]
vim.current.buffer[:] = lines
EOF EOF
return 1 return 1