Resolved issue rooney#4 "div is not a block tag by default".

muratayusuke · Aug 6, 2013 · b756b29 · b756b29
1 parent 57b7cf6
commit b756b29
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/conf/preferences.json b/conf/preferences.json
@@ -35,7 +35,7 @@
       "dfn":        {"block": false, "selfClosing": false},
       "dialog":     {"block": false, "selfClosing": false},
       "dir":        {"block": true,  "selfClosing": false},
-      "div":        {"block": true,  "selfClosing": false},
+      "div":        {"block": false, "selfClosing": false},
       "dl":         {"block": true,  "selfClosing": false},
       "dt":         {"block": false, "selfClosing": false},
       "em":         {"block": false, "selfClosing": false},
@@ -369,4 +369,4 @@
       }
     }
   }
-}
+}
diff --git a/emmet-mode.el b/emmet-mode.el
@@ -982,7 +982,7 @@ tbl) tbl)
 tbl) tbl)
 (puthash "div" (let ((tbl (make-hash-table :test 'equal)))
 (puthash "selfClosing" nil tbl)
-(puthash "block" t tbl)
+(puthash "block" nil tbl)
 tbl) tbl)
 (puthash "dir" (let ((tbl (make-hash-table :test 'equal)))
 (puthash "selfClosing" nil tbl)

diff --git a/src/preferences.el b/src/preferences.el
@@ -148,7 +148,7 @@ tbl) tbl)
 tbl) tbl)
 (puthash "div" (let ((tbl (make-hash-table :test 'equal)))
 (puthash "selfClosing" nil tbl)
-(puthash "block" t tbl)
+(puthash "block" nil tbl)
 tbl) tbl)
 (puthash "dir" (let ((tbl (make-hash-table :test 'equal)))
 (puthash "selfClosing" nil tbl)

diff --git a/src/test.el b/src/test.el
@@ -60,14 +60,10 @@
   "a.x"                    ("<a class=\"x\" href=\"\"></a>")
   "a#q.x"                  ("<a id=\"q\" class=\"x\" href=\"\"></a>")
   "a#q.x.y.z"              ("<a id=\"q\" class=\"x y z\" href=\"\"></a>")
-  "#q"                     ("<div id=\"q\">"
-                            "</div>")
-  ".x"                     ("<div class=\"x\">"
-                            "</div>")
-  "#q.x"                   ("<div id=\"q\" class=\"x\">"
-                            "</div>")
-  "#q.x.y.z"               ("<div id=\"q\" class=\"x y z\">"
-                            "</div>"))
+  "#q"                     ("<div id=\"q\"></div>")
+  ".x"                     ("<div class=\"x\"></div>")
+  "#q.x"                   ("<div id=\"q\" class=\"x\"></div>")
+  "#q.x.y.z"               ("<div id=\"q\" class=\"x y z\"></div>"))
 
 (define-emmet-transform-html-test-case Empty-tags
   "a/"                     ("<a href=\"\"/>")
@@ -128,10 +124,7 @@
   "a#q.x>b"                ("<a id=\"q\" class=\"x\" href=\"\"><b></b></a>")
   "a#q.x.y.z>b"            ("<a id=\"q\" class=\"x y z\" href=\"\"><b></b></a>")
   "a#q.x.y.z>b#p.l.m.n"    ("<a id=\"q\" class=\"x y z\" href=\"\"><b id=\"p\" class=\"l m n\"></b></a>")
-  "#q>.x"                  ("<div id=\"q\">"
-                            "    <div class=\"x\">"
-                            "    </div>"
-                            "</div>")
+  "#q>.x"                  ("<div id=\"q\"><div class=\"x\"></div></div>")
   "a>b+c"                  ("<a href=\"\">"
                             "    <b></b>"
                             "    <c></c>"
@@ -160,8 +153,7 @@
                             "</a>")
 
   "div+a>p>span{foo}+em>b^^^p"
-  ("<div>"
-   "</div>"
+  ("<div></div>"
    "<a href=\"\">"
    "    <p>"
    "        <span>foo</span>"
@@ -171,8 +163,7 @@
    "<p></p>")
 
   "div+div>p>span+em^blockquote{foo}"
-  ("<div>"
-   "</div>"
+  ("<div></div>"
    "<div>"
    "    <p>"
    "        <span></span>"
@@ -361,8 +352,7 @@
   "#a>.b|c"                ("<!-- #a -->"
                             "<div id=\"a\">"
                             "    <!-- .b -->"
-                            "    <div class=\"b\">"
-                            "    </div>"
+                            "    <div class=\"b\"></div>"
                             "    <!-- /.b -->"
                             "</div>"
                             "<!-- /#a -->"))