Merge pull request #351 from elixir-lang/multi-function-indent

fix indentation when following previous end block

Author: jbodah

autoload/elixir/indent.vim

@@ -22,7 +22,8 @@ function! elixir#indent#indent(lnum)
  \'starts_with_binary_operator',
  \'inside_nested_construct',
  \'starts_with_comment',
- \'inside_generic_block'
+ \'inside_generic_block',
+ \'following_prev_end'
  \]
  for handler in handlers
  call s:debug('testing handler elixir#indent#handle_'.handler)
@@ -157,6 +158,14 @@ function! elixir#indent#handle_following_trailing_binary_operator(lnum, text, pr
  endif
 endfunction
 
+function! elixir#indent#handle_following_prev_end(_lnum, _text, prev_nb_lnum, prev_nb_text)
+ if s:ends_with(a:prev_nb_text, s:keyword('end'), a:prev_nb_lnum)
+ return indent(a:prev_nb_lnum)
+ else
+ return -1
+ endif
+endfunction
+
 function! elixir#indent#handle_starts_with_pipe(lnum, text, prev_nb_lnum, prev_nb_text)
  if s:starts_with(a:text, '|>', a:lnum)
  let match_operator = '\%(!\|=\|<\|>\)\@<!=\%(=\|>\|\~\)\@!'

spec/indent/def_spec.rb

@@ -15,4 +15,60 @@ def handle_call({:release_lock, key}, _from, state) do
 
  def
  EOF
+
+ i <<~EOF
+ defmodule HiMom do
+ def hi do
+ puts "hi"
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ def mom do
+ puts "mom"
+ end
+ end
+ EOF
 end