Improve attribute parsing (Fixes netzpirat#20).

rymai · Jan 24, 2012 · fe8b70f · fe8b70f
1 parent e9608bb
commit fe8b70f
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 31 deletions.
diff --git a/lib/haml-coffee.js b/lib/haml-coffee.js
diff --git a/lib/nodes/haml.js b/lib/nodes/haml.js
diff --git a/spec/suites/haml_coffee_spec.json b/spec/suites/haml_coffee_spec.json
@@ -232,7 +232,8 @@
             "id" : "999",
             "color" : "red"
           }
-        ]
+        ],
+        "title": "Mr"
       }
     },
 

diff --git a/spec/suites/templates/coffee/attributes.haml b/spec/suites/templates/coffee/attributes.haml
@@ -7,4 +7,7 @@
   - for product in @products
     %div#product.article.entry{:id => product.id, :class => product.color }
 
-%div.x{'class': "#{if true then 'y' else ''}"}
+%div.x{'class': "#{if true then 'y' else ''}"}
+
+- for title in ['Mr', 'Mrs', 'Ms', 'Miss']
+  %option{value: title, selected: @title == title}= title
diff --git a/spec/suites/templates/coffee/attributes.html b/spec/suites/templates/coffee/attributes.html
@@ -9,4 +9,8 @@
   <div class='article blue entry' id='product_12345'></div>
   <div class='article entry red' id='product_999'></div>
 </div>
-<div class='x y'></div>
+<div class='x y'></div>
+<option value='Mr' selected='selected'>Mr</option>
+<option value='Mrs'>Mrs</option>
+<option value='Ms'>Ms</option>
+<option value='Miss'>Miss</option>
diff --git a/src/haml-coffee.coffee b/src/haml-coffee.coffee
@@ -230,7 +230,7 @@ module.exports = class HamlCoffee
         continue if /^(\s)*$/.test(line)
 
         # Look ahead for more attributes and add them to the current line
-        while /^%.*[{(]/.test(expression) and not /^(\s*)[-=&!~.%#<]/.test(lines[0]) and /(?:(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(:\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+)|(\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|'\w+[\w:-]*\w?'):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+))/.test(lines[0])
+        while /^%.*[{(]/.test(expression) and not /^(\s*)[-=&!~.%#<]/.test(lines[0]) and /(?:([-\w]+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|"[-\w]+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)|(:\w+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|"[-\w]+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^},]+)|(\w+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|'[-\w]+[\w:-]*\w?'):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^},]+))/.test(lines[0])
 
           attributes = lines.shift()
           expression += ' ' + attributes.match(/^(\s*)(.*)/)[2]

diff --git a/src/nodes/haml.coffee b/src/nodes/haml.coffee
@@ -232,11 +232,11 @@ module.exports = class Haml extends Node
 
     findAttributes = /// (?:
         # HTML attributes
-        (\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)
+        ([-\w]+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[\w@.]+)
         # Ruby 1.8 attributes
-      | (:\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+)
+      | (:\w+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|"[-\w]+[\w:-]*\w?")\s*=>\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^},]+)
         # Ruby 1.9 attributes
-      | (\w+[\w:-]*\w?|'\w+[\w:-]*\w?'|"\w+[\w:-]*\w?"):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[-\w@.()\[\]'"]+)
+      | (\w+[\w:-]*\w?|'[-\w]+[\w:-]*\w?'|"[-\w]+[\w:-]*\w?"):\s*("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^},]+)
       ) ///g
 
     # Prepare all attributes