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

Replace my implementation of crystal-insert-on-new-line with already-existing ruby one

Browse Source 
This fixed a weird bug where if you were typing in the top level scope of a
program (no indentation before statements), the `end`s wouldn't be inserted
for you.
This commit is contained in:
John Isom 2020-08-02 11:39:40 -06:00
parent f59bdc614f
commit 72f658f896
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rc/filetype/crystal.kak
View File

@ -214,23 +214,19 @@ define-command -hidden crystal-indent-on-new-line %{
define-command -hidden crystal-insert-on-new-line %[ define-command -hidden crystal-insert-on-new-line %[
evaluate-commands -no-hooks -draft -itersel %[ evaluate-commands -no-hooks -draft -itersel %[
# Copy comment prefix and following whitespaces # copy _#_ comment prefix and following white spaces
try %{ execute-keys -draft k <a-x> s '^\h*\K#\h*' <ret> y j gl p } try %{ execute-keys -draft k <a-x> s '^\h*\K#\h*' <ret> y j <a-x><semicolon> P }
# wisely add end structure
# Add `end` token if needs be
# The 'x' register is to save the leading whitespaces of the opening token
evaluate-commands -save-regs x %[ evaluate-commands -save-regs x %[
# Save the leading whitespaces in register 'x' try %{ execute-keys -draft k <a-x> s ^ \h + <ret> \" x y } catch %{ reg x '' }
try %{ execute-keys -draft k <a-x> s ^\h* <ret> \" x y }
try %[ try %[
evaluate-commands -draft %[ evaluate-commands -draft %[
# Make sure previous line opens a block # Check if previous line opens a block
execute-keys -draft k <a-x> <a-k> ^<c-r>x(?:begin|case|class|def|for|if|module|unless|until|while|.+\bdo\h\|.+(?=\|))[^0-9A-Za-z_!?] <ret> execute-keys -draft k<a-x> <a-k>^<c-r>x(?:begin|case|class|def|for|if|module|unless|until|while|.+\bdo$|.+\bdo\h\|.+(?=\|))[^0-9A-Za-z_!?]<ret>
# Make sure `end` doesn't already exist on indent level # Check that we do not already have an end for this indent level which is first set via `crystal-indent-on-new-line` hook
execute-keys -draft }i J <a-x> <a-K> ^<c-r>x(?:end|else|elsif|rescue|when)[^0-9A-Za-z_!?]<ret> execute-keys -draft }i J <a-x> <a-K> ^<c-r>x(?:end|else|elsif|rescue|when)[^0-9A-Za-z_!?]<ret>
] ]
# Insert new line with end prepended by contents of register 'x' execute-keys -draft o<c-r>xend<esc> # insert a new line with containing end
execute-keys -draft o <c-r>x end <esc>
] ]
] ]
] ]