Fix rebase breakage

Author: odersky

compiler/src/dotty/tools/dotc/core/TypeComparer.scala

@@ -635,7 +635,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
 
         def isSubInfo(info1: Type, info2: Type): Boolean = (info1, info2) match
           case (info1: PolyType, info2: PolyType) =>
-            sameLength(info1.paramNames, info2.paramNames)
+            info1.paramNames.hasSameLengthAs(info2.paramNames)
             && isSubInfo(info1.resultType, info2.resultType.subst(info2, info1))
           case (info1: MethodType, info2: MethodType) =>
             matchingMethodParams(info1, info2, precise = false)

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

@@ -904,7 +904,7 @@ object Parsers {
       && {
         lookahead.observeColonEOL(inTemplate = false)
         lookahead.nextToken()
-        canStartTypeTokens.contains(lookahead.token)
+        canStartInfixTypeTokens.contains(lookahead.token)
       }
 
     /** Is current ident a `*`, and is it followed by a `)`, `, )`, `,EOF`? The latter two are not
@@ -4031,8 +4031,8 @@ object Parsers {
       stats.toList
     }
 
-    /** SelfType ::=  id [‘:’ InfixType] ‘=>’
-     *            |  ‘this’ ‘:’ InfixType ‘=>’
+    /** SelfType ::=  id [‘:’ [CaptureSet] InfixType] ‘=>’
+     *            |  ‘this’ ‘:’ [CaptureSet] InfixType ‘=>’
      */
     def selfType(): ValDef =
       if (in.isIdent || in.token == THIS)
@@ -4048,7 +4048,10 @@ object Parsers {
           val selfTpt =
             if in.isColon then
               in.nextToken()
-              infixType()
+              if in.token == LBRACE && followingIsCaptureSet() then
+                CapturingTypeTree(captureSet(), infixType())
+              else
+                infixType()
             else
               if selfName == nme.WILDCARD then accept(COLONfollow)
               TypeTree()

compiler/src/dotty/tools/dotc/transform/Recheck.scala

@@ -187,7 +187,7 @@ abstract class Recheck extends Phase, SymTransformer:
     def recheckApply(tree: Apply, pt: Type)(using Context): Type =
       recheck(tree.fun).widen match
         case fntpe: MethodType =>
-          assert(sameLength(fntpe.paramInfos, tree.args))
+          assert(fntpe.paramInfos.hasSameLengthAs(tree.args))
           val formals =
             if tree.symbol.is(JavaDefined) then mapJavaArgs(fntpe.paramInfos)
             else fntpe.paramInfos
@@ -208,7 +208,7 @@ abstract class Recheck extends Phase, SymTransformer:
     def recheckTypeApply(tree: TypeApply, pt: Type)(using Context): Type =
       recheck(tree.fun).widen match
         case fntpe: PolyType =>
-          assert(sameLength(fntpe.paramInfos, tree.args))
+          assert(fntpe.paramInfos.hasSameLengthAs(tree.args))
           val argTypes = tree.args.map(recheck(_))
           constFold(tree, fntpe.instantiate(argTypes))