Merge pull request #5973 from dotty-staging/fix-#5966

Fix #5966: Narrow criterion for when we have an inserted apply

Author: smarter

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

@@ -432,7 +432,7 @@ object Trees {
     extends GenericApply[T] {
     type ThisTree[-T >: Untyped] = Apply[T]
 
-    def isContextual = getAttachment(untpd.WithApply).nonEmpty
+    def isContextual = getAttachment(untpd.ApplyGiven).nonEmpty
   }
 
   /** fun[args] */

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

@@ -274,8 +274,8 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
    */
   val OriginalSymbol: Property.Key[Symbol] = new Property.Key
 
-  /** Property key for contextual Apply trees of the form `fn with arg` */
-  val WithApply: Property.StickyKey[Unit] = new Property.StickyKey
+  /** Property key for contextual Apply trees of the form `fn given arg` */
+  val ApplyGiven: Property.StickyKey[Unit] = new Property.StickyKey
 
   // ------ Creation methods for untyped only -----------------
 

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

@@ -548,7 +548,7 @@ object Parsers {
             val args = if (in.token == LPAREN) parArgumentExprs() else operand() :: Nil
             Apply(top, args)
           }
-          app.pushAttachment(WithApply, ())
+          app.pushAttachment(ApplyGiven, ())
           recur(app)
         }
         else reduceStack(base, top, minPrec, leftAssoc = true, in.name, isType)

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

@@ -232,7 +232,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
           case dummyTreeOfType(tp) :: Nil if !(tp isRef defn.NullClass) => "null: " ~ toText(tp)
           case _ => toTextGlobal(args, ", ")
         }
-        return "FunProto(" ~ argsText ~ "):" ~ toText(resultType)
+        return "FunProto(" ~ (Str("given ") provided tp.isContextual) ~ argsText ~ "):" ~ toText(resultType)
       case IgnoredProto(ignored) =>
         return "?" ~ (("(ignored: " ~ toText(ignored) ~ ")") provided ctx.settings.verbose.value)
       case tp @ PolyProto(targs, resType) =>

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

@@ -218,7 +218,7 @@ object EtaExpansion extends LiftImpure {
     if (mt.paramInfos.nonEmpty && mt.paramInfos.last.isRepeatedParam)
       ids = ids.init :+ repeated(ids.last)
     var body: Tree = Apply(lifted, ids)
-    if (mt.isContextual) body.pushAttachment(WithApply, ())
+    if (mt.isContextual) body.pushAttachment(ApplyGiven, ())
     if (!isLastApplication) body = PostfixOp(body, Ident(nme.WILDCARD))
     val fn =
       if (mt.isContextual) new untpd.FunctionWithMods(params, body, Modifiers(Implicit | Given))

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

@@ -2200,15 +2200,13 @@ class Typer extends Namer
    *  with `fallBack` otherwise. `fallBack` is supposed to always give an error.
    */
   def tryInsertApplyOrImplicit(tree: Tree, pt: ProtoType, locked: TypeVars)(fallBack: => Tree)(implicit ctx: Context): Tree = {
-
     def isMethod(tree: Tree) = tree.tpe match {
       case ref: TermRef => ref.denot.alternatives.forall(_.info.widen.isInstanceOf[MethodicType])
       case _ => false
     }
 
     def isSyntheticApply(tree: Tree): Boolean = tree match {
       case tree: Select => tree.getAttachment(InsertedApply).isDefined
-      case Apply(fn, _) => fn.getAttachment(InsertedApply).isDefined
       case _ => false
     }