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

Simplify/remove the escaping routines

Browse Source
This commit is contained in:
Frank LENORMAND 2015-12-03 08:52:57 +03:00
parent c40dba8a20
commit 74112ef23c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rc/commenting.kak
View File

@ -6,19 +6,13 @@ decl str comment_line_chars "//"
def comment-selection -docstring "Comment/uncomment the current selection" %{ def comment-selection -docstring "Comment/uncomment the current selection" %{
%sh{ %sh{
function escape_regex_chars {
## Escape characters that can be interpreted as modifiers/repetitors by the regex engine
sed -r 's,(\*|\+|\[|\]|\{\}|\||\(|\)|\?|\^|\$),\\\1,g' <<< "$@"
}
function exec_proof { function exec_proof {
## Replace some special characters that are interpreted differently in `exec` ## Replace the '<' sign that is interpreted differently in `exec`
sed -r -e 's,<,<lt,g' -e 's,>,gt>,g' -e 's,<lt\b,<lt>,g' -e 's,\bgt>,<gt>,g' <<< "$@" sed -r 's,<,<lt>,g' <<< "$@"
} }
readonly opening=$(exec_proof "${kak_opt_comment_selection_chars%%:*}") readonly opening=$(exec_proof "${kak_opt_comment_selection_chars%%:*}")
readonly closing=$(exec_proof "${kak_opt_comment_selection_chars##*:}") readonly closing=$(exec_proof "${kak_opt_comment_selection_chars##*:}")
readonly opening_escaped=$(escape_regex_chars "${opening}")
readonly closing_escaped=$(escape_regex_chars "${closing}")
if [ -z "${opening}" -o -z "${closing}" ]; then if [ -z "${opening}" -o -z "${closing}" ]; then
echo "The \`comment_selection_chars\` variable is empty, couldn't comment the selection" >&2 echo "The \`comment_selection_chars\` variable is empty, couldn't comment the selection" >&2
@ -31,13 +25,13 @@ def comment-selection -docstring "Comment/uncomment the current selection" %{
try %{ try %{
## The selection has already been commented ## The selection has already been commented
exec -draft %{<a-K>\A${opening_escaped}.*${closing_escaped}\z<ret>} exec -draft %{<a-K>\A\Q${opening}\E.*\Q${closing}\E\z<ret>}
## Comment the selection ## Comment the selection
exec %{a${closing}<esc>i${opening}<esc>${#opening}H} exec %{a${closing}<esc>i${opening}<esc>${#opening}H}
} catch %{ } catch %{
## Uncomment the commented selection ## Uncomment the commented selection
exec -draft %{s(\A${opening_escaped})|(${closing_escaped}\z)<ret>d} exec -draft %{s(\A\Q${opening}\E)|(\Q${closing}\E\z)<ret>d}
} }
}" }"
} }