From 2d6795cb79a7872952f663a8bf85009b9873df35 Mon Sep 17 00:00:00 2001 From: Max Smirnov Date: Wed, 16 Aug 2023 07:00:13 +0300 Subject: [PATCH 1/2] Use indentable_expression in given def --- corpus/definitions.txt | 2 ++ grammar.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/corpus/definitions.txt b/corpus/definitions.txt index 57d29e01a..6d9637ccf 100644 --- a/corpus/definitions.txt +++ b/corpus/definitions.txt @@ -1226,6 +1226,8 @@ object A: given Context[T] = ctx + given Foo[Int] = + case n => "123" -------------------------------------------------------------------------------- diff --git a/grammar.js b/grammar.js index 8a344cc88..1a525e83b 100644 --- a/grammar.js +++ b/grammar.js @@ -589,7 +589,7 @@ module.exports = grammar({ seq( field("return_type", $._annotated_type), "=", - field("body", $.expression), + field("body", $._indentable_expression), ), ), ), From e76f53d7447e830ad3f39521a96ee2beb314caa0 Mon Sep 17 00:00:00 2001 From: Max Smirnov Date: Wed, 16 Aug 2023 07:06:41 +0300 Subject: [PATCH 2/2] Update definitions trees --- corpus/definitions.txt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/corpus/definitions.txt b/corpus/definitions.txt index 6d9637ccf..a9ba63be1 100644 --- a/corpus/definitions.txt +++ b/corpus/definitions.txt @@ -1334,7 +1334,16 @@ object A: (type_identifier) (type_arguments (type_identifier))) - (identifier))))) + (identifier)) + (given_definition + (generic_type + (type_identifier) + (type_arguments + (type_identifier))) + (indented_cases + (case_clause + (identifier) + (string))))))) ================================================================================ Top-level Definitions (Scala 3 syntax) @@ -1601,8 +1610,9 @@ inline given Test = (modifiers (inline_modifier)) (type_identifier) - (instance_expression - (type_identifier)))) + (indented_block + (instance_expression + (type_identifier))))) ================================================================================ Infix methods (Scala 3)