Skip to content

Commit 0a21d69

Browse files
committed
Clean up repetition in view highlighting
1 parent 5ed17a6 commit 0a21d69

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

autoload/rails.vim

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3955,29 +3955,27 @@ function! rails#buffer_syntax() abort
39553955
endif
39563956

39573957
elseif (&syntax =~# '^eruby\>' || &syntax == 'haml') && &syntax !~# 'yaml'
3958-
let containedin = 'contained containedin=@'.&syntax.'RailsRegions'
3959-
let group = matchstr(&syntax, '^\w\+')
3958+
let containedin = 'contained containedin=@'.matchstr(&syntax, '^\w\+').'RailsRegions'
39603959
syn case match
39613960
if !empty(special)
3962-
exe 'syn match '.group.'RailsMethod "\<\%('.join(special, '\|').'\)"' containedin
3961+
exe 'syn match rubyRailsMethod "\<\%('.join(special, '\|').'\)"' containedin
39633962
endif
39643963
if !empty(regular)
3965-
exe 'syn keyword '.group.'RailsMethod '.join(regular, ' ') containedin
3964+
exe 'syn keyword rubyRailsMethod '.join(regular, ' ') containedin
39663965
endif
3967-
if group == 'haml'
3966+
if &syntax == 'haml'
39683967
exe 'syn cluster hamlRailsRegions contains=hamlRubyCodeIncluded,hamlRubyCode,hamlRubyHash,@hamlEmbeddedRuby,rubyInterpolation'
39693968
else
39703969
exe 'syn cluster erubyRailsRegions contains=erubyOneLiner,erubyBlock,erubyExpression,rubyInterpolation'
39713970
endif
3972-
exe 'syn keyword rubyRailsHelperMethod' s:helpermethods() 'contained containedin=@'.group.'RailsRegions'
3973-
exe 'syn match rubyRailsHelperMethod "\<select\>\%(\s*{\|\s*do\>\|\s*(\=\s*&\)\@!" contained containedin=@'.group.'RailsRegions'
3974-
exe 'syn match rubyRailsHelperMethod "\<\%(content_for\w\@!?\=\|current_page?\)" contained containedin=@'.group.'RailsRegions'
3975-
exe 'syn keyword rubyRailsMethod logger url_for polymorphic_path polymorphic_url edit_polymorphic_path edit_polymorphic_url new_polymorphic_path new_polymorphic_url contained containedin=@'.group.'RailsRegions'
3976-
exe 'syn match rubyRailsViewMethod "\.\@<!\<\(h\|html_escape\|u\|url_encode\)\>" contained containedin=@'.group.'RailsRegions'
3971+
exe 'syn keyword rubyRailsHelperMethod' s:helpermethods() containedin
3972+
exe 'syn match rubyRailsHelperMethod "\<select\>\%(\s*{\|\s*do\>\|\s*(\=\s*&\)\@!"' containedin
3973+
exe 'syn match rubyRailsHelperMethod "\<\%(content_for\w\@!?\=\|current_page?\)"' containedin
3974+
exe 'syn keyword rubyRailsMethod logger url_for polymorphic_path polymorphic_url edit_polymorphic_path edit_polymorphic_url new_polymorphic_path new_polymorphic_url' containedin
3975+
exe 'syn match rubyRailsViewMethod "\.\@<!\<\(h\|html_escape\|u\|url_encode\)\>"' containedin
39773976
if buffer.type_name('view-partial')
3978-
exe 'syn keyword rubyRailsMethod local_assigns contained containedin=@'.group.'RailsRegions'
3977+
exe 'syn keyword rubyRailsMethod local_assigns' containedin
39793978
endif
3980-
exe 'syn keyword rubyRailsRenderMethod render contained containedin=@'.group.'RailsRegions'
39813979
endif
39823980

39833981
if &syntax =~# '^\%(javascript\|coffee\|css\|scss\|sass\)'

0 commit comments

Comments
 (0)