VimPlug/emmet-vim-fork
1
0
Fork 0
forked from VimPlug/emmet-vim
Code Pull Requests Activity

fix #332

Browse Source
This commit is contained in:
Yasuhiro Matsumoto
2016-05-26 23:45:16 +09:00
parent 31d903d390
commit 6f4869796c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
autoload/emmet/lang/html.vim
View File

@@ -1,6 +1,7 @@
let s:bx = '{\%({[^}]*}\|"[^"]*"\|''[^'']*''\|[^${}]\+\|\$#\|\${\w\+}\|\$\+\)*}'
let s:mx = '\([+>]\|[<^]\+\)\{-}\s*' let s:mx = '\([+>]\|[<^]\+\)\{-}\s*'
\ .'\((*\)\{-}\s*' \ .'\((*\)\{-}\s*'
\ .'\([@#.]\{-}[a-zA-Z_\!][a-zA-Z0-9:_\!\-$]*\|{\%([^%$}]\+\|\$#\|\${\w\+}\|\$\+\)*}*[ \t\r\n}]*\|\[[^\]]\+\]\)' \ .'\([@#.]\{-}[a-zA-Z_\!][a-zA-Z0-9:_\!\-$]*\|' . s:bx . '*[ \t\r\n}]*\|\[[^\]]\+\]\)'
\ .'\(' \ .'\('
\ .'\%(' \ .'\%('
\ .'\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)' \ .'\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)'
@@ -8,7 +9,7 @@ let s:mx = '\([+>]\|[<^]\+\)\{-}\s*'
\ .'\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)' \ .'\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)'
\ .'\)*' \ .'\)*'
\ .'\)' \ .'\)'
\ .'\%(\({\%([^$}]\+\|\$#\|\${\w\+}\|\$\+\)*}\+\)\)\{0,1}' \ .'\%(\(' . s:bx . '\+\)\)\{0,1}'
\ .'\%(\(@-\{0,1}[0-9]*\)\{0,1}\*\([0-9]\+\)\)\{0,1}' \ .'\%(\(@-\{0,1}[0-9]*\)\{0,1}\*\([0-9]\+\)\)\{0,1}'
\ .'\(\%()\%(\(@-\{0,1}[0-9]*\)\{0,1}\*[0-9]\+\)\{0,1}\)*\)' \ .'\(\%()\%(\(@-\{0,1}[0-9]*\)\{0,1}\*[0-9]\+\)\{0,1}\)*\)'
@@ -144,7 +145,7 @@ function! emmet#lang#html#parseIntoTree(abbr, type) abort
let tag_name = pmap[pname] let tag_name = pmap[pname]
elseif !empty(pname) && index(inlineLevel, pname) > -1 elseif !empty(pname) && index(inlineLevel, pname) > -1
let tag_name = 'span' let tag_name = 'span'
elseif len(parent.child) == 0 elseif len(parent.child) == 0 || len(custom) == 0
let tag_name = 'div' let tag_name = 'div'
else else
let tag_name = custom let tag_name = custom