From 9787a8b072802b3ba5777c218f47b4e87ee08f32 Mon Sep 17 00:00:00 2001 From: Taus Date: Wed, 13 May 2026 13:51:25 +0000 Subject: [PATCH] unified: Group enum entries Same as in the preceding commit. --- unified/extractor/tree-sitter-swift/grammar.js | 13 ++++++------- unified/extractor/tree-sitter-swift/node-types.yml | 8 +++++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/unified/extractor/tree-sitter-swift/grammar.js b/unified/extractor/tree-sitter-swift/grammar.js index 385aeb4d867..8b6bf33b62e 100644 --- a/unified/extractor/tree-sitter-swift/grammar.js +++ b/unified/extractor/tree-sitter-swift/grammar.js @@ -1681,15 +1681,14 @@ module.exports = grammar({ field("modifiers", optional($.modifiers)), optional("indirect"), "case", - sep1( - seq( - field("name", $.simple_identifier), - optional($._enum_entry_suffix) - ), - "," - ), + sep1(field("case", $.enum_case_entry), ","), optional(";") ), + enum_case_entry: ($) => + seq( + field("name", $.simple_identifier), + optional($._enum_entry_suffix) + ), _enum_entry_suffix: ($) => choice( field("data_contents", $.enum_type_parameters), diff --git a/unified/extractor/tree-sitter-swift/node-types.yml b/unified/extractor/tree-sitter-swift/node-types.yml index 64e69142fb0..8f136ead220 100644 --- a/unified/extractor/tree-sitter-swift/node-types.yml +++ b/unified/extractor/tree-sitter-swift/node-types.yml @@ -271,13 +271,15 @@ named: body: block catch*: catch_block else: + enum_case_entry: + data_contents?: enum_type_parameters + name: simple_identifier + raw_value?: expression enum_class_body: member*: [enum_entry, type_level_declaration] enum_entry: - data_contents*: enum_type_parameters + case+: enum_case_entry modifiers?: modifiers - name+: simple_identifier - raw_value*: expression enum_type_parameter: default_value?: expression external_name?: wildcard_pattern