fix comment in string

2022-12-08 02:04:36 +03:00 · 2022-12-08 02:04:36 +03:00 · 90bb1822c1
commit 90bb1822c1
parent 1a4be28021
4 changed files with 27 additions and 12 deletions
--- a/grammar.js
+++ b/grammar.js
@ -188,7 +188,7 @@ module.exports = grammar({
        seq("`", repeat(token.immediate(/[^`\n]+/)), "`")
      ),

-    line_comment: ($) => token(seq("#", /.*/)),
+    line_comment: ($) => token(prec(-2, seq("#", /.*/))),

    _word: ($) => /[\w\d]+/,

--- a/src/grammar.json
+++ b/src/grammar.json
@ -1122,17 +1122,21 @@
    "line_comment": {
      "type": "TOKEN",
      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "#"
-          },
-          {
-            "type": "PATTERN",
-            "value": ".*"
-          }
-        ]
+        "type": "PREC",
+        "value": -2,
+        "content": {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "#"
+            },
+            {
+              "type": "PATTERN",
+              "value": ".*"
+            }
+          ]
+        }
      }
    },
    "_word": {
--- a/src/parser.c
+++ b/src/parser.c
--- a/test/corpus/attributes.txt
+++ b/test/corpus/attributes.txt
@ -97,3 +97,14 @@ foo.style: { opacity: 5 }
  )
 )

+================================================================================
+Color in string
+================================================================================
+foo.style.fill: "#ffffff";
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (shape_key) (dot) (attr_key) (dot) (attr_key) (attr_value (string))
+)
+