Fixes tokenizing escaped content within selectors.

diff --git a/lib/selectors/tokenizer.js b/lib/selectors/tokenizer.js
index 83857ca..177740c 100644 (file)
--- a/lib/selectors/tokenizer.js
+++ b/lib/selectors/tokenizer.js
@@ -73,6 +73,9 @@ function whatsNext(context) {
   var nextBodyStart = chunk.indexOf('{', context.cursor);
   var nextBodyEnd = chunk.indexOf('}', context.cursor);
 
+  if (nextEscape > -1 && /\S/.test(chunk.substring(context.cursor, nextEscape)))
+    nextEscape = -1;
+
   closest = nextSpecial;
   if (closest == -1 || (nextEscape > -1 && nextEscape < closest))
     closest = nextEscape;

diff --git a/test/selectors/tokenizer-test.js b/test/selectors/tokenizer-test.js
index 39e77a7..5c08c7c 100644 (file)
--- a/test/selectors/tokenizer-test.js
+++ b/test/selectors/tokenizer-test.js
@@ -57,6 +57,10 @@ vows.describe(Tokenizer)
         'a{color:red; ; ; ;}',
         [{ selector: ['a'], body: ['color:red'] }]
       ],
+      'a selector with quoted attribute': [
+        'a[data-kind=__ESCAPED_FREE_TEXT_CLEAN_CSS0__]{color:red}',
+        [{ selector: ['a[data-kind=__ESCAPED_FREE_TEXT_CLEAN_CSS0__]'], body: ['color:red'] }]
+      ],
       'a double selector': [
         'a,\n\ndiv.class > p {color:red}',
         [{ selector: ['a', 'div.class > p'], body: ['color:red'] }]
@@ -91,6 +95,10 @@ vows.describe(Tokenizer)
       'charset after a line break': [
         '\n@charset \n\'utf-8\';',
         ['@charset \'utf-8\';']
+      ],
+      'keyframes with quoted attribute': [
+        '@keyframes __ESCAPED_FREE_TEXT_CLEAN_CSS0__{}',
+        [{ block: '@keyframes __ESCAPED_FREE_TEXT_CLEAN_CSS0__', body: [], isFlatBlock: false }]
       ]
     })
   )