Improve escaping in ctags.kak and complete using ctagsfiles option

This commit is contained in:
Maxime Coste 2015-11-16 13:34:44 +00:00
parent 92e81b422f
commit f028e6e8bb

View File

@ -6,7 +6,10 @@
decl str-list ctagsfiles 'tags' decl str-list ctagsfiles 'tags'
def -shell-params \ def -shell-params \
-shell-completion 'readtags -p "$1" | cut -f 1 | sort | uniq' \ -shell-completion '
( for tags in $(echo "${kak_opt_ctagsfiles}" | tr \':\' \'\n\');
do readtags -t "${tags}" -p "$1"
done ) | cut -f 1 | sort | uniq' \
-docstring 'Jump to tag definition' \ -docstring 'Jump to tag definition' \
tag \ tag \
%{ %sh{ %{ %sh{
@ -16,12 +19,13 @@ def -shell-params \
readtags -t "${tags}" ${tagname} readtags -t "${tags}" ${tagname}
done done
) | awk -F '\t|\n' -e ' ) | awk -F '\t|\n' -e '
/[^\t]+\t[^\t]+\t\/\^.*\$\// { /[^\t]+\t[^\t]+\t\/\^.*\$?\// {
re=$0; sub(".*\t/\\^", "", re); sub("\\$/.*", "", re); gsub("(\\{|\\}).*$", "", re); re=$0;
keys=re; gsub(/</, "<lt>", keys); sub(".*\t/\\^", "", re); sub("\\$?/$", "", re); gsub("(\\{|\\}|\\\\E).*$", "", re);
keys=re; gsub(/</, "<lt>", keys); gsub(/\t/, "<c-v><c-i>", keys);
out = out " %{" $2 " {MenuInfo}" re "} %{try %{ edit %{" $2 "}; exec %{/\\Q" keys "<ret>vc} } catch %{ echo %{unable to find tag} } }" out = out " %{" $2 " {MenuInfo}" re "} %{try %{ edit %{" $2 "}; exec %{/\\Q" keys "<ret>vc} } catch %{ echo %{unable to find tag} } }"
} }
/[^\t]+\t[^\t]+\t([0-9]+)/ { out = out " %{" $2 ":" $3 "} %{edit %{" $2 "} %{" $3 "}}" } /[^\t]+\t[^\t]+\t[0-9]+/ { out = out " %{" $2 ":" $3 "} %{edit %{" $2 "} %{" $3 "}}" }
END { print length(out) == 0 ? "echo -color Error no such tag " ENVIRON["tagname"] : "menu -markup -auto-single " out }' END { print length(out) == 0 ? "echo -color Error no such tag " ENVIRON["tagname"] : "menu -markup -auto-single " out }'
}} }}