Decouple source and TASTY frontend in dottydoc

Author: Duhemm

compiler/src/dotty/tools/dotc/fromtasty/ReadTastyTreesFromClasses.scala

@@ -45,6 +45,9 @@ class ReadTastyTreesFromClasses extends FrontEnd {
               else {
                 val unit = mkCompilationUnit(cls, cls.tree, forceTrees = true)
                 unit.pickled += (cls -> unpickler.unpickler.bytes)
+                if (ctx.settings.YcookComments.value) {
+                  ctx.typer.cookComments(cls.tree, cls)
+                }
                 Some(unit)
               }
             case tree: Tree[_] =>
@@ -72,5 +75,7 @@ class ReadTastyTreesFromClasses extends FrontEnd {
         case _ =>
           cannotUnpickle(s"no class file was found")
       }
+    case unit =>
+     Some(unit)
   }
 }

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

@@ -8,6 +8,20 @@ import ast.tpd
 
 trait Docstrings { self: Typer =>
 
+  /**
+   * Expands or cooks the documentation for all members of `cdef`.
+   *
+   * @see Docstrings#cookComment
+   */
+  def cookComments(cdef: tpd.Tree, cls: ClassSymbol)(implicit ctx: Context): Unit = {
+    // val cls = cdef.symbol
+    val cookingCtx = ctx.localContext(cdef, cls).setNewScope
+    cls.info.allMembers.foreach { member =>
+      cookComment(member.symbol, cls)(cookingCtx)
+    }
+    cookComment(cls, cls)(cookingCtx)
+  }
+
   /**
    * Expands or cooks the documentation for `sym` in class `owner`.
    * The expanded comment will directly replace the original comment in the doc context.

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

@@ -1568,15 +1568,6 @@ class Typer extends Namer
       val body1 = addAccessorDefs(cls,
         typedStats(impl.body, dummy)(ctx.inClassContext(self1.symbol)))
 
-      // Expand comments and type usecases if `-Ycook-comments` is set.
-      if (ctx.settings.YcookComments.value) {
-        val cookingCtx = ctx.localContext(cdef, cls).setNewScope
-        body1.foreach { stat =>
-          cookComment(stat.symbol, self1.symbol)(cookingCtx)
-        }
-        cookComment(cls, cls)(cookingCtx)
-      }
-
       checkNoDoubleDeclaration(cls)
       val impl1 = cpy.Template(impl)(constr1, parents1, self1, body1)
         .withType(dummy.termRef)
@@ -1601,6 +1592,12 @@ class Typer extends Namer
 
       if (ctx.settings.YretainTrees.value) cls.treeOrProvider = cdef1
 
+      // Expand comments and type usecases if `-Ycook-comments` is set.
+      if (ctx.settings.YcookComments.value) {
+        cookComments(cdef1, cls)
+      }
+
+
       cdef1
 
       // todo later: check that

doc-tool/src/dotty/tools/dottydoc/DocCompiler.scala

@@ -34,7 +34,8 @@ class DocCompiler extends Compiler {
   }
 
   override protected def frontendPhases: List[List[Phase]] =
-    List(new DocFrontEnd) :: Nil
+    List(new ReadTastyTreesFromClasses) ::
+    List(new DocFrontEnd) ::  Nil
 
   override protected def picklerPhases: List[List[Phase]] =
     Nil

doc-tool/src/dotty/tools/dottydoc/DocFrontEnd.scala

@@ -20,23 +20,8 @@ import util.syntax.ContextWithContextDottydoc
 class DocFrontEnd extends FrontEnd {
 
   override def runOn(units: List[CompilationUnit])(implicit ctx: Context): List[CompilationUnit] = {
-    if (ctx.settings.fromTasty.value) {
-      val fromTastyFrontend = new ReadTastyTreesFromClasses
-      val unpickledUnits = fromTastyFrontend.runOn(units)
-
-      val typer = new Typer()
-      if (ctx.settings.YcookComments.value) {
-        ctx.docbase.docstrings.keys.foreach { sym =>
-            val owner = sym.owner
-            val cookingCtx = ctx.withOwner(owner)
-            typer.cookComment(sym, owner)(cookingCtx)
-        }
-      }
-
-      unpickledUnits
-    } else {
-      super.runOn(units)
-    }
+    if (ctx.settings.fromTasty.value) units
+    else super.runOn(units)
   }
 
   override protected def discardAfterTyper(unit: CompilationUnit)(implicit ctx: Context) =