Tidying up:

- Combine `main/` and `core/`
- Rename `jsbridges/`/`scalanativebridges/` -> `worker/` for consistency with other terminology

3 files changed, 97 insertions, 0 deletions

diff --git a/main/moduledefs/resources/scalac-plugin.xml b/main/moduledefs/resources/scalac-plugin.xml
new file mode 100644
index 00000000..48753a22
--- /dev/null
+++ b/main/moduledefs/resources/scalac-plugin.xml
@@ -0,0 +1,4 @@
+<plugin>
+    <name>auto-override-plugin</name>
+    <classname>mill.moduledefs.AutoOverridePlugin</classname>
+</plugin>
\ No newline at end of file
diff --git a/main/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala b/main/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala
new file mode 100644
index 00000000..5b33abbe
--- /dev/null
+++ b/main/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala
@@ -0,0 +1,58 @@
+package mill.moduledefs
+
+import scala.reflect.internal.Flags
+import scala.tools.nsc.io.VirtualFile
+import scala.tools.nsc.util.BatchSourceFile
+import scala.tools.nsc.{Global, Phase}
+import scala.tools.nsc.plugins.{Plugin, PluginComponent}
+
+class AutoOverridePlugin(val global: Global) extends Plugin {
+  import global._
+  override def init(options: List[String],  error: String => Unit): Boolean = true
+
+  val name = "auto-override-plugin"
+  val description = "automatically inserts `override` keywords for you"
+  val components = List[PluginComponent](
+    new PluginComponent {
+
+      val global = AutoOverridePlugin.this.global
+      import global._
+
+      override val runsAfter = List("typer")
+      override val runsBefore = List("patmat")
+
+      val phaseName = "auto-override"
+
+      override def newPhase(prev: Phase) = new GlobalPhase(prev) {
+
+        def name: String = phaseName
+
+        def isCacher(owner: Symbol) = {
+          val baseClasses =
+            if (owner.isClass) Some(owner.asClass.baseClasses)
+            else if (owner.isModule) Some(owner.asModule.baseClasses)
+            else None
+          baseClasses.exists(_.exists(_.fullName == "mill.moduledefs.Cacher"))
+        }
+
+        def apply(unit: global.CompilationUnit): Unit = {
+          object AutoOverrider extends global.Transformer {
+            override def transform(tree: global.Tree) = tree match{
+              case d: DefDef
+                if d.symbol.overrideChain.count(!_.isAbstract) > 1
+                && !d.mods.isOverride
+                && isCacher(d.symbol.owner) =>
+
+                  d.symbol.flags = d.symbol.flags | Flags.OVERRIDE
+                  copyDefDef(d)(mods = d.mods | Flags.OVERRIDE)
+              case _ => super.transform(tree)
+
+            }
+          }
+
+          unit.body = AutoOverrider.transform(unit.body)
+        }
+      }
+    }
+  )
+}
\ No newline at end of file
diff --git a/main/moduledefs/src/mill/moduledefs/Cacher.scala b/main/moduledefs/src/mill/moduledefs/Cacher.scala
new file mode 100644
index 00000000..023f03be
--- /dev/null
+++ b/main/moduledefs/src/mill/moduledefs/Cacher.scala
@@ -0,0 +1,35 @@
+package mill.moduledefs
+
+import scala.collection.mutable
+import scala.reflect.macros.blackbox.Context
+
+
+trait Cacher{
+  private[this] lazy val cacherLazyMap = mutable.Map.empty[sourcecode.Enclosing, Any]
+
+  protected[this] def cachedTarget[T](t: => T)
+                                     (implicit c: sourcecode.Enclosing): T = synchronized{
+    cacherLazyMap.getOrElseUpdate(c, t).asInstanceOf[T]
+  }
+}
+
+object Cacher{
+  def impl0[T: c.WeakTypeTag](c: Context)
+                                   (t: c.Expr[T]): c.Expr[T] = {
+    c.Expr[T](wrapCached[T](c)(t.tree))
+  }
+  def wrapCached[R: c.WeakTypeTag](c: Context)(t: c.Tree) = {
+
+    import c.universe._
+    val owner = c.internal.enclosingOwner
+    val ownerIsCacherClass =
+      owner.owner.isClass &&
+        owner.owner.asClass.baseClasses.exists(_.fullName == "mill.moduledefs.Cacher")
+
+    if (ownerIsCacherClass && owner.isMethod) q"this.cachedTarget[${weakTypeTag[R]}]($t)"
+    else c.abort(
+      c.enclosingPosition,
+      "T{} members must be defs defined in a Cacher class/trait/object body"
+    )
+  }
+}
\ No newline at end of file