Get rid of initialization order errors

Author: felixmulder

src/dotty/tools/dotc/reporting/diagnostic/MessageCreator.scala

@@ -24,31 +24,30 @@ object MessageCreator {
 trait MessageCreator {
   import messages._
 
-  val msgFn: String = msg
   def msg: String
   def kind: String
   def explanation: String
 
   def error(pos: SourcePosition) =
-    new Error(msgFn, pos, kind, explanation)
+    new Error(msg, pos, kind, explanation)
 
   def warning(pos: SourcePosition) =
-    new Warning(msgFn, pos, kind, explanation)
+    new Warning(msg, pos, kind, explanation)
 
   def info(pos: SourcePosition) =
-    new Info(msgFn, pos, kind, explanation)
+    new Info(msg, pos, kind, explanation)
 
   def featureWarnign(pos: SourcePosition) =
-    new FeatureWarning(msgFn, pos, kind, explanation)
+    new FeatureWarning(msg, pos, kind, explanation)
 
   def uncheckedWarning(pos: SourcePosition) =
-    new UncheckedWarning(msgFn, pos, kind, explanation)
+    new UncheckedWarning(msg, pos, kind, explanation)
 
   def deprecationWarning(pos: SourcePosition) =
-    new DeprecationWarning(msgFn, pos, kind, explanation)
+    new DeprecationWarning(msg, pos, kind, explanation)
 
   def migrationWarning(pos: SourcePosition) =
-    new MigrationWarning(msgFn, pos, kind, explanation)
+    new MigrationWarning(msg, pos, kind, explanation)
 }
 
 class NoExplanation(val msg: String) extends MessageCreator {

src/dotty/tools/dotc/reporting/diagnostic/syntax.scala

@@ -13,7 +13,7 @@ object syntax {
   import dotc.ast.untpd
 
   abstract class EmptyCatchOrFinallyBlock(tryBody: untpd.Tree)(implicit ctx: Context) extends MessageCreator {
-    lazy val explanation = {
+    val explanation = {
       val tryString = tryBody match {
         case Block(Nil, untpd.EmptyTree) => "{}"
         case _ => tryBody.show
@@ -47,16 +47,16 @@ object syntax {
 
   class EmptyCatchBlock(tryBody: untpd.Tree)(implicit ctx: Context)
   extends EmptyCatchOrFinallyBlock(tryBody) {
-    lazy val kind = "Syntax"
-    lazy val msg =
+    val kind = "Syntax"
+    val msg =
       hl"""|The ${"catch"} block does not contain a valid expression, try
            |adding a case like - `${"case e: Exception =>"}` to the block""".stripMargin
   }
 
   case class EmptyCatchAndFinallyBlock(tryBody: untpd.Tree)(implicit ctx: Context)
   extends EmptyCatchOrFinallyBlock(tryBody) {
-    lazy val kind = "Syntax"
-    lazy val msg =
+    val kind = "Syntax"
+    val msg =
       hl"""|A ${"try"} without ${"catch"} or ${"finally"} is equivalent to putting
            |its body in a block; no exceptions are handled.""".stripMargin
   }

src/dotty/tools/dotc/reporting/diagnostic/tpe.scala

@@ -16,12 +16,12 @@ object tpe {
     bind: untpd.Bind,
     tree: untpd.CaseDef
   )(implicit ctx: Context) extends MessageCreator {
-    lazy val kind = "Naming"
+    val kind = "Naming"
 
-    lazy val msg =
+    val msg =
       em"duplicate pattern variable: `${bind.name}`"
 
-    lazy val explanation = {
+    val explanation = {
       val pat = tree.pat.show
       val guard = tree.guard match {
         case untpd.EmptyTree => ""