feat: add extra nodes for members and named_argument

This is for properly supporting textobject queries
tree-sitter-grammars · Apr 25, 2023 · 9251b9e · 9251b9e
1 parent 5be42c8
commit 9251b9e
Show file tree

Hide file tree

Showing 11 changed files with 100,960 additions and 101,458 deletions.
diff --git a/grammar.js b/grammar.js
@@ -94,19 +94,35 @@ module.exports = grammar({
       optional($.string),
     ),
 
+    members: $ => choice(
+      repeat1($.field),
+      repeat1(
+        choice(
+          $.constructor,
+          $.method,
+          $.behavior,
+        ),
+      ),
+      seq(
+        repeat1($.field),
+        repeat1(
+          choice(
+            $.constructor,
+            $.method,
+            $.behavior,
+          ),
+        ),
+      ),
+    ),
+
     actor_definition: $ => seq(
       'actor',
       optional($.annotation),
       $.identifier,
       optional($.generic_parameters),
       optional(seq('is', $.type)),
       optional($.string),
-      repeat($.field),
-      repeat(choice(
-        $.constructor,
-        $.method,
-        $.behavior,
-      )),
+      optional($.members),
     ),
 
     class_definition: $ => seq(
@@ -117,12 +133,7 @@ module.exports = grammar({
       optional($.generic_parameters),
       optional(seq('is', $.type)),
       optional($.string),
-      repeat($.field),
-      repeat(choice(
-        $.constructor,
-        $.method,
-        $.behavior,
-      )),
+      optional($.members),
     ),
 
     primitive_definition: $ => seq(
@@ -132,10 +143,7 @@ module.exports = grammar({
       optional($.generic_parameters),
       optional(seq('is', $.type)),
       optional($.string),
-      repeat(choice(
-        $.constructor,
-        $.method,
-      )),
+      optional($.members),
     ),
 
     interface_definition: $ => seq(
@@ -146,11 +154,7 @@ module.exports = grammar({
       optional($.generic_parameters),
       optional(seq('is', $.type)),
       optional($.string),
-      repeat(choice(
-        $.constructor,
-        $.method,
-        $.behavior,
-      )),
+      optional($.members),
     ),
 
     trait_definition: $ => seq(
@@ -161,11 +165,7 @@ module.exports = grammar({
       optional($.generic_parameters),
       optional(seq('is', $.type)),
       optional($.string),
-      repeat(choice(
-        $.constructor,
-        $.method,
-        $.behavior,
-      )),
+      optional($.members),
     ),
 
     struct_definition: $ => seq(
@@ -176,11 +176,7 @@ module.exports = grammar({
       optional($.generic_parameters),
       optional(seq('is', $.type)),
       optional($.string),
-      repeat($.field),
-      repeat(choice(
-        $.constructor,
-        $.method,
-      )),
+      optional($.members),
     ),
 
     field: $ => seq(
@@ -453,8 +449,9 @@ module.exports = grammar({
 
     named_arguments: $ => seq(
       'where',
-      commaSep(seq($.identifier, '=', $.expression)),
+      commaSep($.named_argument),
     ),
+    named_argument: $ => seq($.identifier, '=', $.expression),
 
     lambda_expression: $ => seq(
       optional('@'),
@@ -675,8 +672,7 @@ module.exports = grammar({
       'object',
       optional($.capability),
       optional(seq('is', $.type)),
-      repeat($.field),
-      repeat(choice($.method, $.behavior)),
+      optional($.members),
       'end',
     ),
 

diff --git a/queries/tags.scm b/queries/tags.scm
@@ -20,6 +20,7 @@
 (trait_definition (identifier) @name) @definition.interface
 (interface_definition (identifier) @name) @definition.interface
 
+(constructor (identifier) @name) @definition.method
 (method (identifier) @name) @definition.method
 (behavior (identifier) @name) @definition.method