refactor: collection_type

blindFS · Feb 23, 2025 · 5ebfbde · 5ebfbde
1 parent 477d94b
commit 5ebfbde
Show file tree

Hide file tree

Showing 3 changed files with 260,778 additions and 266,794 deletions.
diff --git a/grammar.js b/grammar.js
@@ -274,28 +274,27 @@ module.exports = grammar({
 
     flat_type: (_$) => field("flat_type", FLAT_TYPES()),
 
-    collection_type: ($) => {
-      const type_and_completion = seq(
+    _collection_annotation: ($) =>
+      seq(
         PUNC().colon,
         $._all_type,
         field("completion", optional($.param_cmd)),
-      );
-      const entry = seq(
+      ),
+    _collection_entry: ($) =>
+      seq(
         field("key", choice($.identifier, alias($.val_string, $.identifier))),
-        optional(type_and_completion),
-      );
-
-      return seq(
-        choice("record", "table"),
-        seq(
-          token.immediate(BRACK().open_angle),
-          optional(
-            general_body_rules("", entry, $._entry_separator, $._newline),
-          ),
-          BRACK().close_angle,
+        optional($._collection_annotation),
+      ),
+    collection_type: ($) => seq(
+      choice("record", "table"),
+      seq(
+        token.immediate(BRACK().open_angle),
+        optional(
+          general_body_rules("", $._collection_entry, $._entry_separator, $._newline),
         ),
-      );
-    },
+        BRACK().close_angle,
+      ),
+    ),
 
     list_type: ($) =>
       seq(