adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Runtime file updates.

Browse Source
This commit is contained in:
Bram Moolenaar
2010-05-28 20:54:39 +02:00
parent 167632fcdd
commit 1d68952a3e
15 changed files with 242 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/indent/eruby.vim
View File

@ -1,7 +1,7 @@
" Vim indent file
" Language: eRuby
" Maintainer: Tim Pope <vimNOSPAM@tpope.info>
" Info: $Id: eruby.vim,v 1.16 2008/06/29 04:18:43 tpope Exp $
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
" Last Change: 2010 May 28
" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
@ -58,7 +58,10 @@ function! GetErubyIndent(...)
let lnum = prevnonblank(v:lnum-1)
let line = getline(lnum)
let cline = getline(v:lnum)
if cline =~# '<%-\=\s*\%(}\|end\|else\|\%(ensure\|rescue\|elsif\|when\).\{-\}\)\s*\%(-\=%>\|$\)'
if cline =~# '^\s*<%-\=\s*\%(}\|end\|else\|\%(ensure\|rescue\|elsif\|when\).\{-\}\)\s*\%(-\=%>\|$\)'
let ind = ind - &sw
endif
if line =~# '\S\s*<%-\=\s*\%(}\|end\).\{-\}\s*\%(-\=%>\|$\)'
let ind = ind - &sw
endif
if line =~# '\%({\|\<do\)\%(\s*|[^|]*|\)\=\s*-\=%>'

4
runtime/indent/ruby.vim
View File

@ -1,7 +1,7 @@
" Vim indent file
" Language: Ruby
" Maintainer: Nikolai Weibull <now at bitwi.se>
" Info: $Id: ruby.vim,v 1.47 2008/06/29 04:18:43 tpope Exp $
" Last Change: 2009 Dec 17
" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
@ -178,7 +178,7 @@ function s:LineHasOpeningBrackets(lnum)
endfunction
function s:Match(lnum, regex)
let col = match(getline(a:lnum), a:regex) + 1
let col = match(getline(a:lnum), '\C'.a:regex) + 1
return col > 0 && !s:IsInStringOrComment(a:lnum, col) ? col : 0
endfunction