Fix unit expanding

This commit is contained in:
Yasuhiro Matsumoto
2019-06-18 03:22:31 +09:00
parent 192d22fe69
commit 47c28892d9

View File

@@ -39,40 +39,46 @@ function! emmet#lang#css#parseIntoTree(abbr, type) abort
let token = token[1:] let token = token[1:]
endif endif
let value = '' let value = ''
for v in split(prop[2], '\a\+\zs') for vt in split(prop[2], '\a\+\zs')
if len(value) > 0 let ut = matchstr(vt, '[a-z]\+$')
let value .= ' ' for v in split(vt, '\d\zs-')
endif if len(value) > 0
if token =~# '^[z]' let value .= ' '
" TODO endif
let value .= substitute(v, '[^0-9.]*$', '', '') if v !~ '[a-z]\+$'
elseif v =~# 'p$' let v .= ut
let value .= substitute(v, 'p$', '%', '') endif
elseif v =~# '%$' if token =~# '^[z]'
let value .= v " TODO
elseif v =~# 'e$' let value .= substitute(v, '[^0-9.]*$', '', '')
let value .= substitute(v, 'e$', 'em', '') elseif v =~# 'p$'
elseif v =~# 'x$' let value .= substitute(v, 'p$', '%', '')
let value .= substitute(v, 'x$', 'ex', '') elseif v =~# '%$'
elseif v =~# 'em$' let value .= v
let value .= v elseif v =~# 'e$'
elseif v =~# 'vh$' let value .= substitute(v, 'e$', 'em', '')
let value .= v elseif v =~# 'x$'
elseif v =~# 'vw$' let value .= substitute(v, 'x$', 'ex', '')
let value .= v elseif v =~# 'em$'
elseif v =~# 're$' let value .= v
let value .= substitute(v, 're$', 'rem', '') elseif v =~# 'vh$'
elseif v =~# 'rem$' let value .= v
let value .= v elseif v =~# 'vw$'
elseif v =~# '\.' let value .= v
let value .= v . 'em' elseif v =~# 're$'
elseif v ==# 'auto' let value .= substitute(v, 're$', 'rem', '')
let value .= v elseif v =~# 'rem$'
elseif v ==# '0' let value .= v
let value .= '0' elseif v =~# '\.'
else let value .= v . 'em'
let value .= v . 'px' elseif v ==# 'auto'
endif let value .= v
elseif v ==# '0'
let value .= '0'
else
let value .= v . 'px'
endif
endfor
endfor endfor
endif endif