Skip to content

Commit d68aa6d

Browse files
committed
More 'define' patterns
1 parent f1d2ff3 commit d68aa6d

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

autoload/rails.vim

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ function! s:lastopeningline(pattern,limit,start)
246246
endfunction
247247

248248
function! s:readable_define_pattern() dict abort
249-
if self.name() =~ '\.yml$'
249+
if self.name() =~ '\.yml\%(\.example\)\=$'
250250
return '^\%(\h\k*:\)\@='
251251
endif
252252
let define = '^\s*def\s\+\(self\.\)\='
@@ -256,6 +256,12 @@ function! s:readable_define_pattern() dict abort
256256
if self.name() =~# '/schema\.rb$'
257257
let define .= "\\\|^\\s*create_table\\s\\+[:'\"]"
258258
endif
259+
if self.name() =~# '/\.erb$'
260+
let define .= '\|\<id=["'']\='
261+
endif
262+
if self.name() =~# '/\.haml$'
263+
let define .= '\|^\s*\%(%\w*\)\=\%(\.[[:alnum:]_-]\+\)*#'
264+
endif
259265
if self.type_name('test')
260266
let define .= '\|^\s*test\s*[''"]'
261267
endif
@@ -4803,17 +4809,21 @@ function! rails#buffer_setup() abort
48034809
elseif ft =~# 'yaml\>' || fnamemodify(self.name(),':e') ==# 'yml'
48044810
call self.setvar('&define',self.define_pattern())
48054811
elseif ft =~# '^eruby\>'
4812+
call self.setvar('&define',self.define_pattern())
48064813
if exists("g:loaded_ragtag")
48074814
call self.setvar('ragtag_stylesheet_link_tag', "<%= stylesheet_link_tag '\r' %>")
48084815
call self.setvar('ragtag_javascript_include_tag', "<%= javascript_include_tag '\r' %>")
48094816
call self.setvar('ragtag_doctype_index', 10)
48104817
endif
48114818
elseif ft =~# '^haml\>'
4819+
call self.setvar('&define',self.define_pattern())
48124820
if exists("g:loaded_ragtag")
48134821
call self.setvar('ragtag_stylesheet_link_tag', "= stylesheet_link_tag '\r'")
48144822
call self.setvar('ragtag_javascript_include_tag', "= javascript_include_tag '\r'")
48154823
call self.setvar('ragtag_doctype_index', 10)
48164824
endif
4825+
elseif ft =~# 'html\>'
4826+
call self.setvar('&define', '\<id=["'']\=')
48174827
endif
48184828
if ft =~# '^eruby\>' || ft =~# '^yaml\>'
48194829
if exists("g:loaded_surround")

0 commit comments

Comments
 (0)