more tests pass

getgrit · Mar 22, 2024 · 07c9415 · 07c9415
1 parent 89d057b
commit 07c9415
Show file tree

Hide file tree

Showing 26 changed files with 786,427 additions and 760,862 deletions.
diff --git a/crates/core/src/test.rs b/crates/core/src/test.rs
@@ -9786,12 +9786,15 @@ fn js_automatically_adds_comma() {
 
 #[test]
 fn js_multiple_insert_with_trailing_comma() {
-    run_test_match({
-        TestArg {
+    run_test_expected({
+        TestArgExpected {
             pattern: r#"
-                |language js(js_do_not_use)
+                |language js
                 |
-                |`($x) => { $_ }`
+                |`($x) => { $_ }` where {
+                |   $x += `a`,
+                |   $x += `b`,
+                |}
                 |"#
             .trim_margin()
             .unwrap(),
@@ -9801,7 +9804,14 @@ fn js_multiple_insert_with_trailing_comma() {
                 |};
                 |"#
             .trim_margin()
-            .unwrap()
+            .unwrap(),
+            expected: r#"
+                |var times = (x, y, z, a, b,) => {
+                |   return x * y * z;
+                |};
+                |"#
+            .trim_margin()
+            .unwrap(),
         }
     })
     .unwrap();

diff --git a/crates/wasm-bindings/wasm_parsers/tree-sitter-javascript.wasm b/crates/wasm-bindings/wasm_parsers/tree-sitter-javascript.wasm
diff --git a/crates/wasm-bindings/wasm_parsers/tree-sitter-tsx.wasm b/crates/wasm-bindings/wasm_parsers/tree-sitter-tsx.wasm
diff --git a/crates/wasm-bindings/wasm_parsers/tree-sitter-typescript.wasm b/crates/wasm-bindings/wasm_parsers/tree-sitter-typescript.wasm
diff --git a/resources/language-metavariables/tree-sitter-javascript/grammar.js b/resources/language-metavariables/tree-sitter-javascript/grammar.js
@@ -1298,9 +1298,9 @@ module.exports = grammar({
     _formal_parameters: $ => seq(
       field('parenthesis', alias('(', $.l_parenthesis)),
       optional(seq(field('parameters',
-        commaSep1($._formal_parameter),
+        commaSep1($._formal_parameter)),
         optional(','),
-      ))),
+      )),
       field('parenthesis', alias(')', $.r_parenthesis)),
     ),
 

diff --git a/resources/language-metavariables/tree-sitter-javascript/src/grammar.json b/resources/language-metavariables/tree-sitter-javascript/src/grammar.json
@@ -769,33 +769,37 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
-          "value": "var"
+          "type": "SYMBOL",
+          "name": "var"
         },
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "variable_declarator"
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": ","
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "variable_declarator"
-                  }
-                ]
+          "type": "FIELD",
+          "name": "declarations",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "variable_declarator"
+              },
+              {
+                "type": "REPEAT",
+                "content": {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "variable_declarator"
+                    }
+                  ]
+                }
               }
-            }
-          ]
+            ]
+          }
         },
         {
           "type": "SYMBOL",
@@ -6720,8 +6724,17 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
-          "value": "("
+          "type": "FIELD",
+          "name": "parenthesis",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "STRING",
+              "value": "("
+            },
+            "named": true,
+            "value": "l_parenthesis"
+          }
         },
         {
           "type": "CHOICE",
@@ -6730,29 +6743,33 @@
               "type": "SEQ",
               "members": [
                 {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "_formal_parameter"
-                    },
-                    {
-                      "type": "REPEAT",
-                      "content": {
-                        "type": "SEQ",
-                        "members": [
-                          {
-                            "type": "STRING",
-                            "value": ","
-                          },
-                          {
-                            "type": "SYMBOL",
-                            "name": "_formal_parameter"
-                          }
-                        ]
+                  "type": "FIELD",
+                  "name": "parameters",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_formal_parameter"
+                      },
+                      {
+                        "type": "REPEAT",
+                        "content": {
+                          "type": "SEQ",
+                          "members": [
+                            {
+                              "type": "STRING",
+                              "value": ","
+                            },
+                            {
+                              "type": "SYMBOL",
+                              "name": "_formal_parameter"
+                            }
+                          ]
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 },
                 {
                   "type": "CHOICE",
@@ -6774,8 +6791,17 @@
           ]
         },
         {
-          "type": "STRING",
-          "value": ")"
+          "type": "FIELD",
+          "name": "parenthesis",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "STRING",
+              "value": ")"
+            },
+            "named": true,
+            "value": "r_parenthesis"
+          }
         }
       ]
     },