From ce7e098a0b04de7eaddd2683db8f291c5b26ab4d Mon Sep 17 00:00:00 2001
From: susliko <1istoobig@gmail.com>
Date: Wed, 9 Aug 2023 00:40:38 +0300
Subject: [PATCH] Allow return types on new lines in definitions

Resolves #318

Summary
----
Optional trailing `$._automatic_semicolon` in `$._function_cunstructor`.
This enables correct parsing of the code like:
```scala
def foo()
  : Int = 42
given foo(using foo: Foo)
  : Foo = foo
```
---
 corpus/definitions.txt | 21 ++++++++++++++++++++-
 grammar.js             |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/corpus/definitions.txt b/corpus/definitions.txt
index b8e1e54..57d29e0 100644
--- a/corpus/definitions.txt
+++ b/corpus/definitions.txt
@@ -1078,6 +1078,9 @@ class A {
 
   def n(using a: A)
     (using B <:< B, C =:= C) = ()
+
+  def o()
+    : Int = 42
 }
 
 --------------------------------------------------------------------------------
@@ -1119,7 +1122,12 @@ class A {
             (type_identifier)
             (operator_identifier)
             (type_identifier)))
-        (unit)))))
+        (unit))
+      (function_definition
+        (identifier)
+        (parameters)
+        (type_identifier)
+        (integer_literal)))))
 
 ================================================================================
 Function definitions (Scala 3 syntax)
@@ -1208,6 +1216,9 @@ object A:
   private given listFoo[A1](using ev: CanFoo[A1]): CanFoo[List[A1]] with
     def foo(xs: List[A1]): Int = 0
 
+  given foo(using ev: Foo)
+    : Foo = ev
+
   given [T: Ordering]: Ordering[List[T]] with
     def x = ()
 
@@ -1287,6 +1298,14 @@ object A:
                     (type_identifier)))))
             (type_identifier)
             (integer_literal))))
+      (given_definition
+        (identifier)
+        (parameters
+          (parameter
+            (identifier)
+            (type_identifier)))
+        (type_identifier)
+        (identifier))
       (given_definition
         (identifier
           (MISSING _alpha_identifier))
diff --git a/grammar.js b/grammar.js
index cd9416f..4e7ce18 100644
--- a/grammar.js
+++ b/grammar.js
@@ -550,6 +550,7 @@ module.exports = grammar({
             "parameters",
             repeat(seq(optional($._automatic_semicolon), $.parameters)),
           ),
+          optional($._automatic_semicolon),
         ),
       ),