Try to unify objective c and cpp in a c-family.kak file

This commit is contained in:
Maxime Coste 2014-12-01 13:52:24 +00:00
parent 4fbaee61c5
commit 6c45b1d1e2

View File

@ -6,7 +6,11 @@ hook global BufSetOption mimetype=text/x-c(\+\+)? %{
set buffer filetype cpp set buffer filetype cpp
} }
def -hidden _cpp_indent_on_new_line %~ hook global BufCreate .*\.m %{
set buffer filetype objc
}
def -hidden _c-family-indent-on-new-line %~
eval -draft -itersel %_ eval -draft -itersel %_
# preserve previous line indent # preserve previous line indent
try %{ exec -draft \;K<a-&> } try %{ exec -draft \;K<a-&> }
@ -27,71 +31,86 @@ def -hidden _cpp_indent_on_new_line %~
_ _
~ ~
def -hidden _cpp_indent_on_opening_curly_brace %[ def -hidden _c-family-indent-on-opening-curly-brace %[
# align indent with opening paren when { is entered on a new line after the closing paren # align indent with opening paren when { is entered on a new line after the closing paren
try %[ exec -draft -itersel h<a-F>)M <a-k> \`\(.*\)\h*\n\h*\{\' <ret> s \`|.\' <ret> 1<a-&> ] try %[ exec -draft -itersel h<a-F>)M <a-k> \`\(.*\)\h*\n\h*\{\' <ret> s \`|.\' <ret> 1<a-&> ]
] ]
def -hidden _cpp_indent_on_closing_curly_brace %[ def -hidden _c-family-indent-on-closing-curly-brace %[
# align to opening curly brace when alone on a line # align to opening curly brace when alone on a line
try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ] try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ]
# add ; after } if class or struct definition # add ; after } if class or struct definition
try %[ exec -draft "hm;<a-?>(class|struct|union)<ret><a-k>\`(class|struct|union)[^{}\n]+(\n)?\s*\{\'<ret><a-;>ma;<esc>" ] try %[ exec -draft "hm;<a-?>(class|struct|union)<ret><a-k>\`(class|struct|union)[^{}\n]+(\n)?\s*\{\'<ret><a-;>ma;<esc>" ]
] ]
addhl -group / regions -default code cpp \ # Regions definition are the same between c++ and objective-c
string %{(?<!')"} %{(?<!\\)(\\\\)*"} '' \ %sh{
comment /\* \*/ '' \ for ft in cpp objc; do
comment // $ '' \ echo '
disabled ^\h*?#\h*if\h+(0|FALSE)\b '#\h*(else|elif|endif)' '#\h*if(def)?' \ addhl -group / regions -default code FT \
macro ^\h*?\K# (?<!\\)\n '' string %{(?<!'\'')"} %{(?<!\\)(\\\\)*\"} "" \
comment /\* \*/ "" \
comment // $ "" \
disabled ^\h*?#\h*if\h+(0|FALSE)\b "#\h*(else|elif|endif)" "#\h*if(def)?" \
macro ^\h*?\K# %{(?<!\\)\n} ""
addhl -group /cpp/string fill string addhl -group /FT/string fill string
addhl -group /cpp/comment fill comment addhl -group /FT/comment fill comment
addhl -group /cpp/disabled fill rgb:666666 addhl -group /FT/disabled fill rgb:666666
addhl -group /cpp/macro fill meta addhl -group /FT/macro fill meta' | sed -e "s/FT/${ft}/g"
done
}
# c++ specific
addhl -group /cpp/code regex %{\<(this|true|false|NULL|nullptr|)\>|\<-?\d+[fdiu]?|'((\\.)?|[^'\\])'} 0:value addhl -group /cpp/code regex %{\<(this|true|false|NULL|nullptr|)\>|\<-?\d+[fdiu]?|'((\\.)?|[^'\\])'} 0:value
addhl -group /cpp/code regex "\<(void|int|char|unsigned|float|bool|size_t)\>" 0:type addhl -group /cpp/code regex "\<(void|int|char|unsigned|float|bool|size_t)\>" 0:type
addhl -group /cpp/code regex "\<(while|for|if|else|do|switch|case|default|goto|break|continue|return|using|try|catch|throw|new|delete|and|or|not|operator|explicit|(?:reinterpret|const|static|dynamic)_cast)\>" 0:keyword addhl -group /cpp/code regex "\<(while|for|if|else|do|switch|case|default|goto|break|continue|return|using|try|catch|throw|new|delete|and|or|not|operator|explicit|(?:reinterpret|const|static|dynamic)_cast)\>" 0:keyword
addhl -group /cpp/code regex "\<(const|constexpr|mutable|auto|namespace|inline|static|volatile|class|struct|enum|union|public|protected|private|template|typedef|virtual|friend|extern|typename|override|final)\>" 0:attribute addhl -group /cpp/code regex "\<(const|constexpr|mutable|auto|namespace|inline|static|volatile|class|struct|enum|union|public|protected|private|template|typedef|virtual|friend|extern|typename|override|final)\>" 0:attribute
hook global WinSetOption filetype=cpp %[ # objective-c specific
addhl ref cpp addhl -group /objc/code regex %{\<(self|nil|id|super|TRUE|FALSE|YES|NO|NULL)\>|\<-?\d+[fdiu]?|'((\\.)?|[^'\\])'} 0:value
addhl -group /objc/code regex "\<(void|int|char|unsigned|float|bool|size_t|instancetype|BOOL|NSInteger|NSUInteger|CGFloat|NSString)\>" 0:type
addhl -group /objc/code regex "\<(while|for|if|else|do|switch|case|default|goto|break|continue|return)\>" 0:keyword
addhl -group /objc/code regex "\<(const|auto|inline|static|volatile|struct|enum|union|typedef|extern|__block|@\w+)\>" 0:attribute
hook global WinSetOption filetype=(cpp|objc) %[
# cleanup trailing whitespaces when exiting insert mode # cleanup trailing whitespaces when exiting insert mode
hook window InsertEnd .* -group cpp-hooks %{ try %{ exec -draft <a-x>s\h+$<ret>d } } hook window InsertEnd .* -group c-family-hooks %{ try %{ exec -draft <a-x>s\h+$<ret>d } }
hook window InsertChar \n -group cpp-indent _cpp_indent_on_new_line hook window InsertChar \n -group c-family-indent _c-family-indent-on-new-line
hook window InsertChar \{ -group cpp-indent _cpp_indent_on_opening_curly_brace hook window InsertChar \{ -group c-family-indent _c-family-indent-on-opening-curly-brace
hook window InsertChar \} -group cpp-indent _cpp_indent_on_closing_curly_brace hook window InsertChar \} -group c-family-indent _c-family-indent-on-closing-curly-brace
alias window alt cpp-alternative-file alias window alt c-family-alternative-file
] ]
hook global WinSetOption filetype=(?!cpp).* %{ hook global WinSetOption filetype=(?!cpp|objc).* %[
rmhl cpp rmhooks window c-family-indent
rmhooks window cpp-indent rmhooks window c-family-hooks
rmhooks window cpp-hooks unalias window alt c-family-alternative-file
]
unalias window alt cpp-alternative-file hook global WinSetOption filetype=cpp %[ addhl ref cpp ]
} hook global WinSetOption filetype=(?!cpp).* %[ rmhl cpp ]
def -hidden _cpp_insert_include_guards %{ hook global WinSetOption filetype=objc %[ addhl ref objc ]
hook global WinSetOption filetype=(?!objc).* %[ rmhl objc ]
def -hidden _c-family-insert-include-guards %{
exec ggi<c-r>%<ret><esc>ggxs\.<ret>c_<esc><space>A_INCLUDED<esc>ggxyppI#ifndef<space><esc>jI#define<space><esc>jI#endif<space>//<space><esc>O<esc> exec ggi<c-r>%<ret><esc>ggxs\.<ret>c_<esc><space>A_INCLUDED<esc>ggxyppI#ifndef<space><esc>jI#define<space><esc>jI#endif<space>//<space><esc>O<esc>
} }
hook global BufNew .*\.(h|hh|hpp|hxx|H) _cpp_insert_include_guards hook global BufNew .*\.(h|hh|hpp|hxx|H) _c-family-insert-include-guards
decl str-list alt_dirs ".;.." decl str-list alt_dirs ".;.."
def cpp-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=$(echo ${kak_opt_alt_dirs} | sed -e 's/;/ /g') alt_dirs=$(echo ${kak_opt_alt_dirs} | sed -e 's/;/ /g')
file=$(basename ${kak_buffile}) file=$(basename ${kak_buffile})
dir=$(dirname ${kak_buffile}) dir=$(dirname ${kak_buffile})
case ${file} in case ${file} in
*.c|*.cc|*.cpp|*.cxx|*.C|*.inl) *.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%.*}.${ext}"
@ -102,7 +121,7 @@ def cpp-alternative-file -docstring "Jump to the alternate file (header/implemen
;; ;;
*.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; do for ext in c cc cpp cxx C m; do
altname="${dir}/${alt_dir}/${file%.*}.${ext}" altname="${dir}/${alt_dir}/${file%.*}.${ext}"
[ -f ${altname} ] && break [ -f ${altname} ] && break
done done