Merge remote-tracking branch 'upstream/master'

Author: michelou

community-build/community-projects/Lucre

@@ -1554,14 +1554,21 @@ object desugar {
         }
       }
 
+      /** Is `pat` of the form `x`, `x T`, or `given T`? when used as the lhs of a generator,
+       *  these are all considered irrefutable.
+       */
+      def isVarBinding(pat: Tree): Boolean = pat match
+        case pat @ Bind(_, pat1) if pat.mods.is(Given) => isVarBinding(pat1)
+        case IdPattern(_) => true
+        case _ => false
+
       def needsNoFilter(gen: GenFrom): Boolean =
         if (gen.checkMode == GenCheckMode.FilterAlways) // pattern was prefixed by `case`
           false
-        else (
-          gen.checkMode != GenCheckMode.FilterNow ||
-          IdPattern.unapply(gen.pat).isDefined ||
-          isIrrefutable(gen.pat, gen.expr)
-        )
+        else
+          gen.checkMode != GenCheckMode.FilterNow
+          || isVarBinding(gen.pat)
+          || isIrrefutable(gen.pat, gen.expr)
 
       /** rhs.name with a pattern filter on rhs unless `pat` is irrefutable when
        *  matched against `rhs`.

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -257,7 +257,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
     Text(lam.paramNames.lazyZip(lam.paramInfos).map(paramText), ", ")
   }
 
-  protected def ParamRefNameString(name: Name): String = name.toString
+  protected def ParamRefNameString(name: Name): String = nameString(name)
 
   protected def ParamRefNameString(param: ParamRef): String =
     ParamRefNameString(param.binder.paramNames(param.paramNum))

compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala

@@ -20,6 +20,7 @@ import typer.ProtoTypes._
 import Trees._
 import TypeApplications._
 import Decorators._
+import NameKinds.WildcardParamName
 import util.Chars.isOperatorPart
 import transform.TypeUtils._
 import transform.SymUtils._
@@ -76,8 +77,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   }
 
   override def nameString(name: Name): String =
-    if ctx.settings.YdebugNames.value
-    then name.debugString
+    if ctx.settings.YdebugNames.value then name.debugString
+    else if name.isTypeName && name.is(WildcardParamName) && !printDebug then "_"
     else super.nameString(name)
 
   override protected def simpleNameString(sym: Symbol): String =
@@ -963,9 +964,6 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   def optText[T >: Untyped](tree: List[Tree[T]])(encl: Text => Text): Text =
     if (tree.exists(!_.isEmpty)) encl(blockText(tree)) else ""
 
-  override protected def ParamRefNameString(name: Name): String =
-    name.toString
-
   override protected def treatAsTypeParam(sym: Symbol): Boolean = sym.is(TypeParam)
 
   override protected def treatAsTypeArg(sym: Symbol): Boolean =

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -1560,9 +1560,9 @@ class Typer extends Namer
       super.transform(trt.withType(stripTypeVars(trt.tpe))) match {
         case b: Bind =>
           val sym = b.symbol
-          if (sym.name != tpnme.WILDCARD)
-            if (ctx.scope.lookup(b.name) == NoSymbol) ctx.enter(sym)
-            else report.error(new DuplicateBind(b, cdef), b.srcPos)
+          assert(sym.name != tpnme.WILDCARD)
+          if ctx.scope.lookup(b.name) == NoSymbol then ctx.enter(sym)
+          else report.error(new DuplicateBind(b, cdef), b.srcPos)
           if (!ctx.isAfterTyper) {
             val bounds = ctx.gadt.fullBounds(sym)
             if (bounds != null) sym.info = bounds
@@ -1969,8 +1969,9 @@ class Typer extends Namer
       //val ptt = if (lo.isEmpty && hi.isEmpty) pt else
       if (ctx.isAfterTyper) tree1
       else {
-        val wildcardSym = newPatternBoundSymbol(tpnme.WILDCARD, tree1.tpe & pt, tree.span)
-        untpd.Bind(tpnme.WILDCARD, tree1).withType(wildcardSym.typeRef)
+        val boundName = WildcardParamName.fresh().toTypeName
+        val wildcardSym = newPatternBoundSymbol(boundName, tree1.tpe & pt, tree.span)
+        untpd.Bind(boundName, tree1).withType(wildcardSym.typeRef)
       }
     else tree1
   }

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -68,14 +68,14 @@ object Build {
   val referenceVersion = "3.0.0-RC3"
 
   val baseVersion = "3.0.1-RC1"
-  val baseSbtDottyVersion = "0.5.5"
+  val baseSbtDottyVersion = "0.5.6"
 
   // Versions used by the vscode extension to create a new project
   // This should be the latest published releases.
   // TODO: Have the vscode extension fetch these numbers from the Internet
   // instead of hardcoding them ?
   val publishedDottyVersion = referenceVersion
-  val publishedSbtDottyVersion = "0.5.4"
+  val publishedSbtDottyVersion = "0.5.5"
 
   /** scala-library version required to compile Dotty.
    *

project/Build.scala

@@ -9,4 +9,4 @@
 -- Error: tests/neg-custom-args/kind-projector.scala:6:22 --------------------------------------------------------------
 6 |class Bar2 extends Foo[*] // error
   |                      ^
-  |                      Type argument _$4 does not have the same kind as its bound [_$1]
+  |                      Type argument _ does not have the same kind as its bound [_$1]

tests/neg-custom-args/kind-projector.check

@@ -0,0 +1,37 @@
+object Var:
+  class Expanded[T <: Txn[T], B] extends Form[T]
+
+trait Txn[T <: Txn[T]]
+
+trait Form[T]
+
+class TT extends Txn[TT]
+
+private final class FlatVarCellView[T <: Txn[T], B](
+  firstVr  : Option[Var.Expanded[TT, B]]
+)
+
+def Test =
+  val opt: Option[Form[TT]] = ???
+  val firstVr = opt match
+    case Some(ex: Var.Expanded[TT, _]) => Some(ex)
+    case _                            => None
+  new FlatVarCellView(firstVr)  // error
+   //                      Found:    (firstVr : Option[Var.Expanded[TT, ?]])
+   //                      Required: Option[Var.Expanded[TT, B]]
+   //
+   //                      where:    B is a type variable
+   //
+   // Note that we cannot do capture conversion since the `?` does not appear as an argument
+   // of the a type. It's dubious whether capture conversion for more deeply nested types
+   // would be sound.
+
+  // Remedy:
+  opt match
+    case Some(ex: Var.Expanded[TT, _]) => new FlatVarCellView(Some(ex))
+      // here, we instantiate `B` with the unnamed second parameter of `Var.Expanded`
+    case _                             => new FlatVarCellView(None)
+  opt match
+    case Some(ex: Var.Expanded[TT, t]) => new FlatVarCellView[TT, t](Some(ex))
+      // the same as above, spelt out
+    case _                             => new FlatVarCellView(None)

tests/neg/i12169.scala

@@ -61,4 +61,4 @@
 -- Error: tests/neg/i4986c.scala:62:19 ---------------------------------------------------------------------------------
 62 |  i.m[Option[Long]] // error
    |                   ^
-   |                   String; List; [A, _$6] =>> List[Option[?]]; Int; Option[Long]; 
+   |                   String; List; [A, _] =>> List[Option[?]]; Int; Option[Long]; 

tests/neg/i4986c.check

@@ -0,0 +1,13 @@
+class Property[T]
+
+class VObject {
+  def properties() = {
+    List.empty[Property[?]].collect {
+      case p: Property[?] => List(p)
+    }
+  }
+}
+
+class Event extends VObject {
+  override def properties() = ???
+}

tests/pos/i12169.scala

@@ -0,0 +1,13 @@
+import scala.compiletime.error
+
+object BadFilters:
+  inline def withFilter(f: Int => Boolean): BadFilters.type = error("Unexpected withFilter call")
+  def foreach(f: Int => Unit): Unit = f(42)
+
+@main def Test =
+  for
+    x: Int <- BadFilters
+  do println(x)
+  for
+    given Int <- BadFilters
+  do println(summon[Int])