summaryrefslogtreecommitdiffstats
path: root/runtime/indent
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-10-12 23:08:06 +0200
committerBram Moolenaar <Bram@vim.org>2016-10-12 23:08:06 +0200
commit4575876dc865d4160f20d61bd822fbe7cafbec41 (patch)
treeeaad797a8552786648c275f4928a4ecc960a34dc /runtime/indent
parent3e8474dd50f64c998bb665ce852f584a58dede6b (diff)
Updated runtime files.
Diffstat (limited to 'runtime/indent')
-rw-r--r--runtime/indent/ruby.vim7
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/indent/ruby.vim b/runtime/indent/ruby.vim
index 4f87ec7823..a97f4828d6 100644
--- a/runtime/indent/ruby.vim
+++ b/runtime/indent/ruby.vim
@@ -92,11 +92,12 @@ let s:end_skip_expr = s:skip_expr .
\ ' && getline(".") =~ "^\\s*\\<\\(while\\|until\\|for\\):\\@!\\>")'
" Regex that defines continuation lines, not including (, {, or [.
-let s:non_bracket_continuation_regex = '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
+let s:non_bracket_continuation_regex =
+ \ '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|:\@<![^[:alnum:]:][|&?]\|||\|&&\)\s*\%(#.*\)\=$'
" Regex that defines continuation lines.
let s:continuation_regex =
- \ '\%(%\@<![({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
+ \ '\%(%\@<![({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|:\@<![^[:alnum:]:][|&?]\|||\|&&\)\s*\%(#.*\)\=$'
" Regex that defines continuable keywords
let s:continuable_regex =
@@ -389,7 +390,7 @@ function! s:FindContainingClass()
call setpos('.', saved_position)
return found_lnum
endif
- endif
+ endwhile
call setpos('.', saved_position)
return 0