VimPlug/vim-vue
1
0
Fork 0
mirror of https://github.com/posva/vim-vue.git synced 2025-12-09 10:54:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Highlight the surrounding tags correctly

Browse Source 
Removes omit_attr argument from s:register_language(), because html,
javascript, and css regions were the only ones that used it, and they
are now handled by syntax/html.vim.

`runtime! syntax/html.vim` also has the advantage that we can hook into
the html syntax, meaning that we can add stuff like highlighting
javascript expressions inside vue directives, and add our own html
attributes.

Also removes the start of line limitation introduced in previous commit
This commit is contained in:
Adriaan Zonnenberg
2017-03-25 22:58:43 +01:00
parent 32d2c0a943
commit b5c8e6f330
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
syntax/vue.vim
View File

@@ -6,6 +6,9 @@ if exists("b:current_syntax")
finish
endif
runtime! syntax/html.vim
unlet! b:current_syntax
""
" Get the pattern for a HTML {name} attribute with {value}.
function! s:attr(name, value)
@@ -19,44 +22,36 @@ function! s:syntax_available(language)
endfunction
""
" Register {language} for a given {tag}.
" If [omit_attr] is 1, the 'lang' attribute may be omitted.
" If [attr_override] is given and not empty, it will be used for the attribute pattern.
" Register {language} for a given {tag}. If [attr_override] is given and not
" empty, it will be used for the attribute pattern.
function! s:register_language(language, tag, ...)
let omit_attr = a:0 ? a:1 : 0
let attr_override = a:0 >= 2 ? a:2 : ''
if omit_attr
let start_pattern = ''
else
let start_pattern = ' \_[^>]*'
let start_pattern .= !empty(attr_override) ? attr_override : s:attr('lang', a:language)
endif
let attr_override = a:0 ? a:1 : ''
let attr = !empty(attr_override) ? attr_override : s:attr('lang', a:language)
if s:syntax_available(a:language)
execute 'syntax include @' . a:language . ' syntax/' . a:language . '.vim'
unlet! b:current_syntax
execute 'syntax region vue_' . a:language
\ 'keepend'
\ 'matchgroup=Delimiter'
\ 'start=/^<' . a:tag . start_pattern . '\_[^>]*>/'
\ 'end="^</' . a:tag . '>"'
\ 'contains=@' . a:language
\ 'start=/<' . a:tag . ' \_[^>]*' . attr . '\_[^>]*>/'
\ 'end="</' . a:tag . '>"me=s-1'
\ 'contains=@' . a:language . ',vueSurroundingTag'
\ 'fold'
endif
endfunction
call s:register_language('html', 'template', 1)
call s:register_language('pug', 'template', 0, s:attr('lang', '\%(pug\|jade\)'))
call s:register_language('pug', 'template', s:attr('lang', '\%(pug\|jade\)'))
call s:register_language('slm', 'template')
call s:register_language('handlebars', 'template')
call s:register_language('javascript', 'script', 1)
call s:register_language('typescript', 'script', 0, '\%(lang=\("\|''\)[^\1]*\(ts\|typescript\)[^\1]*\1\|ts\)')
call s:register_language('typescript', 'script', '\%(lang=\("\|''\)[^\1]*\(ts\|typescript\)[^\1]*\1\|ts\)')
call s:register_language('coffee', 'script')
call s:register_language('css', 'style', 1)
call s:register_language('stylus', 'style')
call s:register_language('sass', 'style')
call s:register_language('scss', 'style')
call s:register_language('less', 'style')
syn region vueSurroundingTag contained start=+<\(script\|style\|template\)+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
syn keyword htmlSpecialTagName contained template
syn keyword htmlArg contained scoped ts
let b:current_syntax = "vue"