From aac123d476d8a913ab08753e5b5cc812735f77d1 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 30 May 2017 14:10:02 +0200 Subject: [PATCH] Revert "Prevent mismatches on members named md (#2526)" This reverts commit 2127e9f2cc6ea92e4c220bd7860a7d91e9a13a9a. --- .../staticsite/MarkdownLinkVisitor.scala | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/MarkdownLinkVisitor.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/MarkdownLinkVisitor.scala index 8b3958766a75..5216ee950675 100644 --- a/doc-tool/src/dotty/tools/dottydoc/staticsite/MarkdownLinkVisitor.scala +++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/MarkdownLinkVisitor.scala @@ -7,28 +7,15 @@ import com.vladsch.flexmark.util.sequence.CharSubSequence import model.{ Package, NonEntity, Val, Def, TypeAlias } import dottydoc.util.MemberLookup -import dotty.tools.dotc.core.Contexts.Context -import dotty.tools.dotc.core.Decorators._ - object MarkdownLinkVisitor { private val EntityLink = """([^\.]+)(\.[^\.]+)*""".r - def apply(node: Node, docs: Map[String, Package], params: Map[String, AnyRef])(implicit ctx: Context): Unit = + def apply(node: Node, docs: Map[String, Package], params: Map[String, AnyRef]): Unit = (new NodeVisitor( new VisitHandler(classOf[Link], new Visitor[Link] with MemberLookup { override def visit(node: Link): Unit = { val url = node.getUrl - - if (url.endsWith(".md")) { - if (url.subSequence(0, url.lastIndexOf('.')).indexOf("/") < 0) { - val method = url.subSequence(0, url.lastIndexOf('.')).toString.toTypeName - if (ctx.getClassIfDefined(method).exists) node.setUrl { - url.subSequence(0, url.lastIndexOf('.')).append(".html") - } else { - ctx.error(s"""Ambiguous reference to "$url"""") - } - } else node.setUrl { - url.subSequence(0, url.lastIndexOf('.')).append(".html") - } + if (url.endsWith(".md")) node.setUrl { + url.subSequence(0, url.lastIndexOf('.')).append(".html") } else if (EntityLink.unapplySeq(url.toString).isDefined) { lookup(NonEntity, docs, url.toString).foreach { ent =>