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

Merge remote-tracking branch 'lenormf/rc/commenting.kak'

Browse Source
This commit is contained in:
Maxime Coste 2015-12-03 13:35:01 +00:00
commit 55d60e6ce2
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rc/commenting.kak
View File

@ -6,15 +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 { function exec_proof {
## Escape characters that can be interpreted as modifiers/repetitors by the regex engine ## Replace the '<' sign that is interpreted differently in `exec`
sed -r 's,(\*|\+|\[|\]|\{\}|\||\(|\)|\?),\\\1,g' <<< "$@" sed -r 's,<,<lt>,g' <<< "$@"
} }
readonly opening="${kak_opt_comment_selection_chars%%:*}" readonly opening=$(exec_proof "${kak_opt_comment_selection_chars%%:*}")
readonly closing="${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
@ -27,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} + 1))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}
} }
}" }"
} }
@ -67,7 +65,7 @@ def comment-line -docstring "Comment/uncomment the current line" %{
exec -draft %{<a-K>^${opening_escaped}<ret>} exec -draft %{<a-K>^${opening_escaped}<ret>}
## Comment the line ## Comment the line
exec %{i${opening} <esc>$((${#opening} + 1))H} exec %{i${opening}<esc>${#opening}H}
} catch %{ } catch %{
## Uncomment the line ## Uncomment the line
exec -draft %{s^${opening_escaped}\h*<ret>d} exec -draft %{s^${opening_escaped}\h*<ret>d}