From f36d6f402577c87a69a9d569cd2b9df663657825 Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Sat, 25 Jul 2015 10:49:40 +0900
Subject: [PATCH] exapnd $# of attribute in block element. close #282

---
 autoload/emmet.vim           | 2 +-
 autoload/emmet/lang/html.vim | 4 +++-
 unittest.vim                 | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/autoload/emmet.vim b/autoload/emmet.vim
index b22114c..4e70773 100644
--- a/autoload/emmet.vim
+++ b/autoload/emmet.vim
@@ -475,7 +475,7 @@ function! emmet#expandAbbr(mode, abbr) range abort
     endif
     if leader =~# '\*'
       let query = substitute(leader, '*', '*' . (a:lastline - a:firstline + 1), '')
-      if query !~# '}\s*$'
+      if query !~# '}\s*$' && query !~# '\$#'
         let query .= '>{$#}'
       endif
       if emmet#useFilter(filters, '/')
diff --git a/autoload/emmet/lang/html.vim b/autoload/emmet/lang/html.vim
index 9dc90e5..41558d2 100644
--- a/autoload/emmet/lang/html.vim
+++ b/autoload/emmet/lang/html.vim
@@ -487,7 +487,9 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
       endif
       let text = substitute(text, '\${nr}', "\n", 'g')
       let text = substitute(text, '\\\$', '$', 'g')
-      let str = substitute(str, '\("\zs$#\ze"\|\s\zs\$#"\|"\$#\ze\s\)', text, 'g')
+      if text != ''
+        let str = substitute(str, '\("\zs$#\ze"\|\s\zs\$#"\|"\$#\ze\s\)', text, 'g')
+      endif
     endif
     let str .= text
     let nc = len(current.child)
diff --git a/unittest.vim b/unittest.vim
index 51baba2..08948c3 100644
--- a/unittest.vim
+++ b/unittest.vim
@@ -491,6 +491,10 @@ finish
           'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,input[type=input value=$#]*\\<cr>$$$$",
           'result': "<input type=\"input\" value=\"test1\">\n<input type=\"input\" value=\"test2\">\n<input type=\"input\" value=\"test3\">",
         },
+        {
+          'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,div[id=$#]*\\<cr>$$$$",
+          'result': "<div id=\"test1\"></div>\n<div id=\"test2\"></div>\n<div id=\"test3\"></div>",
+        },
         {
           'query': "div#id-$*5>div#id2-$",
           'result': "<div id=\"id-1\">\n\t<div id=\"id2-1\"></div>\n</div>\n<div id=\"id-2\">\n\t<div id=\"id2-2\"></div>\n</div>\n<div id=\"id-3\">\n\t<div id=\"id2-3\"></div>\n</div>\n<div id=\"id-4\">\n\t<div id=\"id2-4\"></div>\n</div>\n<div id=\"id-5\">\n\t<div id=\"id2-5\"></div>\n</div>\n",