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

rc format: restore in-client error when formatcmd fails

Browse Source 
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
This commit is contained in:
Johannes Altmanninger 2022-04-09 14:38:32 +02:00
parent eae8ea8a54
commit a0477b1016
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rc/tools/format.kak
View File

@ -14,7 +14,8 @@ define-command format-selections -docstring "Format the selections individually"
echo "fail 'The option ''formatcmd'' must be set'" echo "fail 'The option ''formatcmd'' must be set'"
fi fi
} }
evaluate-commands -draft -no-hooks -save-regs '|' %{ evaluate-commands -draft -no-hooks -save-regs 'e|' %{
set-register e nop
set-register '|' %{ set-register '|' %{
format_in="$(mktemp "${TMPDIR:-/tmp}"/kak-formatter.XXXXXX)" format_in="$(mktemp "${TMPDIR:-/tmp}"/kak-formatter.XXXXXX)"
format_out="$(mktemp "${TMPDIR:-/tmp}"/kak-formatter.XXXXXX)" format_out="$(mktemp "${TMPDIR:-/tmp}"/kak-formatter.XXXXXX)"
@ -24,12 +25,13 @@ define-command format-selections -docstring "Format the selections individually"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
cat "$format_out" cat "$format_out"
else else
printf 'eval -client %s %%{ fail formatter returned an error %s }\n' "$kak_client" "$?" | kak -p "$kak_session" echo "set-register e fail formatter returned an error (exit code $?)" >"$kak_command_fifo"
cat "$format_in" cat "$format_in"
fi fi
rm -f "$format_in" "$format_out" rm -f "$format_in" "$format_out"
} }
execute-keys '|<ret>' execute-keys '|<ret>'
%reg{e}
} }
} }