Refine lookahead test for given instances

Author: odersky

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

@@ -2338,21 +2338,24 @@ object Parsers {
         (ofClass || ofInstance) && {
           val lookahead = in.lookaheadScanner // skips newline on startup
           lookahead.nextToken()  // skip the `given`
-          if (lookahead.token == IDENTIFIER && lookahead.name != nme.as ||
-              lookahead.token == BACKQUOTED_IDENT) {
-            lookahead.nextToken()
-            if (lookahead.token == LBRACKET) {
+          if (lookahead.token == LBRACKET) true
+          else {
+            if (lookahead.token == IDENTIFIER && lookahead.name != nme.as ||
+                   lookahead.token == BACKQUOTED_IDENT) {
               lookahead.nextToken()
-              var openBrackets = 1
-              while (openBrackets > 0 && lookahead.token != EOF) {
-                if (lookahead.token == LBRACKET) openBrackets += 1
-                else if (lookahead.token == RBRACKET) openBrackets -= 1
+              if (lookahead.token == LBRACKET) {
                 lookahead.nextToken()
+                var openBrackets = 1
+                while (openBrackets > 0 && lookahead.token != EOF) {
+                  if (lookahead.token == LBRACKET) openBrackets += 1
+                  else if (lookahead.token == RBRACKET) openBrackets -= 1
+                  lookahead.nextToken()
+                }
               }
             }
+            lookahead.token == FOR ||
+            lookahead.token == IDENTIFIER && lookahead.name == nme.as
           }
-          lookahead.token == FOR ||
-          lookahead.token == IDENTIFIER && lookahead.name == nme.as
         }
 
       def recur(firstClause: Boolean, nparams: Int, contextualOnly: Boolean): List[List[ValDef]] = {

tests/pos/givens.scala

@@ -0,0 +1,17 @@
+class A
+class B
+
+given as A
+given as B
+
+trait Foo
+trait Bar
+
+given as Foo
+given as Bar
+
+trait C
+trait Baz[A]
+
+given as C
+given [A] as Baz[A]