diff --git a/syntax/vue-html.vim b/syntax/vue-html.vim index e0cecb6..1294740 100644 --- a/syntax/vue-html.vim +++ b/syntax/vue-html.vim @@ -7,15 +7,15 @@ syntax match VueValue contains=VueInject contained '\v\"\zs[^"]*\ze\"' syntax match VueInject contained '\v\$\w*' syntax region VueExpression - \ containedin=vueTemplate,vueValue,htmlString + \ containedin=html.* \ matchgroup=VueBrace + \ transparent \ start="{{" \ end="}}" syntax region VueExpression - \ containedin=htmlItalic + \ containedin=vueTemplate,vueValue,htmlString \ matchgroup=VueBrace - \ transparent \ start="{{" \ end="}}" diff --git a/syntax/vue.vim b/syntax/vue.vim index e910527..329f3c7 100644 --- a/syntax/vue.vim +++ b/syntax/vue.vim @@ -41,9 +41,10 @@ endfunction function! s:LoadDefaultSyntax(group, type) unlet! b:current_syntax - execute 'syntax include '.a:group.' $VIMRUNTIME/syntax/'.a:type.'.vim' - execute 'silent! syntax include '.a:group.' $VIM/vimfiles/syntax/'.a:type.'.vim' - execute 'silent! syntax include '.a:group.' $HOME/.vim/syntax/'.a:type.'.vim' + let syntaxPaths = ['$VIMRUNTIME', '$VIM/vimfiles', '$HOME/.vim'] + for path in syntaxPaths + execute 'silent! syntax include '.a:group.' '.path.'/syntax/'.a:type.'.vim' + endfor endfunction function! s:LoadFullSyntax(group, type)