Miscellaneous fixes to the commenting.kak
script
This commit properly produces backslash characters within double quote strings instead of hoping the shell will not recognize the escape sequence that they form with the following character. Use the proper POSIX function declaration form. The uncommenting logic now also ignores trailing newline characters, which shortens the amount of operations needed to uncomment a selection.
This commit is contained in:
parent
5db1d1beef
commit
68d3eda270
|
@ -50,7 +50,7 @@ hook global BufSetOption filetype=ruby %{
|
|||
|
||||
def comment-selection -docstring "Comment/uncomment the current selection" %{
|
||||
%sh{
|
||||
function exec_proof {
|
||||
exec_proof() {
|
||||
## Replace the '<' sign that is interpreted differently in `exec`
|
||||
printf %s\\n "$@" | sed 's,<,<lt>,g'
|
||||
}
|
||||
|
@ -63,51 +63,52 @@ def comment-selection -docstring "Comment/uncomment the current selection" %{
|
|||
exit
|
||||
fi
|
||||
|
||||
printf %s\\n "try %{
|
||||
printf %s\\n "eval -draft %{ try %{
|
||||
## The selection is empty
|
||||
exec -draft %{<a-K>\A[\h\v\n]*\z<ret>}
|
||||
exec <a-K>\\A[\\h\\v\\n]*\\z<ret>
|
||||
|
||||
try %{
|
||||
## The selection has already been commented
|
||||
exec -draft %{<a-K>\A\Q${opening}\E.*\Q${closing}\E\z<ret>}
|
||||
exec %{<a-K>\\A\\Q${opening}\\E.*\\Q${closing}\\E\\n*\\z<ret>}
|
||||
|
||||
## Comment the selection
|
||||
exec %{a${closing}<esc>i${opening}<esc>${#opening}H}
|
||||
exec -draft %{a${closing}<esc>i${opening}}
|
||||
} catch %{
|
||||
## Uncomment the commented selection
|
||||
exec -draft %{s(\A\Q${opening}\E)|(\Q${closing}\E\z)<ret>d}
|
||||
exec -draft %{s(\\A\\Q${opening}\\E)|(\\Q${closing}\\E\\n*\\z)<ret>d}
|
||||
}
|
||||
}"
|
||||
} }"
|
||||
}
|
||||
}
|
||||
|
||||
def comment-line -docstring "Comment/uncomment the current line" %{
|
||||
%sh{
|
||||
readonly opening="${kak_opt_comment_line_chars}"
|
||||
readonly opening_escaped="\Q${opening}\E"
|
||||
readonly opening_escaped="\\Q${opening}\\E"
|
||||
|
||||
if [ -z "${opening}" ]; then
|
||||
echo "echo -debug 'The \`comment_line_chars\` variable is empty, could not comment the line'"
|
||||
exit
|
||||
fi
|
||||
|
||||
printf %s\\n "
|
||||
## Select the content of the line, without indentation
|
||||
exec %{I<esc><a-l>}
|
||||
|
||||
try %{
|
||||
## There's no text on the line
|
||||
exec -draft %{<a-K>\A[\h\v\n]*\z<ret>}
|
||||
printf %s\\n "eval -draft %{
|
||||
## Select the content of the line, without indentation
|
||||
exec I<esc><a-l>
|
||||
|
||||
try %{
|
||||
## The line has already been commented
|
||||
exec -draft %{<a-K>\A${opening_escaped}<ret>}
|
||||
## There's no text on the line
|
||||
exec <a-K>\\A[\\h\\v\\n]*\\z<ret>
|
||||
|
||||
## Comment the line
|
||||
exec %{i${opening}<esc>${#opening}H}
|
||||
} catch %{
|
||||
## Uncomment the line
|
||||
exec -draft %{s\A${opening_escaped}\h*<ret>d}
|
||||
try %{
|
||||
## The line has already been commented
|
||||
exec %{<a-K>\\A${opening_escaped}<ret>}
|
||||
|
||||
## Comment the line
|
||||
exec -draft %{i${opening}}
|
||||
} catch %{
|
||||
## Uncomment the line
|
||||
exec -draft %{s\\A${opening_escaped}\\h*<ret>d}
|
||||
}
|
||||
}
|
||||
}"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user