Add note about type mismatch in automatically inserted apply argument

mbovel · WojciechMazur · commit 03681c50c19c · 2024-07-06T16:25:49.000+02:00
Co-Authored-By: Jan-Pieter van den Heuvel <1197006+jan-pieter@users.noreply.github.com> Co-Authored-By: Lucas Nouguier <lucas.nouguier@protonmail.com> [Cherry-picked 2c70f3d]
diff --git a/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala b/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala
@@ -18,6 +18,9 @@ class ExploringReporter extends StoreReporter(null, fromTyperState = false):
   override def removeBufferedMessages(using Context): List[Diagnostic] =
     try infos.toList finally reset()
 
+  override def mapBufferedMessages(f: Diagnostic => Diagnostic)(using Context): Unit =
+    infos.mapInPlace(f)
+
   def reset(): Unit = infos.clear()
 
-end ExploringReporter
+end ExploringReporter
diff --git a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala
@@ -270,6 +270,9 @@ abstract class Reporter extends interfaces.ReporterResult {
   /** If this reporter buffers messages, remove and return all buffered messages. */
   def removeBufferedMessages(using Context): List[Diagnostic] = Nil
 
+  /** If this reporter buffers messages, apply `f` to all buffered messages. */
+  def mapBufferedMessages(f: Diagnostic => Diagnostic)(using Context): Unit = ()
+
   /** Issue all messages in this reporter to next outer one, or make sure they are written. */
   def flush()(using Context): Unit =
     val msgs = removeBufferedMessages
diff --git a/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala b/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala
@@ -21,7 +21,7 @@ class StoreReporter(outer: Reporter | Null = Reporter.NoReporter, fromTyperState
 
   protected var infos: mutable.ListBuffer[Diagnostic] | Null = null
 
-  def doReport(dia: Diagnostic)(using Context): Unit = {
+  override def doReport(dia: Diagnostic)(using Context): Unit = {
     typr.println(s">>>> StoredError: ${dia.message}") // !!! DEBUG
     if (infos == null) infos = new mutable.ListBuffer
     infos.uncheckedNN += dia
@@ -37,6 +37,9 @@ class StoreReporter(outer: Reporter | Null = Reporter.NoReporter, fromTyperState
     if (infos != null) try infos.uncheckedNN.toList finally infos = null
     else Nil
 
+  override def mapBufferedMessages(f: Diagnostic => Diagnostic)(using Context): Unit =
+    if infos != null then infos.uncheckedNN.mapInPlace(f)
+
   override def pendingMessages(using Context): List[Diagnostic] =
     if (infos != null) infos.uncheckedNN.toList else Nil
 
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -287,7 +287,7 @@ extends NotFoundMsg(MissingIdentID) {
   }
 }
 
-class TypeMismatch(val found: Type, expected: Type, inTree: Option[untpd.Tree], addenda: => String*)(using Context)
+class TypeMismatch(val found: Type, expected: Type, val inTree: Option[untpd.Tree], addenda: => String*)(using Context)
   extends TypeMismatchMsg(found, expected)(TypeMismatchID):
 
   def msg(using Context) =
diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -1080,7 +1080,37 @@ trait Applications extends Compatibility {
               simpleApply(fun1, proto)
             } {
               (failedVal, failedState) =>
-                def fail = { failedState.commit(); failedVal }
+                def fail =
+                  insertedApplyNote()
+                  failedState.commit()
+                  failedVal
+
+                /** If the applied function is an automatically inserted `apply`
+                  * method and one of its arguments has a type mismatch , append
+                  * a note to the error message that explains where the required
+                  * type comes from. See #19680 and associated test case.
+                  */
+                def insertedApplyNote() =
+                  if fun1.symbol.name == nme.apply && fun1.span.isSynthetic then
+                    fun1 match
+                      case Select(qualifier, _) =>
+                        failedState.reporter.mapBufferedMessages:
+                          case dia: Diagnostic.Error =>
+                            dia.msg match
+                              case msg: TypeMismatch =>
+                                msg.inTree match
+                                  case Some(arg) if tree.args.exists(_.span == arg.span) =>
+                                    val Select(qualifier, _) = fun1: @unchecked
+                                    val noteText =
+                                      i"""The required type comes from a parameter of the automatically
+                                         |inserted `apply` method of `${qualifier.tpe}`,
+                                         |which is the type of `${qualifier.show}`.""".stripMargin
+                                    Diagnostic.Error(msg.appendExplanation("\n\n" + noteText), dia.pos)
+                                  case _ => dia
+                              case msg => dia
+                          case dia => dia
+                      case _ => ()
+
                 // Try once with original prototype and once (if different) with tupled one.
                 // The reason we need to try both is that the decision whether to use tupled
                 // or not was already taken but might have to be revised when an implicit
diff --git a/tests/neg/19680.check b/tests/neg/19680.check
@@ -0,0 +1,24 @@
+-- [E007] Type Mismatch Error: tests/neg/19680.scala:9:67 --------------------------------------------------------------
+9 |def renderWidget(using Config): Unit = renderWebsite("/tmp")(Config()) // error: found Config, required Int
+  |                                                             ^^^^^^^^
+  |                                                             Found:    Config
+  |                                                             Required: Int
+  |---------------------------------------------------------------------------------------------------------------------
+  | Explanation (enabled by `-explain`)
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |
+  | Tree: new Config()
+  | I tried to show that
+  |   Config
+  | conforms to
+  |   Int
+  | but none of the attempts shown below succeeded:
+  |
+  |   ==> Config  <:  Int  = false
+  |
+  | The tests were made under the empty constraint
+  |
+  | The required type comes from a parameter of the automatically
+  | inserted `apply` method of `scala.collection.StringOps`,
+  | which is the type of `augmentString(renderWebsite("/tmp")(x$1))`.
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/19680.scala b/tests/neg/19680.scala
@@ -0,0 +1,9 @@
+//> using options -explain
+
+// Tests that the error message indicates that the required type `Int` comes
+// from the automatically inserted `apply` method of `String`. This note is
+// inserted by `insertedApplyNote` in `Applications`.
+
+class Config()
+def renderWebsite(path: String)(using config: Config): String = ???
+def renderWidget(using Config): Unit = renderWebsite("/tmp")(Config()) // error: found Config, required Int
diff --git a/tests/neg/19680b.check b/tests/neg/19680b.check
@@ -0,0 +1,25 @@
+-- [E007] Type Mismatch Error: tests/neg/19680b.scala:2:21 -------------------------------------------------------------
+2 |def Test = List(1,2)("hello") // error: found String, required Int
+  |                     ^^^^^^^
+  |                     Found:    ("hello" : String)
+  |                     Required: Int
+  |---------------------------------------------------------------------------------------------------------------------
+  | Explanation (enabled by `-explain`)
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |
+  | Tree: "hello"
+  | I tried to show that
+  |   ("hello" : String)
+  | conforms to
+  |   Int
+  | but none of the attempts shown below succeeded:
+  |
+  |   ==> ("hello" : String)  <:  Int
+  |     ==> String  <:  Int  = false
+  |
+  | The tests were made under the empty constraint
+  |
+  | The required type comes from a parameter of the automatically
+  | inserted `apply` method of `List[Int]`,
+  | which is the type of `List.apply[Int]([1,2 : Int]*)`.
+   ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg/19680b.scala b/tests/neg/19680b.scala
@@ -0,0 +1,2 @@
+//> using options -explain
+def Test = List(1,2)("hello") // error: found String, required Int

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ extends NotFoundMsg(MissingIdentID) {`
`287`	`287`	`}`
`288`	`288`	`}`
`289`	`289`
`290`		`-class TypeMismatch(val found: Type, expected: Type, inTree: Option[untpd.Tree], addenda: => String*)(using Context)`
	`290`	`+class TypeMismatch(val found: Type, expected: Type, val inTree: Option[untpd.Tree], addenda: => String*)(using Context)`
`291`	`291`	`extends TypeMismatchMsg(found, expected)(TypeMismatchID):`
`292`	`292`
`293`	`293`	`def msg(using Context) =`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+//> using options -explain`
	`2`	`+def Test = List(1,2)("hello") // error: found String, required Int`