more tests passing

getgrit · Mar 22, 2024 · d71852e · d71852e
1 parent 93871f7
commit d71852e
Show file tree

Hide file tree

Showing 58 changed files with 693,557 additions and 679,629 deletions.
diff --git a/crates/core/src/test.rs b/crates/core/src/test.rs
@@ -5935,7 +5935,7 @@ fn dont_swallow_rewrites() {
         TestArgExpected {
             pattern: r#"
                 |engine marzano(0.1)
-                |language js
+                |language js(js_do_not_use)
                 |js"export default $susan" => `bob\n$susan`
                 |"#
             .trim_margin()

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-c-sharp/bindings/rust/build.rs b/resources/language-metavariables/tree-sitter-c-sharp/bindings/rust/build.rs
@@ -7,7 +7,7 @@ fn main() {
     let mut c_config = cc::Build::new();
     c_config.include(&src_dir);
     c_config
-        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-w")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
     let parser_path = src_dir.join("parser.c");

diff --git a/resources/language-metavariables/tree-sitter-css/bindings/rust/build.rs b/resources/language-metavariables/tree-sitter-css/bindings/rust/build.rs
@@ -4,7 +4,7 @@ fn main() {
     let mut c_config = cc::Build::new();
     c_config.include(src_dir);
     c_config
-        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-w")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
     let parser_path = src_dir.join("parser.c");

diff --git a/resources/language-metavariables/tree-sitter-go/bindings/rust/build.rs b/resources/language-metavariables/tree-sitter-go/bindings/rust/build.rs
@@ -3,7 +3,7 @@ fn main() {
     let mut c_config = cc::Build::new();
     c_config.include(src_dir);
     c_config
-        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-w")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
     let parser_path = src_dir.join("parser.c");

diff --git a/resources/language-metavariables/tree-sitter-hcl/bindings/rust/build.rs b/resources/language-metavariables/tree-sitter-hcl/bindings/rust/build.rs
@@ -4,7 +4,7 @@ fn main() {
     let mut c_config = cc::Build::new();
     c_config.include(src_dir);
     c_config
-        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-w")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
     let parser_path = src_dir.join("parser.c");

diff --git a/resources/language-metavariables/tree-sitter-html/bindings/rust/build.rs b/resources/language-metavariables/tree-sitter-html/bindings/rust/build.rs
@@ -4,7 +4,7 @@ fn main() {
     let mut c_config = cc::Build::new();
     c_config.include(src_dir);
     c_config
-        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-w")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
     let parser_path = src_dir.join("parser.c");

diff --git a/resources/language-metavariables/tree-sitter-java/bindings/rust/build.rs b/resources/language-metavariables/tree-sitter-java/bindings/rust/build.rs
@@ -7,7 +7,7 @@ fn main() {
     let mut c_config = cc::Build::new();
     c_config.include(src_dir);
     c_config
-        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-w")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
     let parser_path = src_dir.join("parser.c");

diff --git a/resources/language-metavariables/tree-sitter-javascript/bindings/rust/build.rs b/resources/language-metavariables/tree-sitter-javascript/bindings/rust/build.rs
@@ -7,7 +7,7 @@ fn main() {
     let mut c_config = cc::Build::new();
     c_config.include(src_dir);
     c_config
-        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-w")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
     let parser_path = src_dir.join("parser.c");

diff --git a/resources/language-metavariables/tree-sitter-javascript/grammar.js b/resources/language-metavariables/tree-sitter-javascript/grammar.js
@@ -147,8 +147,7 @@ module.exports = grammar({
             choice(
               field('declaration', $.declaration),
               seq(
-                // field(declaration) ?
-                field('value', $.expression),
+                field('declaration', $.expression),
                 $._semicolon,
               ),
             ),
@@ -837,7 +836,7 @@ module.exports = grammar({
     ),
 
     // Override
-    _call_signature: $ => field('parameters', $.formal_parameters),
+    _call_signature: $ => $._formal_parameters,
     _formal_parameter: $ => choice($.pattern, $.assignment_pattern),
 
     optional_chain: _ => '?.',
@@ -847,7 +846,7 @@ module.exports = grammar({
     call_expression: $ => choice(
       prec('call', seq(
         field('function', choice($.expression, $.import)),
-        field('arguments', choice($._arguments, $.template_string)),
+        choice($._arguments, field('arguments', $.template_string)),
       )),
       prec('member', seq(
         field('function', $.primary_expression),
@@ -1295,9 +1294,7 @@ module.exports = grammar({
       optional($._initializer),
     ),
 
-    // _formal_parameters?
-    // updated skip_snippet_compilation_sort
-    formal_parameters: $ => seq(
+    _formal_parameters: $ => seq(
       field('parenthesis', alias('(', $.l_parenthesis)),
       optional(seq(field('parameters',
         commaSep1($._formal_parameter),
@@ -1331,7 +1328,7 @@ module.exports = grammar({
       field('async', optional($.async)),
       optional(choice('get', 'set', '*')),
       field('name', $._property_name),
-      field('parameters', $.formal_parameters),
+      $._formal_parameters,
       field('body', $.statement_block),
     ),
 

diff --git a/resources/language-metavariables/tree-sitter-javascript/src/grammar.json b/resources/language-metavariables/tree-sitter-javascript/src/grammar.json
@@ -166,7 +166,7 @@
                           "members": [
                             {
                               "type": "FIELD",
-                              "name": "value",
+                              "name": "declaration",
                               "content": {
                                 "type": "SYMBOL",
                                 "name": "expression"
@@ -3617,12 +3617,8 @@
       ]
     },
     "_call_signature": {
-      "type": "FIELD",
-      "name": "parameters",
-      "content": {
-        "type": "SYMBOL",
-        "name": "formal_parameters"
-      }
+      "type": "SYMBOL",
+      "name": "_formal_parameters"
     },
     "_formal_parameter": {
       "type": "CHOICE",
@@ -3672,21 +3668,21 @@
                 }
               },
               {
-                "type": "FIELD",
-                "name": "arguments",
-                "content": {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "_arguments"
-                    },
-                    {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_arguments"
+                  },
+                  {
+                    "type": "FIELD",
+                    "name": "arguments",
+                    "content": {
                       "type": "SYMBOL",
                       "name": "template_string"
                     }
-                  ]
-                }
+                  }
+                ]
               }
             ]
           }
@@ -6724,7 +6720,7 @@
         }
       ]
     },
-    "formal_parameters": {
+    "_formal_parameters": {
       "type": "SEQ",
       "members": [
         {
@@ -6970,12 +6966,8 @@
           }
         },
         {
-          "type": "FIELD",
-          "name": "parameters",
-          "content": {
-            "type": "SYMBOL",
-            "name": "formal_parameters"
-          }
+          "type": "SYMBOL",
+          "name": "_formal_parameters"
         },
         {
           "type": "FIELD",