From 3a5c285357bf3f05bf4d536e08bdfe1310f7b9f8 Mon Sep 17 00:00:00 2001
From: Alex Manning <alex41290@gmail.com>
Date: Fri, 7 Feb 2025 09:26:13 -0500
Subject: [PATCH] fix(functions): remove function body alias and use block
 (#111)

---
 grammar.js                    | 14 ++----
 test/corpus/attributes.txt    |  6 +--
 test/corpus/cases.txt         |  2 +-
 test/corpus/destructuring.txt |  4 +-
 test/corpus/echo.txt          | 10 ++---
 test/corpus/functions.txt     | 83 ++++++++++++++++++-----------------
 test/corpus/whole_files.txt   |  6 +--
 7 files changed, 59 insertions(+), 66 deletions(-)

diff --git a/grammar.js b/grammar.js
index e51f98b..71a14cb 100644
--- a/grammar.js
+++ b/grammar.js
@@ -255,13 +255,7 @@ module.exports = grammar({
           field("name", $.identifier),
           field("parameters", $.function_parameters),
           optional(seq("->", field("return_type", $._type))),
-          optional(
-            seq(
-              "{",
-              optional(field("body", alias($._statement_seq, $.function_body))),
-              "}"
-            )
-          )
+          optional(field("body", $.block))
         )
       ),
     function_parameters: ($) =>
@@ -406,9 +400,7 @@ module.exports = grammar({
           alias($.anonymous_function_parameters, $.function_parameters)
         ),
         optional(seq("->", field("return_type", $._type))),
-        "{",
-        field("body", alias($._statement_seq, $.function_body)),
-        "}"
+        field("body", $.block)
       ),
     anonymous_function_parameters: ($) =>
       seq(
@@ -426,7 +418,7 @@ module.exports = grammar({
         choice($._discard_param, $._name_param),
         optional($._type_annotation)
       ),
-    block: ($) => seq("{", $._statement_seq, "}"),
+    block: ($) => seq("{", optional($._statement_seq), "}"),
     case: ($) =>
       seq(
         "case",
diff --git a/test/corpus/attributes.txt b/test/corpus/attributes.txt
index a630f7a..d0314cf 100644
--- a/test/corpus/attributes.txt
+++ b/test/corpus/attributes.txt
@@ -17,7 +17,7 @@ pub fn main() { todo }
     (visibility_modifier)
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (todo))))
 
 ================================================================================
@@ -44,7 +44,7 @@ pub fn wibble() { todo }
     (visibility_modifier)
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (todo))))
 
 ================================================================================
@@ -63,5 +63,5 @@ pub fn wibble() { todo }
     (visibility_modifier)
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (todo))))
diff --git a/test/corpus/cases.txt b/test/corpus/cases.txt
index 4085dfd..d342420 100644
--- a/test/corpus/cases.txt
+++ b/test/corpus/cases.txt
@@ -68,7 +68,7 @@ pub fn listed(names: List(String), person: Person) -> String {
           (type_identifier))))
     (type
       (type_identifier))
