aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/haml.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-04-29 01:41:29 +0200
committerGitHub <noreply@github.com>2017-04-29 01:41:29 +0200
commit9f6d693e263b617cd1a1772e42911cd5a0b1675b (patch)
tree593d3c9d968be92bc1ed8a445e6856079ef546ed /runtime/syntax/haml.vim
parent59be0b42806c39131f76f89c554f0a24e82514a8 (diff)
parent53419673154a98b705cfa80590099a247cc9df49 (diff)
downloadrneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.tar.gz
rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.tar.bz2
rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.zip
Merge #6613 from justinmk/vim-patches
Diffstat (limited to 'runtime/syntax/haml.vim')
-rw-r--r--runtime/syntax/haml.vim4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/syntax/haml.vim b/runtime/syntax/haml.vim
index bf7a073633..5369695c22 100644
--- a/runtime/syntax/haml.vim
+++ b/runtime/syntax/haml.vim
@@ -2,7 +2,7 @@
" Language: Haml
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
" Filenames: *.haml
-" Last Change: 2010 Aug 09
+" Last Change: 2016 Aug 29
if exists("b:current_syntax")
finish
@@ -67,7 +67,7 @@ syn region hamlJavascriptFilter matchgroup=hamlFilter start="^\z(\s*\):javascri
syn region hamlCSSFilter matchgroup=hamlFilter start="^\z(\s*\):css\s*$" end="^\%(\z1 \| *$\)\@!" contains=@htmlCss,hamlInterpolation keepend
syn region hamlSassFilter matchgroup=hamlFilter start="^\z(\s*\):sass\s*$" end="^\%(\z1 \| *$\)\@!" contains=@hamlSassTop
-syn region hamlJavascriptBlock start="^\z(\s*\)%script" nextgroup=@hamlComponent,hamlError end="^\%(\z1 \| *$\)\@!" contains=@hamlTop,@htmlJavaScript keepend
+syn region hamlJavascriptBlock start="^\z(\s*\)%script\%((type=[\"']text/javascript[\"'])\)\=\s*$" nextgroup=@hamlComponent,hamlError end="^\%(\z1 \| *$\)\@!" contains=@hamlTop,@htmlJavaScript keepend
syn region hamlCssBlock start="^\z(\s*\)%style" nextgroup=@hamlComponent,hamlError end="^\%(\z1 \| *$\)\@!" contains=@hamlTop,@htmlCss keepend
syn match hamlError "\$" contained