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

rc: Simplify and optimize the alt command

Browse Source
This commit is contained in:
Frank LENORMAND 2017-05-16 15:34:29 +03:00
parent 56837eaece
commit d59bafa2c1
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rc/core/c-family.kak
View File

@ -283,30 +283,35 @@ def -hidden c-family-insert-include-guards %{
hook global BufNewFile .*\.(h|hh|hpp|hxx|H) c-family-insert-include-guards hook global BufNewFile .*\.(h|hh|hpp|hxx|H) c-family-insert-include-guards
decl str-list alt_dirs ".;.." decl str-list alt_dirs ".:.."
def c-family-alternative-file -docstring "Jump to the alternate file (header/implementation)" %{ %sh{ def c-family-alternative-file -docstring "Jump to the alternate file (header/implementation)" %{ %sh{
alt_dirs=$(printf %s\\n "${kak_opt_alt_dirs}" | sed -e 's/;/ /g') alt_dirs=$(printf %s\\n "${kak_opt_alt_dirs}" | tr ':' '\n')
file=$(basename "${kak_buffile}") file="${kak_buffile##*/}"
file_noext="${file%.*}"
dir=$(dirname "${kak_buffile}") dir=$(dirname "${kak_buffile}")
case ${file} in case ${file} in
*.c|*.cc|*.cpp|*.cxx|*.C|*.inl|*.m) *.c|*.cc|*.cpp|*.cxx|*.C|*.inl|*.m)
for alt_dir in ${alt_dirs}; do for alt_dir in ${alt_dirs}; do
for ext in h hh hpp hxx H; do for ext in h hh hpp hxx H; do
altname="${dir}/${alt_dir}/${file%.*}.${ext}" altname="${dir}/${alt_dir}/${file_noext}.${ext}"
[ -f ${altname} ] && break if [ -f ${altname} ]; then
printf 'edit %%{%s}\n' "${altname}"
exit
fi
done done
[ -f ${altname} ] && break
done done
;; ;;
*.h|*.hh|*.hpp|*.hxx|*.H) *.h|*.hh|*.hpp|*.hxx|*.H)
for alt_dir in ${alt_dirs}; do for alt_dir in ${alt_dirs}; do
for ext in c cc cpp cxx C m; do for ext in c cc cpp cxx C m; do
altname="${dir}/${alt_dir}/${file%.*}.${ext}" altname="${dir}/${alt_dir}/${file_noext}.${ext}"
[ -f ${altname} ] && break if [ -f ${altname} ]; then
printf 'edit %%{%s}\n' "${altname}"
exit
fi
done done
[ -f ${altname} ] && break
done done
;; ;;
*) *)
@ -314,9 +319,5 @@ def c-family-alternative-file -docstring "Jump to the alternate file (header/imp
exit exit
;; ;;
esac esac
if [ -f ${altname} ]; then echo "echo -color Error 'alternative file not found'"
printf %s\\n "edit '${altname}'"
else
echo "echo -color Error 'alternative file not found'"
fi
}} }}