-    (function_body
+    (block
       (case
         (case_subjects
           (identifier))
diff --git a/test/corpus/destructuring.txt b/test/corpus/destructuring.txt
index 2312a6a..6d6920e 100644
--- a/test/corpus/destructuring.txt
+++ b/test/corpus/destructuring.txt
@@ -16,7 +16,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (case
         (case_subjects
           (identifier))
@@ -64,7 +64,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (let
         (record_pattern
           (constructor_name)
diff --git a/test/corpus/echo.txt b/test/corpus/echo.txt
index 454d46c..f3e9f99 100644
--- a/test/corpus/echo.txt
+++ b/test/corpus/echo.txt
@@ -13,7 +13,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (echo
         (integer)))))
 
@@ -34,7 +34,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (binary_expression
         (binary_expression
           (list)
@@ -59,7 +59,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (binary_expression
         (list)
         (pipeline_echo))
@@ -81,7 +81,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (echo
         (binary_expression
           (integer)
@@ -104,7 +104,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (echo
         (binary_expression
           (integer)
diff --git a/test/corpus/functions.txt b/test/corpus/functions.txt
index 11c6187..0081682 100644
--- a/test/corpus/functions.txt
+++ b/test/corpus/functions.txt
@@ -35,7 +35,7 @@ fn replace(
           name: (type_identifier))))
     return_type: (type
       name: (type_identifier))
-    body: (function_body
+    body: (block
       (binary_expression
         left: (identifier)
         right: (identifier))))
@@ -52,7 +52,7 @@ fn replace(
         name: (identifier)
         type: (type_var)))
     return_type: (type_var)
-    body: (function_body
+    body: (block
       (function_call
         function: (identifier)
         arguments: (arguments
@@ -67,7 +67,7 @@ fn replace(
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (identifier)))
   (function
     name: (identifier)
@@ -87,7 +87,7 @@ fn replace(
         name: (identifier)
         type: (type
           name: (type_identifier))))
-    body: (function_body
+    body: (block
       (function_call
         function: (field_access
           record: (identifier)
@@ -141,7 +141,7 @@ pub fn replace(
           name: (type_identifier))))
     return_type: (type
       name: (type_identifier))
-    body: (function_body
+    body: (block
       (binary_expression
         left: (identifier)
         right: (identifier))))
@@ -159,7 +159,7 @@ pub fn replace(
         name: (identifier)
         type: (type_var)))
     return_type: (type_var)
-    body: (function_body
+    body: (block
       (function_call
         function: (identifier)
         arguments: (arguments
@@ -175,7 +175,7 @@ pub fn replace(
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (identifier)))
   (function
     (visibility_modifier)
@@ -196,7 +196,7 @@ pub fn replace(
         name: (identifier)
         type: (type
           name: (type_identifier))))
-    body: (function_body
+    body: (block
       (function_call
         function: (field_access
           record: (identifier)
@@ -313,27 +313,28 @@ fn field_access(x) {
 (source_file
   (function
     name: (identifier)
-    parameters: (function_parameters))
+    parameters: (function_parameters)
+    body: (block))
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (string
         (quoted_content))))
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (integer)))
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (float)))
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (record
         name: (constructor_name)
         arguments: (arguments
@@ -344,7 +345,7 @@ fn field_access(x) {
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (record
         name: (remote_constructor_name
           module: (identifier)
@@ -359,26 +360,26 @@ fn field_access(x) {
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (identifier)))
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (function_call
         function: (identifier)
         arguments: (arguments))))
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (todo
         message: (string
           (quoted_content)))))
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (panic)
       (panic
         message: (string
@@ -388,7 +389,7 @@ fn field_access(x) {
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (tuple
         (identifier)
         (integer))))
@@ -397,7 +398,7 @@ fn field_access(x) {
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (list
         (integer)
         (integer)
@@ -405,7 +406,7 @@ fn field_access(x) {
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (bit_string
         (bit_string_segment
           value: (integer)
@@ -424,21 +425,21 @@ fn field_access(x) {
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (anonymous_function
         parameters: (function_parameters
           (function_parameter
             name: (identifier)
             type: (type
               name: (type_identifier))))
-        body: (function_body
+        body: (block
           (binary_expression
             left: (identifier)
             right: (identifier))))))
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (block
         (binary_expression
           left: (integer)
@@ -452,7 +453,7 @@ fn field_access(x) {
         name: (identifier))
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (case
         subjects: (case_subjects
           (identifier)
@@ -477,7 +478,7 @@ fn field_access(x) {
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (let_assert
         pattern: (record_pattern
           name: (constructor_name)
@@ -532,7 +533,7 @@ fn field_access(x) {
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (let
         pattern: (identifier)
         value: (block
@@ -554,7 +555,7 @@ fn field_access(x) {
   (function
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (assert
         pattern: (record_pattern
           name: (constructor_name)
@@ -589,7 +590,7 @@ fn field_access(x) {
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (record_update
         constructor: (constructor_name)
         spread: (identifier)
@@ -623,7 +624,7 @@ fn field_access(x) {
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (tuple_access
         tuple: (identifier)
         index: (integer))))
@@ -632,7 +633,7 @@ fn field_access(x) {
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (field_access
         record: (identifier)
         field: (label)))))
@@ -676,7 +677,7 @@ fn trial(x, y, z) {
         name: (identifier))
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (case
         subjects: (case_subjects
           (identifier))
@@ -812,7 +813,7 @@ let fun_ref = float.to_string
       parameters: (function_parameters
         (function_parameter
           name: (identifier)))
-      body: (function_body
+      body: (block
         (identifier))))
   (let
     pattern: (identifier)
@@ -838,7 +839,7 @@ fn complicated(x, y) {
         name: (identifier))
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (binary_expression
         left: (binary_expression
           left: (binary_expression
@@ -882,7 +883,7 @@ fn complex_data_fun(x, y) {
         name: (identifier))
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (field_access
         record: (tuple_access
           tuple: (field_access
@@ -950,7 +951,7 @@ fn weird(x) {
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (function_call
         function: (identifier)
         arguments: (arguments
@@ -963,7 +964,7 @@ fn weird(x) {
           parameters: (function_parameters
             (function_parameter
               name: (identifier)))
-          body: (function_body
+          body: (block
             (binary_expression
               left: (identifier)
               right: (integer))))
@@ -978,7 +979,7 @@ fn weird(x) {
               parameters: (function_parameters
                 (function_parameter
                   name: (identifier)))
-              body: (function_body
+              body: (block
                 (binary_expression
                   left: (identifier)
                   right: (integer))))))
@@ -998,7 +999,7 @@ fn weird(x) {
                 parameters: (function_parameters
                   (function_parameter
                     name: (identifier)))
-                body: (function_body
+                body: (block
                   (binary_expression
                     left: (identifier)
                     right: (integer)))))))
@@ -1034,7 +1035,7 @@ fn ignores(foo, _bar) {
         name: (identifier))
       (function_parameter
         name: (discard)))
-    body: (function_body
+    body: (block
       (let
         pattern: (discard)
         value: (integer))
@@ -1065,7 +1066,7 @@ fn lists(x) {
     parameters: (function_parameters
       (function_parameter
         name: (identifier)))
-    body: (function_body
+    body: (block
       (list)
       (list
         (integer))
diff --git a/test/corpus/whole_files.txt b/test/corpus/whole_files.txt
index 2681b80..c0f9b77 100644
--- a/test/corpus/whole_files.txt
+++ b/test/corpus/whole_files.txt
@@ -48,7 +48,7 @@ if javascript {
           name: (type_identifier))))
     return_type: (type
       name: (type_identifier))
-    body: (function_body
+    body: (block
       (let
         pattern: (identifier)
         value: (function_call
@@ -184,7 +184,7 @@ pub fn negate(bool: Bool) -> Bool {
           name: (type_identifier))))
     return_type: (type
       name: (type_identifier))
-    body: (function_body
+    body: (block
       (case
         subjects: (case_subjects
           (identifier))
@@ -290,7 +290,7 @@ fn foo(a,) {
     (function_parameters
       (function_parameter
         (identifier)))
-    (function_body
+    (block
       (function_call
         (identifier)
         (arguments