Update to fdeb68a and resolve conflicts

Author: ruricolist

common/define-grammar.js

@@ -54,6 +54,9 @@ module.exports = function defineGrammar(dialect) {
       [$._type_query_call_expression, $.primary_expression],
       [$.type_query, $.primary_expression],
       [$.override_modifier, $.primary_expression],
+      [$.decorator_call_expression, $.decorator],
+      [$.literal_type, $.pattern],
+      [$.predefined_type, $.pattern]
     ]),
 
     conflicts: ($, previous) => previous.concat([
@@ -63,6 +66,9 @@ module.exports = function defineGrammar(dialect) {
       [$.call_expression, $.binary_expression, $.type_assertion],
       [$.call_expression, $.binary_expression, $.await_expression],
 
+      // This appears to be necessary to parse a parenthesized class expression
+      [$.class],
+
       [$.nested_identifier, $.nested_type_identifier, $.primary_expression],
       [$.nested_identifier, $.nested_type_identifier],
       [$.nested_identifier, $.member_expression],
@@ -84,6 +90,9 @@ module.exports = function defineGrammar(dialect) {
       [$.primary_expression, $._parameter_name, $._primary_type],
       [$.primary_expression, $._parameter_name, $.array_type, $.tuple_type],
       [$.primary_expression, $.literal_type],
+      [$.primary_expression, $.literal_type, $.pattern],
+      [$.primary_expression, $.literal_type, $.rest_pattern],
+      [$.primary_expression, $.predefined_type, $.rest_pattern],
       [$.primary_expression, $._primary_type],
       [$.primary_expression, $.generic_type],
       [$.primary_expression, $.predefined_type],

package.json

@@ -19,7 +19,7 @@
   "main": "./bindings/node",
   "devDependencies": {
     "tree-sitter-cli": "^0.20.0",
-    "tree-sitter-javascript": "github:tree-sitter/tree-sitter-javascript#4a2f9ea"
+    "tree-sitter-javascript": "github:tree-sitter/tree-sitter-javascript#fdeb68a"
   },
   "scripts": {
     "build": "npm run build-typescript && npm run build-tsx",