Skip to content

Commit

Permalink
Fix #23 - broken tag highlighting
Browse files Browse the repository at this point in the history
  • Loading branch information
darthdeus committed Oct 17, 2012
1 parent 68d9e12 commit 9cc1520
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions syntax/slim.vim
Expand Up @@ -20,6 +20,9 @@ let b:ruby_no_expensive = 1
" Include Ruby syntax highlighting " Include Ruby syntax highlighting
syn include @slimRubyTop syntax/ruby.vim syn include @slimRubyTop syntax/ruby.vim
unlet! b:current_syntax unlet! b:current_syntax
" Include Haml syntax highlighting
syn include @slimHaml syntax/haml.vim
unlet! b:current_syntax


syn match slimBegin "^\s*\(&[^= ]\)\@!" nextgroup=slimTag,slimClassChar,slimIdChar,slimRuby syn match slimBegin "^\s*\(&[^= ]\)\@!" nextgroup=slimTag,slimClassChar,slimIdChar,slimRuby


Expand Down Expand Up @@ -65,12 +68,7 @@ syn match slimComment /^\(\s*\)[/].*\(\n\1\s.*\)*/
syn match slimText /^\(\s*\)[`|'].*\(\n\1\s.*\)*/ syn match slimText /^\(\s*\)[`|'].*\(\n\1\s.*\)*/


syn match slimFilter /\s*\w\+:\s*/ contained syn match slimFilter /\s*\w\+:\s*/ contained
syn match slimJs /^\(\s*\)\<javascript:\>.*\(\n\1\s.*\)*/ contains=@htmlJavaScript,slimFilter
syn match slimCoffee /^\(\s*\)\<coffee:\>.*\(\n\1\s.*\)*/ contains=@slimCoffee,slimFilter
syn match slimHaml /^\(\s*\)\<haml:\>.*\(\n\1\s.*\)*/ contains=@slimHaml,slimFilter syn match slimHaml /^\(\s*\)\<haml:\>.*\(\n\1\s.*\)*/ contains=@slimHaml,slimFilter
syn match slimSass /^\(\s*\)\<sass:\>.*\(\n\1\s.*\)*/ contains=@slimSass,slimFilter
syn match slimScss /^\(\s*\)\<scss:\>.*\(\n\1\s.*\)*/ contains=@slimScss,slimFilter
syn match slimErb /^\(\s*\)\<erb:\>.*\(\n\1\s.*\)*/ contains=@slimErb,slimFilter


syn match slimIEConditional "\%(^\s*/\)\@<=\[\s*if\>[^]]*]" contained containedin=slimComment syn match slimIEConditional "\%(^\s*/\)\@<=\[\s*if\>[^]]*]" contained containedin=slimComment


Expand Down

0 comments on commit 9cc1520

Please sign in to comment.