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

Merge pull request #179 from alexherbo2/fish-rc

Browse Source 
fish.kak: code maintenance
This commit is contained in:
Maxime Coste 2014-07-04 00:45:07 +01:00
commit 6a1c98d04a
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rc/fish.kak
View File

@ -33,10 +33,18 @@ addhl -group /fish/code regex %sh{ printf '\<(%s)\>' $(printf '\Q%s\\E|' $(fish
# Commands # Commands
# ‾‾‾‾‾‾‾‾ # ‾‾‾‾‾‾‾‾
def -hidden _fish_clean_around_selections %{ def -hidden _fish_filter_around_selections %{
eval -draft -itersel %{ eval -draft -itersel %{
# trailing white spaces exec <a-x>
try %{ exec -draft <a-x> s \h+$ <ret> d } # remove trailing white spaces
try %{ exec -draft s \h+$ <ret> d }
}
}
def -hidden _fish_indent_on_char %{
eval -draft -itersel %{
# deindent on (else|end) command insertion
try %{ exec -draft <space> <a-i>w <a-k> (else|end) <ret> <a-lt> }
} }
} }
@ -44,12 +52,14 @@ def -hidden _fish_indent_on_new_line %{
eval -draft -itersel %{ eval -draft -itersel %{
# preserve previous line indent # preserve previous line indent
try %{ exec -draft <space> K <a-&> } try %{ exec -draft <space> K <a-&> }
# cleanup previous line # filter previous line
try %{ exec -draft k : _fish_clean_around_selections <ret> } try %{ exec -draft k : _fish_filter_around_selections <ret> }
# copy '#' comment prefix and following white spaces # copy '#' comment prefix and following white spaces
try %{ exec -draft k x s ^\h*\K#\h* <ret> y j p } try %{ exec -draft k x s ^\h*\K#\h* <ret> y j p }
# indent after (case|else) commands
try %{ exec -draft <space> k x <a-k> (case|else) <ret> j <a-gt> }
# indent after (begin|for|function|if|switch|while) commands and add 'end' command # indent after (begin|for|function|if|switch|while) commands and add 'end' command
try %{ exec -draft <space> k x <a-k> (begin|for|function|if|switch|while) <ret> x y p j a end <esc> k <a-gt> } 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> }
} }
} }
@ -59,7 +69,8 @@ def -hidden _fish_indent_on_new_line %{
hook global WinSetOption filetype=fish %{ hook global WinSetOption filetype=fish %{
addhl ref fish addhl ref fish
hook window InsertEnd .* -group fish-hooks _fish_clean_around_selections hook window InsertEnd .* -group fish-hooks _fish_filter_around_selections
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
} }