vim: runtime/indent/eruby.vim annotate

annotate runtime/indent/eruby.vim @ 11518:63b0b7b79b25

Update runtime files. commit https://github.com/vim/vim/commit/3ec574f2b549f456f664f689d6da36dc5719aeb9 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jun 13 18:12:01 2017 +0200 Update runtime files. Includes changing &sw to shiftwidth() for all indent scripts.

author	Christian Brabandt <cb@256bit.org>
date	Tue, 13 Jun 2017 18:15:04 +0200
parents	43efa4f5a8ea
children	f0f06837a699

rev	line source
532 7052f11a3dc9 updated for version 7.0150 vimboss parents: diff changeset	1 " Vim indent file
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	2 " Language: eRuby
2225 dd5c1983e355 Runtime file updates. Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	3 " Maintainer: Tim Pope <vimNOSPAM@tpope.org>
4869 a5352e73dc00 Update runtime files. Bram Moolenaar <bram@vim.org> parents: 2225 diff changeset	4 " URL: https://github.com/vim-ruby/vim-ruby
831 f24a95dae8ee updated for version 7.0d05 vimboss parents: 557 diff changeset	5 " Release Coordinator: Doug Kearns <dougkearns@gmail.com>
532 7052f11a3dc9 updated for version 7.0150 vimboss parents: diff changeset	6
7052f11a3dc9 updated for version 7.0150 vimboss parents: diff changeset	7 if exists("b:did_indent")
7052f11a3dc9 updated for version 7.0150 vimboss parents: diff changeset	8 finish
7052f11a3dc9 updated for version 7.0150 vimboss parents: diff changeset	9 endif
7052f11a3dc9 updated for version 7.0150 vimboss parents: diff changeset	10
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	11 runtime! indent/ruby.vim
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	12 unlet! b:did_indent
1668 0b796e045c42 updated for version 7.2b-000 vimboss parents: 1620 diff changeset	13 setlocal indentexpr=
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	14
1200 f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	15 if exists("b:eruby_subtype")
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	16 exe "runtime! indent/".b:eruby_subtype.".vim"
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	17 else
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	18 runtime! indent/html.vim
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	19 endif
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	20 unlet! b:did_indent
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	21
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	22 " Force HTML indent to not keep state.
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	23 let b:html_indent_usestate = 0
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	24
1200 f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	25 if &l:indentexpr == ''
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	26 if &l:cindent
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	27 let &l:indentexpr = 'cindent(v:lnum)'
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	28 else
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	29 let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	30 endif
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	31 endif
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	32 let b:eruby_subtype_indentexpr = &l:indentexpr
f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	33
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	34 let b:did_indent = 1
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	35
1200 f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	36 setlocal indentexpr=GetErubyIndent()
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	37 setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=else,=elsif,=rescue,=ensure,=when
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	38
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	39 " Only define the function once.
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	40 if exists("*GetErubyIndent")
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	41 finish
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	42 endif
831 f24a95dae8ee updated for version 7.0d05 vimboss parents: 557 diff changeset	43
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	44 " this file uses line continuations
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	45 let s:cpo_sav = &cpo
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	46 set cpo&vim
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	47
1668 0b796e045c42 updated for version 7.2b-000 vimboss parents: 1620 diff changeset	48 function! GetErubyIndent(...)
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	49 " The value of a single shift-width
11518 63b0b7b79b25 Update runtime files. Christian Brabandt <cb@256bit.org> parents: 10048 diff changeset	50 let sw = shiftwidth()
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	51
1668 0b796e045c42 updated for version 7.2b-000 vimboss parents: 1620 diff changeset	52 if a:0 && a:1 == '.'
0b796e045c42 updated for version 7.2b-000 vimboss parents: 1620 diff changeset	53 let v:lnum = line('.')
0b796e045c42 updated for version 7.2b-000 vimboss parents: 1620 diff changeset	54 elseif a:0 && a:1 =~ '^\d'
0b796e045c42 updated for version 7.2b-000 vimboss parents: 1620 diff changeset	55 let v:lnum = a:1
0b796e045c42 updated for version 7.2b-000 vimboss parents: 1620 diff changeset	56 endif
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	57 let vcol = col('.')
1200 f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	58 call cursor(v:lnum,1)
1620 73fe8baea242 updated for version 7.2a vimboss parents: 1200 diff changeset	59 let inruby = searchpair('<%','','%>','W')
1200 f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	60 call cursor(v:lnum,vcol)
4869 a5352e73dc00 Update runtime files. Bram Moolenaar <bram@vim.org> parents: 2225 diff changeset	61 if inruby && getline(v:lnum) !~ '^<%\\|^\s*[-=]\=%>'
a5352e73dc00 Update runtime files. Bram Moolenaar <bram@vim.org> parents: 2225 diff changeset	62 let ind = GetRubyIndent(v:lnum)
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	63 else
1200 f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	64 exe "let ind = ".b:eruby_subtype_indentexpr
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	65
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	66 " Workaround for Andy Wokula's HTML indent. This should be removed after
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	67 " some time, since the newest version is fixed in a different way.
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	68 if b:eruby_subtype_indentexpr =~# '^HtmlIndent('
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	69 \ && exists('b:indent')
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	70 \ && type(b:indent) == type({})
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	71 \ && has_key(b:indent, 'lnum')
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	72 " Force HTML indent to not keep state
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	73 let b:indent.lnum = -1
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	74 endif
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	75 endif
1200 f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	76 let lnum = prevnonblank(v:lnum-1)
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	77 let line = getline(lnum)
1200 f58cb9bf1260 updated for version 7.1b vimboss parents: 1121 diff changeset	78 let cline = getline(v:lnum)
4869 a5352e73dc00 Update runtime files. Bram Moolenaar <bram@vim.org> parents: 2225 diff changeset	79 if cline =~# '^\s<%[-=]\=\s\%(}\\|end\\|else\\|\%(ensure\\|rescue\\|elsif\\|when\).\{-\}\)\s*\%([-=]\=%>\\|$\)'
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	80 let ind = ind - sw
2225 dd5c1983e355 Runtime file updates. Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	81 endif
4869 a5352e73dc00 Update runtime files. Bram Moolenaar <bram@vim.org> parents: 2225 diff changeset	82 if line =~# '\S\s<%[-=]\=\s\%(}\\|end\).\{-\}\s*\%([-=]\=%>\\|$\)'
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	83 let ind = ind - sw
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	84 endif
4869 a5352e73dc00 Update runtime files. Bram Moolenaar <bram@vim.org> parents: 2225 diff changeset	85 if line =~# '\%({\\|\<do\)\%(\s\|[^\|]\|\)\=\s*[-=]\=%>'
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	86 let ind = ind + sw
4869 a5352e73dc00 Update runtime files. Bram Moolenaar <bram@vim.org> parents: 2225 diff changeset	87 elseif line =~# '<%[-=]\=\s\%(module\\|class\\|def\\|if\\|for\\|while\\|until\\|else\\|elsif\\|case\\|when\\|unless\\|begin\\|ensure\\|rescue\)\>.%>'
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	88 let ind = ind + sw
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	89 endif
1668 0b796e045c42 updated for version 7.2b-000 vimboss parents: 1620 diff changeset	90 if line =~# '^\s<%[=#-]\=\s$' && cline !~# '^\s*end\>'
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	91 let ind = ind + sw
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	92 endif
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	93 if line !~# '^\s<%' && line =~# '%>\s$' && line !~# '^\s*end\>'
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	94 let ind = ind - sw
4869 a5352e73dc00 Update runtime files. Bram Moolenaar <bram@vim.org> parents: 2225 diff changeset	95 endif
a5352e73dc00 Update runtime files. Bram Moolenaar <bram@vim.org> parents: 2225 diff changeset	96 if cline =~# '^\s[-=]\=%>\s$'
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	97 let ind = ind - sw
1121 e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	98 endif
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	99 return ind
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	100 endfunction
e63691e7c504 updated for version 7.1a vimboss parents: 831 diff changeset	101
10048 43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	102 let &cpo = s:cpo_sav
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	103 unlet! s:cpo_sav
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Christian Brabandt <cb@256bit.org> parents: 4869 diff changeset	104
1620 73fe8baea242 updated for version 7.2a vimboss parents: 1200 diff changeset	105 " vim:set sw=2 sts=2 ts=8 noet:

Mercurial > vim

annotate runtime/indent/eruby.vim @ 11518:63b0b7b79b25