unified: Clean up statements/block mess

Introduces (by making it named) a `block` node, and conversely makes
`statements` anonymous. This enables us to sensibly distinguish between
the "then" and "else" branch of an `if_statement`, which we were not
able to previously.

Author: tausbn

unified/extractor/tree-sitter-swift/grammar.js

@@ -979,7 +979,7 @@ module.exports = grammar({
         seq(
           choice("{", "^{"),
           optional($._lambda_type_declaration),
-          field("body", optional($.statements)),
+          optional($._statements),
           "}"
         )
       ),
@@ -1041,14 +1041,14 @@ module.exports = grammar({
       ),
     self_expression: ($) => "self",
     super_expression: ($) => seq("super"),
-    _else_options: ($) => choice($._block, field("else_branch", $.if_statement)),
+    _else_options: ($) => choice(field("else_branch", $.block), field("else_branch", $.if_statement)),
     if_statement: ($) =>
       prec.right(
         PRECS["if"],
         seq(
           "if",
           sep1(field("condition", $.if_condition), ","),
-          $._block,
+          field("body", $.block),
           optional(seq(field("else_keyword", $["else"]), $._else_options))
         )
       ),
@@ -1067,7 +1067,7 @@ module.exports = grammar({
           "guard",
           sep1(field("condition", $.if_condition), ","),
           field("else_keyword", $["else"]),
-          $._block
+          field("body", $.block)
         )
       ),
     switch_statement: ($) =>
@@ -1094,18 +1094,18 @@ module.exports = grammar({
           field("default", $.default_keyword)
         ),
         ":",
-        field("body", $.statements),
+        $._statements,
         optional("fallthrough")
       ),
     switch_pattern: ($) => field("pattern", alias($._binding_pattern_with_expr, $.pattern)),
     do_statement: ($) =>
-      prec.right(PRECS["do"], seq("do", $._block, repeat(field("catch", $.catch_block)))),
+      prec.right(PRECS["do"], seq("do", field("body", $.block), repeat(field("catch", $.catch_block)))),
     catch_block: ($) =>
       seq(
         field("keyword", $.catch_keyword),
         field("error", optional(alias($._binding_pattern_no_expr, $.pattern))),
         field("where", optional($.where_clause)),
-        $._block
+        field("body", $.block)
       ),
     where_clause: ($) => prec.left(seq(field("keyword", $.where_keyword), field("expr", $.expression))),
     key_path_expression: ($) =>
@@ -1181,7 +1181,7 @@ module.exports = grammar({
     ////////////////////////////////
     // Statements - https://docs.swift.org/swift-book/ReferenceManual/Statements.html
     ////////////////////////////////
-    statements: ($) =>
+    _statements: ($) =>
       prec.left(
         // Left precedence is required in switch statements
         seq(
@@ -1204,7 +1204,7 @@ module.exports = grammar({
         $._labeled_statement,
         $._throw_statement
       ),
-    _block: ($) => prec(PRECS.block, seq("{", field("body", optional($.statements)), "}")),
+    block: ($) => prec(PRECS.block, seq("{", optional($._statements), "}")),
     _labeled_statement: ($) =>
       seq(
         optional($.statement_label),
@@ -1231,7 +1231,7 @@ module.exports = grammar({
           "in",
           field("collection", $._for_statement_collection),
           field("where", optional($.where_clause)),
-          $._block
+          field("body", $.block)
         )
       ),
     _for_statement_collection: ($) =>
@@ -1248,19 +1248,15 @@ module.exports = grammar({
         seq(
           "while",
           sep1(field("condition", $.if_condition), ","),
-          "{",
-          field("body", optional($.statements)),
-          "}"
+          field("body", $.block)
         )
       ),
     repeat_while_statement: ($) =>
       prec(
         PRECS.loop,
         seq(
           "repeat",
-          "{",
-          field("body", optional($.statements)),
-          "}",
+          field("body", $.block),
           // Make sure we make it to the `while` before assuming this is a parameter pack.
           repeat($._implicit_semi),
           "while",
@@ -1443,14 +1439,14 @@ module.exports = grammar({
         field("modifiers", optional($.modifiers)),
         "willSet",
         optional(seq("(", field("parameter", $.simple_identifier), ")")),
-        $._block
+        field("body", $.block)
       ),
     didset_clause: ($) =>
       seq(
         field("modifiers", optional($.modifiers)),
         "didSet",
         optional(seq("(", field("parameter", $.simple_identifier), ")")),
-        $._block
+        field("body", $.block)
       ),
     typealias_declaration: ($) =>
       seq(field("modifiers", optional($.modifiers)), $._modifierless_typealias_declaration),
@@ -1464,13 +1460,13 @@ module.exports = grammar({
       ),
     function_declaration: ($) =>
       prec.right(
-        seq($._bodyless_function_declaration, field("body", $.function_body))
+        seq($._bodyless_function_declaration, field("body", $.block))
       ),
     _modifierless_function_declaration: ($) =>
       prec.right(
         seq(
           $._modifierless_function_declaration_no_body,
-          field("body", $.function_body)
+          field("body", $.block)
         )
       ),
     _bodyless_function_declaration: ($) =>
@@ -1496,7 +1492,6 @@ module.exports = grammar({
           field("type_constraints", optional($.type_constraints))
         )
       ),
-    function_body: ($) => $._block,
     macro_declaration: ($) =>
       seq(
         $._macro_head,
@@ -1742,7 +1737,7 @@ module.exports = grammar({
     protocol_function_declaration: ($) =>
       seq(
         $._bodyless_function_declaration,
-        optional(field("body", $.function_body))
+        optional(field("body", $.block))
       ),
     init_declaration: ($) =>
       prec.right(
@@ -1756,12 +1751,12 @@ module.exports = grammar({
           field("async", optional($._async_keyword)),
           field("throws", optional(choice($.throws_clause, $.throws))),
           field("type_constraints", optional($.type_constraints)),
-          optional(field("body", $.function_body))
+          optional(field("body", $.block))
         )
       ),
     deinit_declaration: ($) =>
       prec.right(
-        seq(field("modifiers", optional($.modifiers)), "deinit", field("body", $.function_body))
+        seq(field("modifiers", optional($.modifiers)), "deinit", field("body", $.block))
       ),
     subscript_declaration: ($) =>
       prec.right(
@@ -1784,23 +1779,23 @@ module.exports = grammar({
       seq(
         "{",
         choice(
-          field("body", optional($.statements)),
+          optional($._statements),
           repeat(
             field("accessor", choice($.computed_getter, $.computed_setter, $.computed_modify))
           )
         ),
         "}"
       ),
     computed_getter: ($) =>
-      seq(repeat(field("attribute", $.attribute)), field("specifier", $.getter_specifier), optional($._block)),
+      seq(repeat(field("attribute", $.attribute)), field("specifier", $.getter_specifier), optional(field("body", $.block))),
     computed_modify: ($) =>
-      seq(repeat(field("attribute", $.attribute)), field("specifier", $.modify_specifier), optional($._block)),
+      seq(repeat(field("attribute", $.attribute)), field("specifier", $.modify_specifier), optional(field("body", $.block))),
     computed_setter: ($) =>
       seq(
         repeat(field("attribute", $.attribute)),
         field("specifier", $.setter_specifier),
         optional(seq("(", field("parameter", $.simple_identifier), ")")),
-        optional($._block)
+        optional(field("body", $.block))
       ),
     getter_specifier: ($) =>
       seq(field("mutation", optional($.mutation_modifier)), "get", optional($._getter_effects)),

unified/extractor/tree-sitter-swift/node-types.yml

@@ -155,6 +155,8 @@ named:
     lhs: expression
     op: ["&", "<<", ">>", "^", "|"]
     rhs: expression
+  block:
+    statement*: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
   boolean_literal:
   call_expression:
     function: expression
@@ -174,7 +176,7 @@ named:
     name: simple_identifier
     type?: user_type
   catch_block:
-    body?: statements
+    body: block
     error?: pattern
     keyword: catch_keyword
     where?: where_clause
@@ -209,18 +211,18 @@ named:
     version*: integer_literal
   computed_getter:
     attribute*: attribute
-    body?: statements
+    body?: block
     specifier: getter_specifier
   computed_modify:
     attribute*: attribute
-    body?: statements
+    body?: block
     specifier: modify_specifier
   computed_property:
     accessor*: [computed_getter, computed_modify, computed_setter]
-    body?: statements
+    statement*: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
   computed_setter:
     attribute*: attribute
-    body?: statements
+    body?: block
     parameter?: simple_identifier
     specifier: setter_specifier
   conjunction_expression:
@@ -240,7 +242,7 @@ named:
   custom_operator:
   default_keyword:
   deinit_declaration:
-    body: function_body
+    body: block
     modifiers?: modifiers
   deprecated_operator_declaration_body:
     entry*: [bin_literal, boolean_literal, hex_literal, integer_literal, line_string_literal, multi_line_string_literal, "nil", oct_literal, raw_string_literal, real_literal, regex_literal, simple_identifier]
@@ -252,7 +254,7 @@ named:
     key: type
     value: type
   didset_clause:
-    body?: statements
+    body: block
     modifiers?: modifiers
     parameter?: simple_identifier
   directive:
@@ -264,7 +266,7 @@ named:
     op: "||"
     rhs: expression
   do_statement:
-    body?: statements
+    body: block
     catch*: catch_block
   else:
   enum_class_body:
@@ -294,19 +296,17 @@ named:
   external_macro_definition:
     arguments: value_arguments
   for_statement:
-    body?: statements
+    body: block
     collection: expression
     item: pattern
     try?: try_operator
     type?: type_annotation
     where?: where_clause
   fully_open_range:
-  function_body:
-    body?: statements
   function_declaration:
     async?: "async"
     attribute*: attribute
-    body: function_body
+    body: block
     default_value*: expression
     modifiers*: [attribute, inheritance_modifier, modifiers, ownership_modifier, property_behavior_modifier]
     name: [referenceable_operator, simple_identifier]
@@ -325,7 +325,7 @@ named:
     effect*: [async_keyword, throws, throws_clause]
     mutation?: mutation_modifier
   guard_statement:
-    body?: statements
+    body: block
     condition+: if_condition
     else_keyword: else
   hex_literal:
@@ -339,9 +339,9 @@ named:
     value?: expression
     where?: where_clause
   if_statement:
-    body*: statements
+    body: block
     condition+: if_condition
-    else_branch?: if_statement
+    else_branch?: [block, if_statement]
     else_keyword?: else
   implicitly_unwrapped_type:
     name: type
@@ -363,7 +363,7 @@ named:
     async?: "async"
     attribute*: attribute
     bang?: bang
-    body?: function_body
+    body?: block
     default_value*: expression
     modifiers?: modifiers
     name: "init"
@@ -397,8 +397,8 @@ named:
     parameter+: lambda_parameter
   lambda_literal:
     attribute*: attribute
-    body?: statements
     captures?: capture_list
+    statement*: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
     type?: lambda_function_type
   lambda_parameter:
     external_name?: simple_identifier
@@ -528,7 +528,7 @@ named:
   protocol_function_declaration:
     async?: "async"
     attribute*: attribute
-    body?: function_body
+    body?: block
     default_value*: expression
     modifiers?: modifiers
     name: [referenceable_operator, simple_identifier]
@@ -565,7 +565,7 @@ named:
     operator: ["!=", "!==", "%", "%=", "&", "*", "*=", "+", "++", "+=", "-", "--", "-=", "/", "/=", "<", "<<", "<=", "=", "==", "===", ">", ">=", ">>", "^", bang, custom_operator, "|", "~"]
   regex_literal:
   repeat_while_statement:
-    body?: statements
+    body: block
     condition+: if_condition
   selector_expression:
     expr: expression
@@ -582,8 +582,6 @@ named:
     statement*: [do_statement, expression, for_statement, global_declaration, guard_statement, repeat_while_statement, statement_label, throw_keyword, while_statement]
   special_literal:
   statement_label:
-  statements:
-    statement+: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
   str_escaped_char:
   subscript_declaration:
     attribute*: attribute
@@ -598,10 +596,10 @@ named:
   suppressed_constraint:
     suppressed: type_identifier
   switch_entry:
-    body: statements
     default?: default_keyword
     modifiers?: modifiers
     pattern*: switch_pattern
+    statement+: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
     where?: where_clause
   switch_pattern:
     pattern: pattern
@@ -694,11 +692,11 @@ named:
     keyword: where_keyword
   where_keyword:
   while_statement:
-    body?: statements
+    body: block
     condition+: if_condition
   wildcard_pattern:
   willset_clause:
-    body?: statements
+    body: block
     modifiers?: modifiers
     parameter?: simple_identifier
   willset_didset_block: