Remove for attr in <label> if it contains <input>

emmet/markup/__init__.py

@@ -6,6 +6,7 @@
 from .lorem import lorem
 from .addon.xsl import xsl
 from .addon.bem import bem
+from .addon.label import label
 from .format import html, haml, slim, pug
 from .utils import walk
 
@@ -62,5 +63,8 @@ def transform(node: AbbreviationNode, ancestors: list, config: Config):
     if config.syntax == 'xsl':
         xsl(node)
 
+    if config.type == 'markup':
+        label(node)
+
     if config.options.get('bem.enabled'):
         bem(node, ancestors, config)

emmet/markup/addon/label.py

@@ -0,0 +1,30 @@
+from ...abbreviation import AbbreviationNode, AbbreviationAttribute
+from ..utils import find
+
+def label(node: AbbreviationNode):
+    if node.name == 'label':
+        input = find(node, lambda n: n.name == 'input' or n.name == 'textarea')
+        if input:
+            # Remove empty `for` attribute
+            if node.attributes:
+                node.attributes = [attr for attr in node.attributes if not (attr.name == 'for' and is_empty_attribute(attr))]
+
+            # Remove empty `id` attribute
+            if input.attributes:
+                input.attributes = [attr for attr in input.attributes if not (attr.name == 'id' and is_empty_attribute(attr))]
+
+
+def is_empty_attribute(attr: AbbreviationAttribute):
+    if not attr.value:
+        return True
+
+
+    if len(attr.value) == 1:
+        token = attr.value[0]
+        if token and not isinstance(token, str) and not token.name:
+            # Attribute contains field
+            return True
+
+    return False
+
+

emmet/markup/utils.py

@@ -26,3 +26,14 @@ def find_deepest(node: AbbreviationNode):
         node = node.children[-1]
 
     return (parent, node)
+
+
+def find(node: AbbreviationNode, callback: callable):
+    "Finds first child node that matches given `callback`"
+    for child in node.children:
+        if callback(child):
+            return child
+
+        result = find(child, callback)
+        if result:
+            return result

tests/test_markup.py

@@ -32,6 +32,12 @@ def test_xsl(self):
         self.assertEqual(expand('xsl:variable[select]>div', config), '<xsl:variable><div></div></xsl:variable>')
         self.assertEqual(expand('xsl:with-param[select]{foo}', config), '<xsl:with-param>foo</xsl:with-param>')
 
+class TestLabelPreprocessor(unittest.TestCase):
+    def test_label(self):
+        self.assertEqual(expand('label>input'), '<label><input type="${1:text}" /></label>')
+        self.assertEqual(expand('label>inp'), '<label><input type="${1:text}" name="${1}" /></label>')
+        self.assertEqual(expand('label>span>input'), '<label><span><input type="${1:text}" /></span></label>')
+        self.assertEqual(expand('label+inp'), '<label for=""></label><input type="${1:text}" name="${1}" id="${1}" />')
 
 class TestBEMTransform(unittest.TestCase):
     def test_modifiers(self):