Skip to content

Commit 4daa92d

Browse files
authored
Merge pull request #2604 from dotty-staging/topic/revert-2526
Revert "Prevent mismatches on members named md (#2526)"
2 parents 877e9e7 + aac123d commit 4daa92d

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

doc-tool/src/dotty/tools/dottydoc/staticsite/MarkdownLinkVisitor.scala

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,15 @@ import com.vladsch.flexmark.util.sequence.CharSubSequence
77
import model.{ Package, NonEntity, Val, Def, TypeAlias }
88
import dottydoc.util.MemberLookup
99

10-
import dotty.tools.dotc.core.Contexts.Context
11-
import dotty.tools.dotc.core.Decorators._
12-
1310
object MarkdownLinkVisitor {
1411
private val EntityLink = """([^\.]+)(\.[^\.]+)*""".r
15-
def apply(node: Node, docs: Map[String, Package], params: Map[String, AnyRef])(implicit ctx: Context): Unit =
12+
def apply(node: Node, docs: Map[String, Package], params: Map[String, AnyRef]): Unit =
1613
(new NodeVisitor(
1714
new VisitHandler(classOf[Link], new Visitor[Link] with MemberLookup {
1815
override def visit(node: Link): Unit = {
1916
val url = node.getUrl
20-
21-
if (url.endsWith(".md")) {
22-
if (url.subSequence(0, url.lastIndexOf('.')).indexOf("/") < 0) {
23-
val method = url.subSequence(0, url.lastIndexOf('.')).toString.toTypeName
24-
if (ctx.getClassIfDefined(method).exists) node.setUrl {
25-
url.subSequence(0, url.lastIndexOf('.')).append(".html")
26-
} else {
27-
ctx.error(s"""Ambiguous reference to "$url"""")
28-
}
29-
} else node.setUrl {
30-
url.subSequence(0, url.lastIndexOf('.')).append(".html")
31-
}
17+
if (url.endsWith(".md")) node.setUrl {
18+
url.subSequence(0, url.lastIndexOf('.')).append(".html")
3219
}
3320
else if (EntityLink.unapplySeq(url.toString).isDefined) {
3421
lookup(NonEntity, docs, url.toString).foreach { ent =>

0 commit comments

Comments
 (0)