Skip to content

Commit 9b88820

Browse files
vitlindanicolasfara
authored andcommitted
fix: link generation
1 parent bf2fa1c commit 9b88820

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/scala/dev/atedeg/Configuration.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ case object Def extends EntityType
3434
final case class Entity(entityType: EntityType, link: String, name: String, packageName: String) {
3535
def toBaseEntity: BaseEntity = BaseEntity(entityType, name)
3636
def sanitizedLink: String = link.split('#').head
37-
def entityId: Option[String] = link.split('#').lastOption
37+
def entityId: Option[String] = link.split('#').lift(1)
3838

3939
def isClassLike: Boolean = entityType match {
4040
case Class | Trait | Enum => true

src/main/scala/dev/atedeg/HtmlParsing.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object HtmlParsing {
2121
entity: Entity,
2222
allEntities: Set[Entity],
2323
): Either[Error, String] = {
24-
val searchQuery = s"#${entity.entityId.map(_ + " > ").getOrElse("")}div.cover > div.doc"
24+
val searchQuery = s"${entity.entityId.map("div#" + _ + " ").getOrElse("")}div.cover > div.doc"
2525
extractTagFromDocument(file, document, searchQuery, allEntities)
2626
}
2727

@@ -35,10 +35,10 @@ object HtmlParsing {
3535

3636
private def toMarkdown(es: Iterable[Node], allEntities: Set[Entity]): Either[Error, String] = {
3737
def isLink(e: Element): Boolean = e.tagName == "a"
38-
def toMarkdownLink(e: Element) = lookupLinkFor(extractName(e)).map(l => s"[$l](${e.text})")
39-
def extractName(e: Element): String = e.attr("href").replace(".html", "")
38+
def toMarkdownLink(e: Element) = lookupLinkFor(extractName(e)).map(l => s"[${e.text}]($l)")
39+
def extractName(e: Element): String = e.attr("href").replace(".html", "").split('$').last.split("/").last
4040
def lookupLinkFor(name: String): Either[Error, String] =
41-
allEntities.find(_.name == name).map(_.link.replace("/", ".")).toRight(MissingLink(name))
41+
allEntities.find(_.name == name).map("../" + _.link).toRight(MissingLink(name))
4242

4343
es.foldLeft("".asRight[Error]) { (acc, elem) =>
4444
elem match {

0 commit comments

Comments
 (0)