Fix parsing of negative numbers (#12)

* Add failing test for negative numbers * Fix parsing of negative numbers * Rearrange assertion to avoid extra diff noise
Wilfred · Mar 4, 2021 · 94e1023 · 94e1023
1 parent 9668e88
commit 94e1023
Show file tree

Hide file tree

Showing 4 changed files with 1,153 additions and 1,218 deletions.
diff --git a/corpus/declarations.txt b/corpus/declarations.txt
@@ -86,6 +86,7 @@ a {
   c: 5em;
   margin: 10E3px;
   margin: -456.8px;
+  margin: -5px;
   margin: -0.0px;
 }
 
@@ -97,6 +98,7 @@ a {
     (declaration (property_name) (integer_value (unit)))
     (declaration (property_name) (float_value (unit)))
     (declaration (property_name) (float_value (unit)))
+    (declaration (property_name) (integer_value (unit)))
     (declaration (property_name) (float_value (unit))))))
 
 ============================
@@ -240,5 +242,5 @@ a-property: calc(5px + var(--a-variable));
 ---
 
 (stylesheet
-  (declaration (property_name) (plain_value))
+  (declaration (property_name) (integer_value (unit)))
   (declaration (property_name) (call_expression (function_name) (arguments (binary_expression (integer_value (unit)) (call_expression (function_name) (arguments (plain_value))))))))
diff --git a/grammar.js b/grammar.js
@@ -333,7 +333,7 @@ module.exports = grammar({
       ')'
     ),
 
-    identifier: $ => /[a-zA-Z-_][a-zA-Z0-9-_]*/,
+    identifier: $ => /(--|-?[a-zA-Z_])[a-zA-Z0-9-_]*/,
 
     at_keyword: $ => /@[a-zA-Z-_]+/,
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -1642,7 +1642,7 @@
     },
     "identifier": {
       "type": "PATTERN",
-      "value": "[a-zA-Z-_][a-zA-Z0-9-_]*"
+      "value": "(--|-?[a-zA-Z_])[a-zA-Z0-9-_]*"
     },
     "at_keyword": {
       "type": "PATTERN",
-Original file line number
+Diff line change
@@ Expand Up / @@ -333,7 +333,7 @@ module.exports = grammar({ @@
           ')'
         ),
-        identifier: $ => /[a-zA-Z-_][a-zA-Z0-9-_]*/,
+        identifier: $ => /(--|-?[a-zA-Z_])[a-zA-Z0-9-_]*/,
         at_keyword: $ => /@[a-zA-Z-_]+/,
@@ Expand Down @@