Merge pull request #224 from calebdw/fix_comment_again

fix: comment precedence (again)
tree-sitter · Feb 25, 2024 · 1ea74a6 · 1ea74a6
2 parents 710754c + cf38b7f
commit 1ea74a6
Show file tree

Hide file tree

Showing 8 changed files with 61,658 additions and 61,690 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -148,7 +148,7 @@ module.exports = function defineGrammar(dialect) {
 
       text: _ => repeat1(choice(
         token(prec(-1, /</)),
-        /[^\s<][^<]*/,
+        token(prec(1, /[^\s<][^<]*/)),
       )),
 
       _statement: $ => choice(
@@ -1553,7 +1553,7 @@ module.exports = function defineGrammar(dialect) {
         keyword('static'),
       ),
 
-      comment: _ => token(prec(-1, choice(
+      comment: _ => token(choice(
         seq(
           choice('//', /#[^?\[?\r?\n]/),
           repeat(/[^?\r?\n]|\?[^>\r\n]/),
@@ -1565,7 +1565,7 @@ module.exports = function defineGrammar(dialect) {
           /[^*]*\*+([^/*][^*]*\*+)*/,
           '/',
         ),
-      ))),
+      )),
 
       _semicolon: $ => choice($._automatic_semicolon, ';'),
     },

diff --git a/common/test/corpus/bugs.txt b/common/test/corpus/bugs.txt
@@ -164,7 +164,6 @@ foo(void: null);
         function: (name)
         arguments: (arguments (argument name: (name) (null))))))
 
-
 =========================================
 #221: Error when closing tag is in a string
 =========================================
@@ -209,3 +208,26 @@ $foo = '?>';
       (assignment_expression
         left: (variable_name (name))
         right: (string (string_value)))))
+
+=========================================
+#223: Error with comment inside binary expression
+=========================================
+
+<?php
+if (
+  true
+  // this is a comment
+  || false
+) {}
+
+---
+
+(program
+  (php_tag)
+  (if_statement
+    condition: (parenthesized_expression
+      (binary_expression
+        left: (boolean)
+        (comment)
+        right: (boolean)))
+    body: (compound_statement)))
diff --git a/common/test/corpus/string.txt b/common/test/corpus/string.txt
@@ -455,6 +455,7 @@ okay to do';
 '#valid regexp#';
 'hello#world';
 'hello//world';
+'//hello world';
 '/*valid regexp*/';
 '/*valid regexp';
 
@@ -474,6 +475,7 @@ okay to do';
   (expression_statement (string (string_value)))
   (expression_statement (string (string_value)))
   (expression_statement (string (string_value)))
+  (expression_statement (string (string_value)))
   (expression_statement (string (string_value))))
 
 =========================================

diff --git a/common/test/highlight/literals.php b/common/test/highlight/literals.php
@@ -6,14 +6,14 @@
 OMG;
 // <- string
 
-echo true, TRUE, false, FALSE
+echo true, TRUE, false, FALSE;
 //    ^ constant.builtin
 //          ^ constant.builtin
 //               ^ constant.builtin
 //                      ^ constant.builtin
 
-echo PI_314
+echo PI_314;
 //   ^ constant
 
-echo __DIR__
-//    ^ constant.builtin
+echo __DIR__;
+//    ^ constant.builtin
diff --git a/php/src/grammar.json b/php/src/grammar.json
@@ -98,8 +98,15 @@
             }
           },
           {
-            "type": "PATTERN",
-            "value": "[^\\s<][^<]*"
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 1,
+              "content": {
+                "type": "PATTERN",
+                "value": "[^\\s<][^<]*"
+              }
+            }
           }
         ]
       }
@@ -8980,71 +8987,67 @@
     "comment": {
       "type": "TOKEN",
       "content": {
-        "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": "CHOICE",
+        "members": [
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "//"
+                  },
+                  {
                     "type": "PATTERN",
-                    "value": "[^?\\r?\\n]|\\?[^>\\r\\n]"
+                    "value": "#[^?\\[?\\r?\\n]"
                   }
-                },
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "PATTERN",
-                      "value": "\\?\\r?\\n"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              "type": "STRING",
-              "value": "#"
-            },
-            {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "/*"
-                },
-                {
+                ]
+              },
+              {
+                "type": "REPEAT",
+                "content": {
                   "type": "PATTERN",
-                  "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
-                },
-                {
-                  "type": "STRING",
-                  "value": "/"
+                  "value": "[^?\\r?\\n]|\\?[^>\\r\\n]"
                 }
-              ]
-            }
-          ]
-        }
+              },
+              {
+                "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": {