Merge pull request #7 from joker1007/make-member-not-hidden

fix: make member node not hidden
joker1007 · Dec 7, 2023 · 5f29849 · 5f29849
2 parents e3274ac + c60813d
commit 5f29849
Show file tree

Hide file tree

Showing 8 changed files with 5,027 additions and 4,830 deletions.
diff --git a/grammar.js b/grammar.js
@@ -199,7 +199,7 @@ module.exports = grammar({
         $.class_name,
         optional($.module_type_parameters),
         optional($.superclass),
-        alias(repeat(choice($._member, $._nestable_decls)), $.members),
+        alias(repeat(choice($.member, $._nestable_decls)), $.members),
         "end"
       )
     ),
@@ -212,7 +212,7 @@ module.exports = grammar({
         alias($.class_name, $.module_name),
         optional($.module_type_parameters),
         optional($.module_self_type_binds),
-        alias(repeat(choice($._member, $._nestable_decls)), $.members),
+        alias(repeat(choice($.member, $._nestable_decls)), $.members),
         "end"
       )
     ),
@@ -330,7 +330,7 @@ module.exports = grammar({
       seq("?", "{", $.parameters, optional($.self_type_binding), "->", $.type, "}"),
     ),
 
-    _member: $ => seq(
+    member: $ => seq(
       alias(repeat($.annotation), $.annotations),
       choice(
         $.ivar_member,

diff --git a/src/grammar.json b/src/grammar.json
@@ -1336,7 +1336,7 @@
                   "members": [
                     {
                       "type": "SYMBOL",
-                      "name": "_member"
+                      "name": "member"
                     },
                     {
                       "type": "SYMBOL",
@@ -1433,7 +1433,7 @@
                   "members": [
                     {
                       "type": "SYMBOL",
-                      "name": "_member"
+                      "name": "member"
                     },
                     {
                       "type": "SYMBOL",
@@ -2855,7 +2855,7 @@
         }
       ]
     },
-    "_member": {
+    "member": {
       "type": "SEQ",
       "members": [
         {

diff --git a/src/node-types.json b/src/node-types.json
@@ -703,7 +703,7 @@
     }
   },
   {
-    "type": "members",
+    "type": "member",
     "named": true,
     "fields": {},
     "children": {
@@ -723,55 +723,70 @@
           "named": true
         },
         {
-          "type": "class_alias_decl",
+          "type": "extend_member",
           "named": true
         },
         {
-          "type": "class_decl",
+          "type": "include_member",
           "named": true
         },
         {
-          "type": "const_decl",
+          "type": "ivar_member",
           "named": true
         },
         {
-          "type": "extend_member",
+          "type": "method_member",
           "named": true
         },
         {
-          "type": "include_member",
+          "type": "prepend_member",
           "named": true
         },
         {
-          "type": "interface_decl",
+          "type": "visibility_member",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "members",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "class_alias_decl",
           "named": true
         },
         {
-          "type": "ivar_member",
+          "type": "class_decl",
           "named": true
         },
         {
-          "type": "method_member",
+          "type": "const_decl",
           "named": true
         },
         {
-          "type": "module_alias_decl",
+          "type": "interface_decl",
           "named": true
         },
         {
-          "type": "module_decl",
+          "type": "member",
           "named": true
         },
         {
-          "type": "prepend_member",
+          "type": "module_alias_decl",
           "named": true
         },
         {
-          "type": "type_alias_decl",
+          "type": "module_decl",
           "named": true
         },
         {
-          "type": "visibility_member",
+          "type": "type_alias_decl",
           "named": true
         }
       ]