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

Merge remote-tracking branch 'alexherbo2/fish-rc'

Browse Source
This commit is contained in:
Maxime Coste 2016-10-02 20:38:55 +01:00
commit 4addf65042
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rc/base/fish.kak
View File

@ -34,29 +34,41 @@ addhl -group /fish/code regex \b(and|begin|bg|bind|block|break|breakpoint|builti
# ‾‾‾‾‾‾‾‾ # ‾‾‾‾‾‾‾‾
def -hidden _fish_filter_around_selections %{ def -hidden _fish_filter_around_selections %{
eval -no-hooks -draft -itersel %{
# remove trailing white spaces # remove trailing white spaces
try %{ exec -draft -itersel <a-x> s \h+$ <ret> d } try %{ exec -draft <a-x>s\h+$<ret>d }
}
} }
def -hidden _fish_indent_on_char %{ def -hidden _fish_indent_on_char %{
eval -draft -itersel %{ eval -no-hooks -draft -itersel %{
# deindent on (else|end) command insertion # align middle and end structures to start and indent when necessary
try %{ exec -draft <space> <a-i>w <a-k> (else|end) <ret> <a-lt> } try %{ exec -draft <a-x><a-k>^\h*(else)$<ret><a-\;><a-?>^\h*(if)<ret>s\A|\Z<ret>'<a-&> }
try %{ exec -draft <a-x><a-k>^\h*(end)$<ret><a-\;><a-?>^\h*(begin|for|function|if|switch|while)<ret>s\A|\Z<ret>'<a-&> }
try %{ exec -draft <a-x><a-k>^\h*(case)$<ret><a-\;><a-?>^\h*(switch)<ret>s\A|\Z<ret>'<a-&>'<space><a-gt> }
} }
} }
def -hidden _fish_indent_on_new_line %{ def -hidden _fish_indent_on_new_line %{
eval -draft -itersel %{ eval -no-hooks -draft -itersel %{
# preserve previous line indent # preserve previous line indent
try %{ exec -draft <space>K<a-&> } try %{ exec -draft <space>K<a-&> }
# filter previous line # filter previous line
try %{ exec -draft k:_fish_filter_around_selections<ret> } try %{ exec -draft k:_fish_filter_around_selections<ret> }
# copy '#' comment prefix and following white spaces # indent after start structure
try %{ exec -draft kx<a-k>^\h*(begin|case|else|for|function|if|switch|while)\b<ret>j<a-gt> }
}
}
def -hidden _fish_insert_on_new_line %{
eval -no-hooks -draft -itersel %{
# copy _#_ comment prefix and following white spaces
try %{ exec -draft kxs^\h*\K#\h*<ret>yjp } try %{ exec -draft kxs^\h*\K#\h*<ret>yjp }
# indent after (case|else) commands # wisely add end structure
try %{ exec -draft <space> k x <a-k> (case|else) <ret> j <a-gt> } eval -save-regs x %{
# indent after (begin|for|function|if|switch|while) commands and add 'end' command try %{ exec -draft kxs^\h+<ret>"xy } catch %{ reg x '' }
try %{ exec -draft <space> k x <a-k> (begin|for|function|(?<!(else)\h+)if|switch|while) <ret> x y p j a end <esc> k <a-gt> } try %{ exec -draft kx<a-k>^<c-r>x(begin|for|function|if|switch|while)<ret>j<a-a>iX<a-\;>K<a-K>^<c-r>x(begin|for|function|if|switch|while).*\n<c-r>xend$<ret>jxypjaend<esc><a-lt> }
}
} }
} }
@ -66,14 +78,14 @@ def -hidden _fish_indent_on_new_line %{
hook -group fish-highlight global WinSetOption filetype=fish %{ addhl ref fish } hook -group fish-highlight global WinSetOption filetype=fish %{ addhl ref fish }
hook global WinSetOption filetype=fish %{ hook global WinSetOption filetype=fish %{
hook window InsertEnd .* -group fish-hooks _fish_filter_around_selections
hook window InsertChar .* -group fish-indent _fish_indent_on_char hook window InsertChar .* -group fish-indent _fish_indent_on_char
hook window InsertChar \n -group fish-indent _fish_indent_on_new_line hook window InsertChar \n -group fish-indent _fish_indent_on_new_line
hook window InsertChar \n -group fish-insert _fish_insert_on_new_line
} }
hook -group fish-highlight global WinSetOption filetype=(?!fish).* %{ rmhl fish } hook -group fish-highlight global WinSetOption filetype=(?!fish).* %{ rmhl fish }
hook global WinSetOption filetype=(?!fish).* %{ hook global WinSetOption filetype=(?!fish).* %{
rmhooks window fish-indent rmhooks window fish-indent
rmhooks window fish-hooks rmhooks window fish-insert
} }