Skip to content

Commit b7cd69e

Browse files
committed
Allow end given as an end marker
Allow `end given` as an end marker for anonymous givens. These could not have an end marker before. Based on scala#7557.
1 parent 0933b9c commit b7cd69e

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3412,7 +3412,7 @@ object Parsers {
34123412
else
34133413
(EmptyTermName, isIdent(nme.extension))
34143414

3415-
val gdef = indentRegion(name) {
3415+
val gdef = indentRegion(if name.isEmpty then GIVEN else name) {
34163416
if isExtension then
34173417
if (in.token == COLON) in.nextToken()
34183418
assert(ident() == nme.extension)

compiler/src/dotty/tools/dotc/parsing/Scanners.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ object Scanners {
345345

346346
lookahead.token match {
347347
case IDENTIFIER | BACKQUOTED_IDENT => handle(lookahead.name)
348-
case IF | WHILE | FOR | MATCH | TRY | NEW => handle(lookahead.token)
348+
case IF | WHILE | FOR | MATCH | TRY | NEW | GIVEN => handle(lookahead.token)
349349
case _ =>
350350
}
351351
}

tests/pos/end-given.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
given Conversion[Int, String] with
2+
def apply(x: Int) = ""
3+
end given

0 commit comments

Comments
 (0)