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

ruby.kak: Refactor end autoinsertion logic to be more robust

Browse Source 
Fixes the bug described by PR #1994
This commit is contained in:
Maxime Coste 2018-04-14 12:47:42 +10:00
parent d5d54889bb
commit 567c82840a
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rc/base/ruby.kak
View File

@ -131,17 +131,24 @@ define-command -hidden ruby-indent-on-new-line %{
} }
} }
define-command -hidden ruby-insert-on-new-line %{ define-command -hidden ruby-insert-on-new-line %[
evaluate-commands -no-hooks -draft -itersel %{ evaluate-commands -no-hooks -draft -itersel %[
# copy _#_ comment prefix and following white spaces # copy _#_ comment prefix and following white spaces
try %{ execute-keys -draft k <a-x> s '^\h*\K#\h*' <ret> y gh j P } try %{ execute-keys -draft k <a-x> s '^\h*\K#\h*' <ret> y gh j P }
# wisely add end structure # wisely add end structure
evaluate-commands -save-regs x %{ evaluate-commands -save-regs 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 } catch %{ reg x '' }
try %{ execute-keys -draft k <a-x> <a-k> ^ <c-r> x (begin|case|class|def|do|for|if|module|unless|until|while) <ret> j <a-a> i X <a-\;> K <a-K> ^ <c-r> x (begin|case|class|def|do|for|if|module|unless|until|while) . * \n <c-r> x end $ <ret> j x y p j a end <esc> <a-lt> } try %[
} evaluate-commands -draft %[
} execute-keys -draft k<a-x> <a-k>^<c-r>x(begin|case|class|def|do|for|if|module|unless|until|while)<ret> # Check if previous line opens a block
} # Check that we do not already have an end for this indent level, or that we have another block opening at that indent level first
execute-keys -draft Ge <a-K>\A(^\n|^<c-r>x(?!begin)(?!case)(?!class)(?!def)(?!do)(?!for)(?!if)(?!module)(?!unless)(?!until)(?!while)[^\n]*\n)+<c-r>xend$<ret>
]
execute-keys -draft o<c-r>xend<esc> # insert a new line with containing end
]
]
]
]
# Initialization # Initialization
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾

1
test/indent/ruby/following-blocks-should-not-prevent-end/cmd Normal file
View File

@ -0,0 +1 @@
c<ret><esc>

4
test/indent/ruby/following-blocks-should-not-prevent-end/in Normal file
View File

@ -0,0 +1,4 @@
def foo%( )
def bar
end

6
test/indent/ruby/following-blocks-should-not-prevent-end/out Normal file
View File

@ -0,0 +1,6 @@
def foo
end
def bar
end

3
test/indent/ruby/following-blocks-should-not-prevent-end/rc Normal file
View File

@ -0,0 +1,3 @@
source "%val{runtime}/colors/default.kak"
source "%val{runtime}/rc/base/ruby.kak"
set buffer filetype ruby