From 7587923322eb75f2e058f8b4bc1391b9044ad463 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Mon, 8 Jan 2024 00:02:49 +0100
Subject: [PATCH] Disambiguate more towards new given syntax, show solution for
 #15840

Faced with

    given C[T]:
      ...

(with a new line after `:`) we now classify this as new given syntax, and assume ... is a template body.
If one wants to use old syntax, one can still write

    given C[T]
      : ImplementedType ...

# Conflicts:
#	compiler/src/dotty/tools/dotc/parsing/Parsers.scala
---
 .../dotty/tools/dotc/parsing/Parsers.scala    |  1 -
 tests/run/i15840.scala                        | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tests/run/i15840.scala

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index f8205658c1b5..dd08ffac8761 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -965,7 +965,6 @@ object Parsers {
       lookahead.isColon
       && {
         !in.featureEnabled(Feature.modularity)
-        || paramsSeen
         || { // with modularity language import, a `:` at EOL after an identifier represents a single identifier given
              // Example:
              //    given C:
diff --git a/tests/run/i15840.scala b/tests/run/i15840.scala
new file mode 100644
index 000000000000..0f238e2e7148
--- /dev/null
+++ b/tests/run/i15840.scala
@@ -0,0 +1,27 @@
+//> using options -language:experimental.modularity -source future
+
+trait Nat:
+  type N <: Nat
+
+class _0 extends Nat:
+  type N = _0
+
+class NatOps[N <: Nat](tracked val n: N):
+  def toInt(using toIntN: ToInt[n.N]): Int = toIntN()
+
+// works
+def toInt[N <: Nat](n: N)(using toIntN: ToInt[n.N]) = toIntN()
+
+sealed abstract class ToInt[N <: Nat]:
+  def apply(): Int
+
+object ToInt:
+  given ToInt[_0] {
+    def apply() = 0
+  }
+
+@main def Test() =
+  assert(toInt(new _0) == 0)
+  assert(NatOps[_0](new _0).toInt == 0)
+  assert:
+    NatOps(new _0).toInt == 0 // did not work