fix: comment precedence

tree-sitter · Jan 13, 2024 · b49346d · b49346d
1 parent b569a5f
commit b49346d
Show file tree

Hide file tree

Showing 9 changed files with 23,872 additions and 24,023 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -1324,7 +1324,7 @@ module.exports = function defineGrammar(dialect) {
         '\'',
       ),
 
-      string_value: _ => token(prec(1, repeat1(/\\'|\\\\|\\?[^'\\]/))), // prec(1, ...) is needed to avoid conflict with $.comment
+      string_value: _ => token(repeat1(/\\'|\\\\|\\?[^'\\]/)),
 
       heredoc_body: $ => seq($._new_line,
         repeat1(prec.right(
@@ -1512,7 +1512,7 @@ module.exports = function defineGrammar(dialect) {
         keyword('static'),
       ),
 
-      comment: _ => token(choice(
+      comment: _ => token(prec(-1, choice(
         seq(
           choice('//', /#[^?\[?\r?\n]/),
           repeat(/[^?\r?\n]|\?[^>\r\n]/),
@@ -1524,7 +1524,7 @@ module.exports = function defineGrammar(dialect) {
           /[^*]*\*+([^/*][^*]*\*+)*/,
           '/',
         ),
-      )),
+      ))),
 
       _semicolon: $ => choice($._automatic_semicolon, ';'),
     },

diff --git a/common/test/corpus/bugs.txt b/common/test/corpus/bugs.txt
@@ -64,4 +64,4 @@ var_dump(self);
       )
     )
   )
-)
+)
diff --git a/php/src/grammar.json b/php/src/grammar.json
@@ -7181,14 +7181,10 @@
     "string_value": {
       "type": "TOKEN",
       "content": {
-        "type": "PREC",
-        "value": 1,
+        "type": "REPEAT1",
         "content": {
-          "type": "REPEAT1",
-          "content": {
-            "type": "PATTERN",
-            "value": "\\\\'|\\\\\\\\|\\\\?[^'\\\\]"
-          }
+          "type": "PATTERN",
+          "value": "\\\\'|\\\\\\\\|\\\\?[^'\\\\]"
         }
       }
     },
@@ -8839,67 +8835,71 @@
     "comment": {
       "type": "TOKEN",
       "content": {
-        "type": "CHOICE",
-        "members": [
-          {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "//"
-                  },
-                  {
+        "type": "PREC",
+        "value": -1,
+        "content": {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "//"
+                    },
+                    {
+                      "type": "PATTERN",
+                      "value": "#[^?\\[?\\r?\\n]"
+                    }
+                  ]
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
                     "type": "PATTERN",
-                    "value": "#[^?\\[?\\r?\\n]"
+                    "value": "[^?\\r?\\n]|\\?[^>\\r\\n]"
                   }
-                ]
-              },
-              {
-                "type": "REPEAT",
-                "content": {
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "PATTERN",
+                      "value": "\\?\\r?\\n"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "#"
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "/*"
+                },
+                {
                   "type": "PATTERN",
-                  "value": "[^?\\r?\\n]|\\?[^>\\r\\n]"
+                  "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
+                },
+                {
+                  "type": "STRING",
+                  "value": "/"
                 }
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "PATTERN",
-                    "value": "\\?\\r?\\n"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "type": "STRING",
-            "value": "#"
-          },
-          {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "/*"
-              },
-              {
-                "type": "PATTERN",
-                "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
-              },
-              {
-                "type": "STRING",
-                "value": "/"
-              }
-            ]
-          }
-        ]
+              ]
+            }
+          ]
+        }
       }
     },
     "_semicolon": {