diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-06-29 15:16:59 +0200 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2016-08-19 15:37:29 +0200 |
commit | d5b00141315e61f2f0f994872fdcf5a93f7b7aae (patch) | |
tree | 92e94f31cf403c08c4823c2bcf399c6259d63bda /dottydoc/shared/src/main | |
parent | 8e5159f74c7c8db2461b0ec8c30115d71855af6a (diff) | |
download | dotty-d5b00141315e61f2f0f994872fdcf5a93f7b7aae.tar.gz dotty-d5b00141315e61f2f0f994872fdcf5a93f7b7aae.tar.bz2 dotty-d5b00141315e61f2f0f994872fdcf5a93f7b7aae.zip |
Remove dependency on pickling library, make frontend use façade
Diffstat (limited to 'dottydoc/shared/src/main')
3 files changed, 5 insertions, 49 deletions
diff --git a/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/comment/BodyEntities.scala b/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/comment/BodyEntities.scala index 37f1b05fe..526eff50c 100644 --- a/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/comment/BodyEntities.scala +++ b/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/comment/BodyEntities.scala @@ -94,8 +94,8 @@ final case class Tooltip(name: String) extends LinkTo final case class LinkToEntity(entity: Entity) extends LinkTo /** Use MaterializableLink for entities that need be picklable */ -sealed trait MaterializableLink { def title: Any } -final case class UnsetLink(title: Inline, query: String) extends MaterializableLink +sealed trait MaterializableLink { def title: String } +final case class UnsetLink(title: String, query: String) extends MaterializableLink final case class MaterializedLink(title: String, target: String) extends MaterializableLink final case class NoLink(title: String, target: String) extends MaterializableLink diff --git a/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/factories.scala b/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/factories.scala index c2c7f9940..452c1a3b4 100644 --- a/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/factories.scala +++ b/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/factories.scala @@ -51,7 +51,7 @@ object factories { def returnType(t: Type)(implicit ctx: Context): Reference = { def typeRef(name: String, query: String = "", params: List[MaterializableLink] = Nil) = { val realQuery = if (query != "") query else name - TypeReference(name, UnsetLink(Text(name), realQuery), params) + TypeReference(name, UnsetLink(name, realQuery), params) } def expandTpe(t: Type, params: List[MaterializableLink] = Nil): Reference = t match { @@ -61,7 +61,7 @@ object factories { ta.alias.asInstanceOf[NamedType].name.show case _ => rn.show }).split("\\$").last - val param = UnsetLink(Text(paramName), paramName) + val param = UnsetLink(paramName, paramName) expandTpe(parent, param :: params) } case TypeRef(_, n) => @@ -140,7 +140,7 @@ object factories { cd.classParents.collect { case t: TypeRef if !isJavaLangObject(t) && !isProductWithArity(t) => - UnsetLink(Text(t.name.toString), path(t.symbol).mkString(".")) + UnsetLink(t.name.toString, path(t.symbol).mkString(".")) } case _ => Nil } diff --git a/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/pickling.scala b/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/pickling.scala deleted file mode 100644 index 76a2effa6..000000000 --- a/dottydoc/shared/src/main/scala/dotty/tools/dottydoc/model/pickling.scala +++ /dev/null @@ -1,44 +0,0 @@ -package dotty.tools.dottydoc -package model - -object pickling { - import internal._ - import prickle._ - import comment._ - - implicit val inlinePickler: PicklerPair[Inline] = CompositePickler[Inline] - .concreteType[Chain] - .concreteType[Italic] - .concreteType[Bold] - .concreteType[Underline] - .concreteType[Superscript] - .concreteType[Subscript] - .concreteType[Link] - .concreteType[Monospace] - .concreteType[Text] - - implicit val entityLinkPicker: PicklerPair[MaterializableLink] = CompositePickler[MaterializableLink] - .concreteType[UnsetLink] - .concreteType[NoLink] - .concreteType[MaterializedLink] - - implicit val referencePicker: PicklerPair[Reference] = CompositePickler[Reference] - .concreteType[TypeReference] - .concreteType[OrTypeReference] - .concreteType[AndTypeReference] - .concreteType[NamedReference] - .concreteType[ConstantReference] - - implicit val entityPickler: PicklerPair[Entity] = CompositePickler[Entity] - .concreteType[NonEntity.type] - .concreteType[ValImpl] - .concreteType[DefImpl] - .concreteType[ClassImpl] - .concreteType[CaseClassImpl] - .concreteType[ObjectImpl] - .concreteType[TraitImpl] - .concreteType[PackageImpl] - - implicit val packagePickler: PicklerPair[Package] = CompositePickler[Package] - .concreteType[PackageImpl] -} |