diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-29 01:02:22 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-04-29 01:03:42 +0200 |
| commit | 53419673154a98b705cfa80590099a247cc9df49 (patch) | |
| tree | 3eb512ee1a938f9063a59660a9b765cdd68ea3f2 | |
| parent | 60e68f309675c353b0453d6a1caa21c95caf97c2 (diff) | |
| download | rneovim-53419673154a98b705cfa80590099a247cc9df49.tar.gz rneovim-53419673154a98b705cfa80590099a247cc9df49.tar.bz2 rneovim-53419673154a98b705cfa80590099a247cc9df49.zip | |
vim-patch:4575876dc865
Updated runtime files.
https://github.com/vim/vim/commit/4575876dc865d4160f20d61bd822fbe7cafbec41
| -rw-r--r-- | runtime/autoload/rubycomplete.vim | 2 | ||||
| -rw-r--r-- | runtime/indent/ruby.vim | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/runtime/autoload/rubycomplete.vim b/runtime/autoload/rubycomplete.vim index 440dfd42e9..40b87f4cbe 100644 --- a/runtime/autoload/rubycomplete.vim +++ b/runtime/autoload/rubycomplete.vim @@ -196,7 +196,7 @@ function! rubycomplete#Complete(findstart, base) if c =~ '\w' continue elseif ! c =~ '\.' - idx = -1 + let idx = -1 break else break 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 |