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

Fix parseTag

Browse Source
This commit is contained in:
mattn
2013-04-06 22:31:53 +09:00
parent 39a9986627
commit f86c34fbe8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/zencoding/lang/html.vim
View File

@@ -58,7 +58,7 @@ function! zencoding#lang#html#parseIntoTree(abbr, type)
endif endif
let abbr = rabbr let abbr = rabbr
let root = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'important': 0 } let root = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'important': 0, 'attrs_order': ['id', 'class'] }
let parent = root let parent = root
let last = root let last = root
let pos = [] let pos = []
@@ -419,6 +419,7 @@ function! zencoding#lang#html#imageSize()
endif endif
let current.attr.width = width let current.attr.width = width
let current.attr.height = height let current.attr.height = height
let current.attrs_order += ['width', 'height']
let html = substitute(zencoding#toString(current, 'html', 1), '\n', '', '') let html = substitute(zencoding#toString(current, 'html', 1), '\n', '', '')
call zencoding#util#setContent(img_region, html) call zencoding#util#setContent(img_region, html)
endfunction endfunction
@@ -452,7 +453,7 @@ function! zencoding#lang#html#encodeImage()
endfunction endfunction
function! zencoding#lang#html#parseTag(tag) function! zencoding#lang#html#parseTag(tag)
let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0 } let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'attrs_order': ['id', 'class'] }
let mx = '<\([a-zA-Z][a-zA-Z0-9]*\)\(\%(\s[a-zA-Z][a-zA-Z0-9]\+=\%([^"'' \t]\+\|"[^"]\{-}"\|''[^'']\{-}''\)\s*\)*\)\(/\{0,1}\)>' let mx = '<\([a-zA-Z][a-zA-Z0-9]*\)\(\%(\s[a-zA-Z][a-zA-Z0-9]\+=\%([^"'' \t]\+\|"[^"]\{-}"\|''[^'']\{-}''\)\s*\)*\)\(/\{0,1}\)>'
let match = matchstr(a:tag, mx) let match = matchstr(a:tag, mx)
let current.name = substitute(match, mx, '\1', 'i') let current.name = substitute(match, mx, '\1', 'i')
@@ -469,6 +470,7 @@ function! zencoding#lang#html#parseTag(tag)
let current.attr[name] = value let current.attr[name] = value
let attrs = attrs[stridx(attrs, match) + len(match):] let attrs = attrs[stridx(attrs, match) + len(match):]
endwhile endwhile
let current.attrs_order = keys(current.attr)
return current return current
endfunction endfunction