xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rc formatter: Make sure the formatter returned successfully

Browse Source 
The previous implementation used to replace the contents of the buffer with
whatever the `formatcmd` was returning, regardless of the exit code of the
command, which led to the buffer being wiped out on error.

This commit does the formatting in a temporary file, and only replaces the
current buffer with the contents of the -formatted- temporary file if the
`formatcmd` returned successfully.

Fixes #1357
This commit is contained in:
Frank LENORMAND 2017-06-23 15:09:18 +03:00
parent dc1b039282
commit 6376aa6206
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rc/core/formatter.kak
View File

@ -1,17 +1,35 @@
decl -docstring "shell command to which the contents of the current buffer is piped" \ decl -docstring "shell command to which the contents of the current buffer is piped" \
str formatcmd str formatcmd
def format -docstring "Format the contents of the current buffer" %{ def format -docstring "Format the contents of the current buffer" %{ eval -draft %{
%sh{ %sh{
if [ ! -z "${kak_opt_formatcmd}" ]; then if [ -n "${kak_opt_formatcmd}" ]; then
readonly kak_opt_formatcmd=$(printf '%s' "${kak_opt_formatcmd}" | sed 's/ /<space>/g')
## Save the current position of the cursor ## Save the current position of the cursor
readonly x=$((kak_cursor_column - 1)) readonly x=$((kak_cursor_column - 1))
readonly y="${kak_cursor_line}" readonly y="${kak_cursor_line}"
printf %s\\n "exec -draft %{%|${kak_opt_formatcmd}<ret>}" path_file_tmp=$(mktemp "${TMPDIR:-/tmp}"/kak-formatter-XXXXXX)
## Try to restore the position of the cursor as it was prior to formatting printf %s\\n "
printf %s\\n "exec gg ${y}g ${x}l" write \"${path_file_tmp}\"
%sh{
readonly path_file_out=\$(mktemp \"${TMPDIR:-/tmp}\"/kak-formatter-XXXXXX)
if cat \"${path_file_tmp}\" | eval \"${kak_opt_formatcmd}\" > \"\${path_file_out}\"; then
printf '%s\\n' \"exec \\%|cat<space>'\${path_file_out}'<ret>\"
printf '%s\\n' \"%sh{ rm -f '\${path_file_out}' }\"
## Try to restore the position of the cursor as it was prior to formatting
printf '%s\\n' 'exec gg ${y}g ${x}l'
else
printf '%s\\n' \"
eval -client '${kak_client}' echo -color Error formatter returned an error (\$?)
\"
rm -f \"\${path_file_out}\"
fi
rm -f \"${path_file_tmp}\"
}
"
fi fi
} }
} } }