Fix propagation of overriden `Module#basePath` and add a test to verify it's behavior

2 files changed, 5 insertions, 2 deletions

diff --git a/core/src/mill/define/Module.scala b/core/src/mill/define/Module.scala
index dd451c9c..09e8e974 100644
--- a/core/src/mill/define/Module.scala
+++ b/core/src/mill/define/Module.scala
@@ -104,7 +104,7 @@ class BaseModule(basePath0: Path)
   // it is the root of the module tree, and thus must not include it's own
   // sourcecode.Name as part of the list,
   override implicit def millModuleSegments: Segments = Segments()
-  override implicit def millModuleBasePath: BasePath = BasePath(millOuterCtx.basePath)
   override def basePath = millOuterCtx.basePath
+  override implicit def millModuleBasePath: BasePath = BasePath(basePath)
   implicit def millImplicitBaseModule: BaseModule.Implicit = BaseModule.Implicit(this)
 }
\ No newline at end of file
diff --git a/core/src/mill/main/MainRunner.scala b/core/src/mill/main/MainRunner.scala
index e098144f..06e1795f 100644
--- a/core/src/mill/main/MainRunner.scala
+++ b/core/src/mill/main/MainRunner.scala
@@ -84,13 +84,16 @@ class MainRunner(config: ammonite.main.Cli.Config,
   object CustomCodeWrapper extends Preprocessor.CodeWrapper {
     def top(pkgName: Seq[Name], imports: Imports, indexedWrapperName: Name) = {
       val wrapName = indexedWrapperName.backticked
+      val literalPath = pprint.Util.literalize(config.wd.toString)
       s"""
          |package ${pkgName.head.encoded}
          |package ${Util.encodeScalaSourcePath(pkgName.tail)}
          |$imports
          |import mill._
          |
-         |object $wrapName extends mill.define.BaseModule(ammonite.ops.Path(${pprint.Util.literalize(config.wd.toString)})) with $wrapName{
+         |object $wrapName
+         |extends mill.define.BaseModule(ammonite.ops.Path($literalPath))
+         |with $wrapName{
          |  // Stub to make sure Ammonite has something to call after it evaluates a script,
          |  // even if it does nothing...
          |  def $$main() = Iterator[String]()