From d02023cd7aa460d1c6e808854f941c4c5f61ca72 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Tue, 18 Jun 2019 03:56:28 +0900
Subject: [PATCH] Fix unit expanding

---
 autoload/emmet/lang/css.vim | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/autoload/emmet/lang/css.vim b/autoload/emmet/lang/css.vim
index 3a9ca93..c615e2c 100644
--- a/autoload/emmet/lang/css.vim
+++ b/autoload/emmet/lang/css.vim
@@ -54,32 +54,30 @@ function! emmet#lang#css#parseIntoTree(abbr, type) abort
             if token =~# '^[z]'
               " TODO
               let value .= substitute(v, '[^0-9.]*$', '', '')
+            elseif v =~# 'em$'
+              let value .= v
+            elseif v =~# 'ex$'
+              let value .= v
+            elseif v =~# 'vh$'
+              let value .= v
+            elseif v =~# 'vw$'
+              let value .= v
+            elseif v =~# 'rem$'
+              let value .= v
+            elseif v ==# 'auto'
+              let value .= v
             elseif v =~# 'p$'
               let value .= substitute(v, 'p$', '%', '')
             elseif v =~# '%$'
               let value .= v
             elseif v =~# 'e$'
               let value .= substitute(v, 'e$', 'em', '')
-            elseif v =~# 'em$'
-              let value .= v
-            elseif v =~# 'ex$'
-              let value .= v
             elseif v =~# 'x$'
               let value .= substitute(v, 'x$', 'ex', '')
-            elseif v =~# 'em$'
-              let value .= v
-            elseif v =~# 'vh$'
-              let value .= v
-            elseif v =~# 'vw$'
-              let value .= v
             elseif v =~# 're$'
               let value .= substitute(v, 're$', 'rem', '')
-            elseif v =~# 'rem$'
-              let value .= v
             elseif v =~# '\.'
               let value .= v . 'em'
-            elseif v ==# 'auto'
-              let value .= v
             elseif v ==# '0'
               let value .= '0'
             else