Add supertypes

Co-Authored-By: Matthew Krupcale <[email protected]>

Author: maxbrunsfeld

corpus/expressions.txt

@@ -397,8 +397,8 @@ let msg = match x {
   (match_expression (identifier) (match_block
     (match_arm (match_pattern (integer_literal)) (block (string_literal)))
     (match_arm (match_pattern (integer_literal)) (string_literal))
-    (match_arm (match_pattern (integer_literal)) (integer_literal))
-    (match_arm (match_pattern (float_literal)) (integer_literal))
+    (match_arm (match_pattern (negative_literal (integer_literal))) (integer_literal))
+    (match_arm (match_pattern (negative_literal (float_literal))) (integer_literal))
     (match_arm
       (attribute_item (meta_item (identifier)))
       (match_pattern (integer_literal)) (string_literal))

grammar.js

@@ -47,6 +47,15 @@ module.exports = grammar({
     $.block_comment,
   ],
 
+  supertypes: $ => [
+    $._expression,
+    $._type,
+    $._literal,
+    $._literal_pattern,
+    $._declaration_statement,
+    $._pattern,
+  ],
+
   inline: $ => [
     $._path,
     $._type_identifier,
@@ -1296,9 +1305,13 @@ module.exports = grammar({
       $.raw_string_literal,
       $.char_literal,
       $.boolean_literal,
-      seq(optional('-'), choice($.integer_literal, $.float_literal)),
+      $.integer_literal,
+      $.float_literal,
+      $.negative_literal,
     ),
 
+    negative_literal: $ => seq('-', choice($.integer_literal, $.float_literal)),
+
     integer_literal: $ => token(seq(
       choice(
         /[0-9][0-9_]*/,

package.json

@@ -22,7 +22,6 @@
   "tree-sitter": [
     {
       "scope": "source.rust",
-      "highlights": "src/highlights.json",
       "injection-regex": "rust",
       "file-types": [
         "rs"

src/grammar.json

@@ -7436,32 +7436,36 @@
           "name": "boolean_literal"
         },
         {
-          "type": "SEQ",
+          "type": "SYMBOL",
+          "name": "integer_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "float_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "negative_literal"
+        }
+      ]
+    },
+    "negative_literal": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "-"
+        },
+        {
+          "type": "CHOICE",
           "members": [
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "-"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "integer_literal"
             },
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "integer_literal"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "float_literal"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "float_literal"
             }
           ]
         }
@@ -7980,6 +7984,13 @@
     "_reserved_identifier",
     "_expression_ending_with_block"
   ],
-  "supertypes": []
+  "supertypes": [
+    "_expression",
+    "_type",
+    "_literal",
+    "_literal_pattern",
+    "_declaration_statement",
+    "_pattern"
+  ]
 }