Define a precedence instead of conflict

Author: rmagatti

common/define-grammar.js

@@ -53,6 +53,7 @@ module.exports = function defineGrammar(dialect) {
       [$._type_query_subscript_expression, $.primary_expression],
       [$._type_query_call_expression, $.primary_expression],
       [$.type_query, $.primary_expression],
+      [$.override_modifier, $.primary_expression],
     ]),
 
     conflicts: ($, previous) => previous.concat([
@@ -78,7 +79,6 @@ module.exports = function defineGrammar(dialect) {
       [$.jsx_namespace_name, $._primary_type],
 
       [$.primary_expression, $._parameter_name],
-      [$.primary_expression, $.override_modifier],
       [$.primary_expression, $._parameter_name, $.predefined_type],
       [$.primary_expression, $._parameter_name, $._primary_type],
       [$.primary_expression, $._parameter_name, $.array_type, $.tuple_type],

tsx/src/grammar.json

@@ -10131,10 +10131,6 @@
       "primary_expression",
       "_parameter_name"
     ],
-    [
-      "primary_expression",
-      "override_modifier"
-    ],
     [
       "primary_expression",
       "_parameter_name",
@@ -10703,6 +10699,16 @@
         "type": "SYMBOL",
         "name": "primary_expression"
       }
+    ],
+    [
+      {
+        "type": "SYMBOL",
+        "name": "override_modifier"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "primary_expression"
+      }
     ]
   ],
   "externals": [