summaryrefslogtreecommitdiff
path: root/runtime/syntax/haml.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-08-09 17:55:22 +0000
committerBram Moolenaar <Bram@vim.org>2008-08-09 17:55:22 +0000
commited39e1d53cc4916c2390aea635cd8419497c1460 (patch)
tree55d468c93579ad2607d56eade9fd6b685cd00c44 /runtime/syntax/haml.vim
parenta6404a4e100ebe2081bd2678166604f402330143 (diff)
downloadvim-git-ed39e1d53cc4916c2390aea635cd8419497c1460.tar.gz
updated for version 7.2-000v7.2.000v7.2
Diffstat (limited to 'runtime/syntax/haml.vim')
-rw-r--r--runtime/syntax/haml.vim6
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/syntax/haml.vim b/runtime/syntax/haml.vim
index 8b22d8c48..395600a70 100644
--- a/runtime/syntax/haml.vim
+++ b/runtime/syntax/haml.vim
@@ -42,11 +42,15 @@ syn region hamlRuby matchgroup=hamlRubyChar start="-" end="$" contai
syn match hamlPlainChar "\\" contained
syn region hamlInterpolatable matchgroup=hamlInterpolatableChar start="==" end="$" keepend contained contains=hamlInterpolation
syn region hamlInterpolation matchgroup=hamlInterpolationDelimiter start="#{" end="}" contained contains=@hamlRubyTop
+syn region hamlErbInterpolation matchgroup=hamlInterpolationDelimiter start="<%[=-]\=" end="-\=%>" contained contains=@hamlRubyTop
syn match hamlHelper "\<action_view?\|\.\@<!\<\%(flatten\|open\|puts\)" contained containedin=@hamlEmbeddedRuby,@hamlRubyTop,rubyInterpolation
syn keyword hamlHelper capture_haml find_and_preserve html_attrs init_haml_helpers list_of preced preserve succeed surround tab_down tab_up page_class contained containedin=@hamlEmbeddedRuby,@hamlRubyTop,rubyInterpolation
-syn region hamlPlainFilter matchgroup=hamlFilter start="^\z(\s*\):\%(plain\|preserve\|erb\|redcloth\|textile\|markdown\)\s*$" end="^\%(\z1 \)\@!" contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlComment,@htmlTop
+syn cluster hamlHtmlTop contains=@htmlTop,htmlBold,htmlItalic,htmlUnderline
+syn region hamlPlainFilter matchgroup=hamlFilter start="^\z(\s*\):\%(plain\|preserve\|erb\|redcloth\|textile\|markdown\)\s*$" end="^\%(\z1 \)\@!" contains=@hamlHtmlTop,rubyInterpolation
+syn region hamlEscapedFilter matchgroup=hamlFilter start="^\z(\s*\):\%(escaped\)\s*$" end="^\%(\z1 \)\@!" contains=rubyInterpolation
+syn region hamlErbFilter matchgroup=hamlFilter start="^\z(\s*\):erb\s*$" end="^\%(\z1 \)\@!" contains=@hamlHtmlTop,hamlErbInterpolation
syn region hamlRubyFilter matchgroup=hamlFilter start="^\z(\s*\):ruby\s*$" end="^\%(\z1 \)\@!" contains=@hamlRubyTop
syn region hamlSassFilter matchgroup=hamlFilter start="^\z(\s*\):sass\s*$" end="^\%(\z1 \)\@!" contains=@hamlSassTop