Address review feedback

Author: Blaisorblade

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

@@ -15,8 +15,11 @@ object ErrorReporting {
 
   import tpd._
 
+  def errorTree(tree: untpd.Tree, msg: => Message, pos: Position)(implicit ctx: Context): tpd.Tree =
+    tree withType errorType(msg, pos)
+
   def errorTree(tree: untpd.Tree, msg: => Message)(implicit ctx: Context): tpd.Tree =
-    tree withType errorType(msg, tree.pos)
+    errorTree(tree, msg, tree.pos)
 
   def errorType(msg: => Message, pos: Position)(implicit ctx: Context): ErrorType = {
     ctx.error(msg, pos)

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

@@ -1863,12 +1863,11 @@ class Typer extends Namer
       try adapt(typedUnadapted(tree, pt, locked), pt, locked)
       catch {
         case ex: TypeError =>
-          // This is equivalent to errorTree(tree, ex.toMessage) but
-          // uses tree.pos.focus instead of tree.pos. We use this because:
+          errorTree(tree, ex.toMessage, tree.pos.focus)
+          // We use tree.pos.focus instead of tree.pos, because:
           // - since tree can be a top-level definition, tree.pos can point to the whole definition
           // - that would in turn hide all other type errors inside tree.
           // TODO: might be even better to store positions inside TypeErrors.
-          tree withType errorType(ex.toMessage, tree.pos.focus)
       }
     }