From fd2d48acdae44aefde7fc79db50db94c071c03b1 Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Tue, 25 Oct 2016 14:29:54 -0700 Subject: [PATCH] lazy_module: If the user actually specifies a name, just use it without appending module name. --- src/main/scala/diplomacy/LazyModule.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/diplomacy/LazyModule.scala b/src/main/scala/diplomacy/LazyModule.scala index 4c816696..a8e2c10b 100644 --- a/src/main/scala/diplomacy/LazyModule.scala +++ b/src/main/scala/diplomacy/LazyModule.scala @@ -28,7 +28,7 @@ abstract class LazyModule lazy val outerName = if (nodes.size != 1) None else nodes(0).gco.flatMap(_.lazyModule.valName) def moduleName = className + valName.orElse(outerName).map("_" + _).getOrElse("") - def instanceName = valName.orElse(outerName).map(_ + "_").getOrElse("") + className + def instanceName = valName.getOrElse(outerName.map(_ + "_").getOrElse("") + className) def name = valName.getOrElse(className) def line = sourceLine(info)