issue #1: Both .t-1 and .t-01 should be idents

css · Oct 9, 2012 · 64bce87 · 64bce87
1 parent fc8d92c
commit 64bce87
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* v1.0.3,
+    - 
 * v1.0.2, 08.10.2012
     - CSSO issue (filter + important breaks csso v1.3.1): https://github.com/css/csso/issues/87 
 * v1.0.1, 08.10.2012

diff --git a/lib/gonzales.cssp.node.js b/lib/gonzales.cssp.node.js
@@ -1246,7 +1246,9 @@ function getCSSPAST(_tokens, rule, _needInfo) {
         for (; _i < tokens.length; _i++) {
             if (tokens[_i].type !== TokenType.HyphenMinus &&
                 tokens[_i].type !== TokenType.LowLine) {
-                    if (tokens[_i].type !== TokenType.Identifier) break;
+                    if (tokens[_i].type !== TokenType.Identifier &&
+                        (tokens[_i].type !== TokenType.DecimalNumber || !wasIdent)
+                        ) break;
                     else wasIdent = true;
             }   
         }

diff --git a/src/cssp.ast.shared.js b/src/cssp.ast.shared.js
@@ -974,7 +974,9 @@ function getCSSPAST(_tokens, rule, _needInfo) {
         for (; _i < tokens.length; _i++) {
             if (tokens[_i].type !== TokenType.HyphenMinus &&
                 tokens[_i].type !== TokenType.LowLine) {
-                    if (tokens[_i].type !== TokenType.Identifier) break;
+                    if (tokens[_i].type !== TokenType.Identifier &&
+                        (tokens[_i].type !== TokenType.DecimalNumber || !wasIdent)
+                        ) break;
                     else wasIdent = true;
             }   
         }

diff --git a/test/cssp/data/test_stylesheet/issue88.test1.css b/test/cssp/data/test_stylesheet/issue88.test1.css
@@ -0,0 +1,7 @@
+.t-1 {
+    color: red;
+}
+
+.t-01 {
+    color: blue;
+}
diff --git a/test/cssp/data/test_stylesheet/issue88.test1.l b/test/cssp/data/test_stylesheet/issue88.test1.l
@@ -0,0 +1,7 @@
+.t-1 {
+    color: red;
+}
+
+.t-01 {
+    color: blue;
+}
diff --git a/test/cssp/data/test_stylesheet/issue88.test1.p b/test/cssp/data/test_stylesheet/issue88.test1.p
@@ -0,0 +1,40 @@
+['stylesheet', 
+  ['ruleset', 
+    ['selector', 
+      ['simpleselector', 
+        ['clazz', 
+          ['ident', 't-1']], 
+        ['s', ' ']]], 
+    ['block', 
+      ['s', '
+    '], 
+      ['declaration', 
+        ['property', 
+          ['ident', 'color']], 
+        ['value', 
+          ['s', ' '], 
+          ['ident', 'red']]], 
+      ['decldelim'], 
+      ['s', '
+']]], 
+  ['s', '
+
+'], 
+  ['ruleset', 
+    ['selector', 
+      ['simpleselector', 
+        ['clazz', 
+          ['ident', 't-01']], 
+        ['s', ' ']]], 
+    ['block', 
+      ['s', '
+    '], 
+      ['declaration', 
+        ['property', 
+          ['ident', 'color']], 
+        ['value', 
+          ['s', ' '], 
+          ['ident', 'blue']]], 
+      ['decldelim'], 
+      ['s', '
+']]]]
diff --git a/web/gonzales.cssp.web.js b/web/gonzales.cssp.web.js
@@ -1246,7 +1246,9 @@ function getCSSPAST(_tokens, rule, _needInfo) {
         for (; _i < tokens.length; _i++) {
             if (tokens[_i].type !== TokenType.HyphenMinus &&
                 tokens[_i].type !== TokenType.LowLine) {
-                    if (tokens[_i].type !== TokenType.Identifier) break;
+                    if (tokens[_i].type !== TokenType.Identifier &&
+                        (tokens[_i].type !== TokenType.DecimalNumber || !wasIdent)
+                        ) break;
                     else wasIdent = true;
             }   
         }