Add annotations to doc AST

3 files changed, 16 insertions, 15 deletions

diff --git a/doc-tool/test/ConstructorTest.scala b/doc-tool/test/ConstructorTest.scala
index 99192985a..76abce100 100644
--- a/doc-tool/test/ConstructorTest.scala
+++ b/doc-tool/test/ConstructorTest.scala
@@ -22,7 +22,7 @@ class Constructors extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(cls: Class), _, _) =>
+        case PackageImpl(_, _, _, List(cls: Class), _, _) =>
           cls.constructors.headOption match {
             case Some(ParamListImpl(NamedReference("str", _,  false, false) :: Nil, false) :: Nil) =>
               // success!
@@ -44,7 +44,7 @@ class Constructors extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(cls: Class), _, _) =>
+        case PackageImpl(_, _,  _, List(cls: Class), _, _) =>
           cls.constructors match {
             case (
               ParamListImpl(NamedReference("str1", _,  false, false) :: Nil, false) ::
@@ -69,7 +69,7 @@ class Constructors extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(cls: Class), _, _) =>
+        case PackageImpl(_, _, _, List(cls: Class), _, _) =>
           cls.constructors match {
             case (
               ParamListImpl(NamedReference("str1", _,  false, false) :: Nil, false) ::
@@ -101,7 +101,7 @@ class Constructors extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(cls: Class), _, _) =>
+        case PackageImpl(_, _, _, List(cls: Class), _, _) =>
           cls.constructors match {
             case (
               ParamListImpl(NamedReference("main", _,  false, false) :: Nil, false) :: Nil
@@ -139,7 +139,7 @@ class Constructors extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(cls: CaseClass, obj: Object), _, _) =>
+        case PackageImpl(_, _, _, List(cls: CaseClass, obj: Object), _, _) =>
           cls.constructors match {
             case (
               ParamListImpl(NamedReference("main", _,  false, false) :: Nil, false) :: Nil
@@ -172,7 +172,7 @@ class Constructors extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(trt: Trait), _, _) =>
+        case PackageImpl(_, _, _, List(trt: Trait), _, _) =>
           trt.traitParams match {
             case ParamListImpl(NamedReference("main", _,  false, false) :: Nil, false) :: Nil =>
             case _ =>
@@ -199,7 +199,7 @@ class Constructors extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(cc: CaseClass, _, cls: Class, trt: Trait), _, _) =>
+        case PackageImpl(_, _, _, List(cc: CaseClass, _, cls: Class, trt: Trait), _, _) =>
           import model.json._
           lazy val incorrectJson = s"The json generated for:\n$actualSource\n\nIs not correct"
           assert(cc.json.contains(s""""constructors":[[{"list":[{"title":"main""""), incorrectJson)
diff --git a/doc-tool/test/PackageStructure.scala b/doc-tool/test/PackageStructure.scala
index 54ff1b9e7..be80c57fc 100644
--- a/doc-tool/test/PackageStructure.scala
+++ b/doc-tool/test/PackageStructure.scala
@@ -29,7 +29,7 @@ class PackageStructure extends DottyDocTest {
 
     checkSources(source1 :: source2 :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(tA, tB), _, _) =>
+        case PackageImpl(_, _, _, List(tA, tB), _, _) =>
           assert(
             tA.name == "A" && tB.name == "B",
             s"trait A had name '${tA.name}' and trait B had name '${tB.name}'"
@@ -63,8 +63,9 @@ class PackageStructure extends DottyDocTest {
       packages("scala") match {
         case PackageImpl(
           _,
+          _,
           "scala",
-          List(PackageImpl(_, "scala.collection", List(tA, tB), _, _)),
+          List(PackageImpl(_, _, "scala.collection", List(tA, tB), _, _)),
           _, _
         ) =>
           assert(
@@ -77,7 +78,7 @@ class PackageStructure extends DottyDocTest {
       }
 
       packages("scala.collection") match {
-        case PackageImpl(_, "scala.collection", List(tA, tB), _, _) =>
+        case PackageImpl(_, _, "scala.collection", List(tA, tB), _, _) =>
           assert(
             tA.name == "A" && tB.name == "B",
             s"trait A had name '${tA.name}' and trait B had name '${tB.name}'"
diff --git a/doc-tool/test/UsecaseTest.scala b/doc-tool/test/UsecaseTest.scala
index 2a5ae4602..2731517e7 100644
--- a/doc-tool/test/UsecaseTest.scala
+++ b/doc-tool/test/UsecaseTest.scala
@@ -29,7 +29,7 @@ class UsecaseTest extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(trt: Trait), _, _) =>
+        case PackageImpl(_, _, _, List(trt: Trait), _, _) =>
           val List(foo: Def) = trt.members
 
           assert(foo.comment.isDefined, "Lost comment in transformations")
@@ -73,7 +73,7 @@ class UsecaseTest extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(trt: Trait), _, _) =>
+        case PackageImpl(_, _, _, List(trt: Trait), _, _) =>
           val List(foo: Def) = trt.members
 
           val returnValue = foo.returnValue match {
@@ -118,7 +118,7 @@ class UsecaseTest extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-        case PackageImpl(_, _, List(trt: Trait), _, _) =>
+        case PackageImpl(_, _, _, List(trt: Trait), _, _) =>
           val List(foo: Def) = trt.members
 
           val returnValue = foo.returnValue match {
@@ -166,7 +166,7 @@ class UsecaseTest extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-      case PackageImpl(_, _, List(trt: Trait), _, _) =>
+      case PackageImpl(_, _, _, List(trt: Trait), _, _) =>
         val List(map: Def) = trt.members
 
         val returnValue = map.returnValue match {
@@ -209,7 +209,7 @@ class UsecaseTest extends DottyDocTest {
 
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
-      case PackageImpl(_, _, List(trt: Trait), _, _) =>
+      case PackageImpl(_, _, _, List(trt: Trait), _, _) =>
         val List(map: Def) = trt.members
         assert(map.comment.isDefined, "Lost comment in transformations")