diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-05-05 17:54:07 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-05-05 17:54:07 +0000 |
| commit | 9964e468c0209f6b8286e0b08109817c845a3079 (patch) | |
| tree | 3c53288cff0d4c2e32169d8eb4cd53cc343ad0bc /runtime/indent/eruby.vim | |
| parent | d5ab34bd5ecc748d5502f149c476968e5ec2b7c9 (diff) | |
updated for version 7.1a
Diffstat (limited to 'runtime/indent/eruby.vim')
| -rw-r--r-- | runtime/indent/eruby.vim | 51 |
1 files changed, 47 insertions, 4 deletions
diff --git a/runtime/indent/eruby.vim b/runtime/indent/eruby.vim index ab950b6599..d621bfa08b 100644 --- a/runtime/indent/eruby.vim +++ b/runtime/indent/eruby.vim @@ -1,16 +1,59 @@ " Vim indent file -" Language: Ruby -" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Language: eRuby +" Maintainer: Tim Pope <vimNOSPAM@tpope.info> " Info: $Id$ " URL: http://vim-ruby.rubyforge.org " Anon CVS: See above site " Release Coordinator: Doug Kearns <dougkearns@gmail.com> -" Only load this indent file when no other was loaded. if exists("b:did_indent") finish endif +runtime! indent/ruby.vim +unlet! b:did_indent + runtime! indent/html.vim +unlet! b:did_indent + +let b:did_indent = 1 + +setlocal indentexpr=GetErubyIndent(v:lnum) +setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=else,=elsif,=rescue,=ensure,=when + +" Only define the function once. +if exists("*GetErubyIndent") + finish +endif + +function! GetErubyIndent(lnum) + let vcol = col('.') + call cursor(a:lnum,1) + let inruby = searchpair('<%','','%>') + call cursor(a:lnum,vcol) + if inruby && getline(a:lnum) !~ '^<%' + let ind = GetRubyIndent() + else + let ind = HtmlIndentGet(a:lnum) + endif + let lnum = prevnonblank(a:lnum-1) + let line = getline(lnum) + let cline = getline(a:lnum) + if cline =~# '<%\s*\%(end\|else\|\%(ensure\|rescue\|elsif\|when\).\{-\}\)\s*\%(-\=%>\|$\)' + let ind = ind - &sw + endif + if line =~# '\<do\%(\s*|[^|]*|\)\=\s*-\=%>' + let ind = ind + &sw + elseif line =~# '<%\s*\%(module\|class\|def\|if\|for\|while\|until\|else\|elsif\|case\|when\|unless\|begin\|ensure\|rescue\)\>.*%>' + let ind = ind + &sw + endif + if line =~# '^\s*<%[=#]\=\s*$' && cline !~# '^\s*end\>' + let ind = ind + &sw + endif + if cline =~# '^\s*-\=%>\s*$' + let ind = ind - &sw + endif + return ind +endfunction -" vim: nowrap sw=2 sts=2 ts=8 ff=unix: +" vim:set sw=2 sts=2 ts=8 noet ff=unix: |