added c# fields

getgrit · Dec 4, 2024 · a007890 · a007890
1 parent fd073c1
commit a007890
Show file tree

Hide file tree

Showing 7 changed files with 1,415 additions and 1,332 deletions.
diff --git a/resources/language-metavariables/tree-sitter-c-sharp/grammar.js b/resources/language-metavariables/tree-sitter-c-sharp/grammar.js
@@ -1418,7 +1418,7 @@ module.exports = grammar({
     query_body: ($) =>
       prec.right(
         sep1(
-          seq(repeat($._query_clause), $._select_or_group_clause),
+          seq(field("queries", repeat($._query_clause)), field("select_or_group", $._select_or_group_clause)),
           seq("into", $.identifier),
         ),
       ),

diff --git a/resources/language-metavariables/tree-sitter-c-sharp/src/grammar.json b/resources/language-metavariables/tree-sitter-c-sharp/src/grammar.json
@@ -7742,15 +7742,23 @@
             "type": "SEQ",
             "members": [
               {
-                "type": "REPEAT",
+                "type": "FIELD",
+                "name": "queries",
                 "content": {
-                  "type": "SYMBOL",
-                  "name": "_query_clause"
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "_query_clause"
+                  }
                 }
               },
               {
-                "type": "SYMBOL",
-                "name": "_select_or_group_clause"
+                "type": "FIELD",
+                "name": "select_or_group",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_select_or_group_clause"
+                }
               }
             ]
           },
@@ -7776,15 +7784,23 @@
                   "type": "SEQ",
                   "members": [
                     {
-                      "type": "REPEAT",
+                      "type": "FIELD",
+                      "name": "queries",
                       "content": {
-                        "type": "SYMBOL",
-                        "name": "_query_clause"
+                        "type": "REPEAT",
+                        "content": {
+                          "type": "SYMBOL",
+                          "name": "_query_clause"
+                        }
                       }
                     },
                     {
-                      "type": "SYMBOL",
-                      "name": "_select_or_group_clause"
+                      "type": "FIELD",
+                      "name": "select_or_group",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "_select_or_group_clause"
+                      }
                     }
                   ]
                 }

diff --git a/resources/language-metavariables/tree-sitter-c-sharp/src/node-types.json b/resources/language-metavariables/tree-sitter-c-sharp/src/node-types.json
@@ -5540,6 +5540,32 @@
           }
         ]
       },
+      "queries": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "from_clause",
+            "named": true
+          },
+          {
+            "type": "join_clause",
+            "named": true
+          },
+          {
+            "type": "let_clause",
+            "named": true
+          },
+          {
+            "type": "order_by_clause",
+            "named": true
+          },
+          {
+            "type": "where_clause",
+            "named": true
+          }
+        ]
+      },
       "select": {
         "multiple": true,
         "required": false,
@@ -5549,35 +5575,29 @@
             "named": true
           }
         ]
+      },
+      "select_or_group": {
+        "multiple": true,
+        "required": true,
+        "types": [
+          {
+            "type": "group_clause",
+            "named": true
+          },
+          {
+            "type": "select_clause",
+            "named": true
+          }
+        ]
       }
     },
     "children": {
       "multiple": true,
       "required": false,
       "types": [
-        {
-          "type": "from_clause",
-          "named": true
-        },
         {
           "type": "identifier",
           "named": true
-        },
-        {
-          "type": "join_clause",
-          "named": true
-        },
-        {
-          "type": "let_clause",
-          "named": true
-        },
-        {
-          "type": "order_by_clause",
-          "named": true
-        },
-        {
-          "type": "where_clause",
-          "named": true
         }
       ]
     }