diff options
Diffstat (limited to 'indent')
| -rw-r--r-- | indent/lua.vim | 12 | ||||
| -rw-r--r-- | indent/ruby.vim | 15 |
2 files changed, 25 insertions, 2 deletions
diff --git a/indent/lua.vim b/indent/lua.vim index 49180347..6eb8ff08 100644 --- a/indent/lua.vim +++ b/indent/lua.vim @@ -31,6 +31,8 @@ let s:close_patt = '\C\%(\<\%(end\|until\)\>\|)\|}\)' let s:anon_func_start = '\S\+\s*[({].*\<function\s*(.*)\s*$' let s:anon_func_end = '\<end\%(\s*[)}]\)\+' +let s:chained_func_call = "^\\v\\s*[:.]\\w+[({\"']" + " Expression used to check whether we should skip a match with searchpair(). let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~# 'luaComment\\|luaString'" @@ -100,6 +102,16 @@ function GetLuaIndent() let i += 1 endif + " if the current line chains a function call to previous unchained line + if contents_prev !~# s:chained_func_call && contents_cur =~# s:chained_func_call + let i += 1 + endif + + " if the current line chains a function call to previous unchained line + if contents_prev =~# s:chained_func_call && contents_cur !~# s:chained_func_call + let i -= 1 + endif + " special case: call(with, {anon = function() -- should indent only once if i > 1 && contents_prev =~# s:anon_func_start let i = 1 diff --git a/indent/ruby.vim b/indent/ruby.vim index 8e72739e..1f2313cd 100644 --- a/indent/ruby.vim +++ b/indent/ruby.vim @@ -31,6 +31,11 @@ if !exists('g:ruby_indent_block_style') let g:ruby_indent_block_style = 'do' endif +if !exists('g:ruby_indent_hanging_elements') + " Non-zero means hanging indents are enabled, zero means disabled + let g:ruby_indent_hanging_elements = 1 +endif + setlocal nosmartindent " Now, set up our indentation expression and keys that trigger it. @@ -323,7 +328,11 @@ function! s:ClosingBracketOnEmptyLine(cline_info) abort if searchpair(escape(bracket_pair[0], '\['), '', bracket_pair[1], 'bW', s:skip_expr) > 0 if closing_bracket == ')' && col('.') != col('$') - 1 - let ind = virtcol('.') - 1 + if g:ruby_indent_hanging_elements + let ind = virtcol('.') - 1 + else + let ind = indent(line('.')) + end elseif g:ruby_indent_block_style == 'do' let ind = indent(line('.')) else " g:ruby_indent_block_style == 'expression' @@ -548,7 +557,9 @@ function! s:AfterUnbalancedBracket(pline_info) abort let [opening, closing] = s:ExtraBrackets(info.plnum) if opening.pos != -1 - if opening.type == '(' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0 + if !g:ruby_indent_hanging_elements + return indent(info.plnum) + info.sw + elseif opening.type == '(' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0 if col('.') + 1 == col('$') return indent(info.plnum) + info.sw else |