a0477b1016
Commit 5b1f9255 (rc: Use the standard `fail` command to report errors,
2019-11-14) replaced uses of "echo -markup {Error}" with "fail".
This made format-buffer do
echo "eval -client $kak_client %{ fail }" | kak -p $kak_session
Unfortunately "fail" fails in the client spawned by "kak -p" and not
in $kak_client where the user would see the message. Correct this.
While at it, clarify the error message, so users immediately know
that the number is the exit code.
Fixes #3254
39 lines
1.2 KiB
Plaintext
39 lines
1.2 KiB
Plaintext
declare-option -docstring "shell command used for the 'format-selections' and 'format-buffer' commands" \
|
|
str formatcmd
|
|
|
|
define-command format-buffer -docstring "Format the contents of the buffer" %{
|
|
evaluate-commands -draft %{
|
|
execute-keys '%'
|
|
format-selections
|
|
}
|
|
}
|
|
|
|
define-command format-selections -docstring "Format the selections individually" %{
|
|
evaluate-commands %sh{
|
|
if [ -z "${kak_opt_formatcmd}" ]; then
|
|
echo "fail 'The option ''formatcmd'' must be set'"
|
|
fi
|
|
}
|
|
evaluate-commands -draft -no-hooks -save-regs 'e|' %{
|
|
set-register e nop
|
|
set-register '|' %{
|
|
format_in="$(mktemp "${TMPDIR:-/tmp}"/kak-formatter.XXXXXX)"
|
|
format_out="$(mktemp "${TMPDIR:-/tmp}"/kak-formatter.XXXXXX)"
|
|
|
|
cat > "$format_in"
|
|
eval "$kak_opt_formatcmd" < "$format_in" > "$format_out"
|
|
if [ $? -eq 0 ]; then
|
|
cat "$format_out"
|
|
else
|
|
echo "set-register e fail formatter returned an error (exit code $?)" >"$kak_command_fifo"
|
|
cat "$format_in"
|
|
fi
|
|
rm -f "$format_in" "$format_out"
|
|
}
|
|
execute-keys '|<ret>'
|
|
%reg{e}
|
|
}
|
|
}
|
|
|
|
alias global format format-buffer
|