Skip to content

Scaladoc: Fix implicit members resolution #15021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2022
Merged

Scaladoc: Fix implicit members resolution #15021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions scaladoc-testcases/src/tests/implicitMembers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,13 @@ package tests
package implicitMembers

class OuterClass:
class ImplicitMemberTarget

class ImplicitMemberTarget
object ImplicitMemberTarget:
extension (a: ImplicitMemberTarget)
def extensionFromCompanion: String =
"ImplicitMemberTarget"

// does not work
extension (a: ImplicitMemberTarget)
def extensionFromOuterClass: String =
"ImplicitMemberTarget"
extension (a: ImplicitMemberTarget) def extensionFromCompanion(i: Int): String//expected: def extensionFromCompanion(i: Int): String
= "ImplicitMemberTarget"
extension (a: ImplicitMemberTarget) def extensionFromOuterClass(i: Int): String//expected: def extensionFromOuterClass(i: Int): String
= "ImplicitMemberTarget"

extension (a: OuterClass#ImplicitMemberTarget)
def extensionFromPackage: String =
"ImplicitMemberTarget"
extension (a: OuterClass#ImplicitMemberTarget) def extensionFromPackage(i: Int): String//expected: def extensionFromPackage(i: Int): String
= "ImplicitMemberTarget"
6 changes: 3 additions & 3 deletions scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Mo
def collectApplicableMembers(source: Member): Seq[Member] = source.members.flatMap {
case m @ Member(_, _, _, Kind.Extension(ExtensionTarget(_, _, _, _, MyDri, _), _), Origin.RegularlyDefined) =>
val kind = m.kind match
case d: Kind.Def => d
case Kind.Extension(_, d) => d
case _ => Kind.Def(Nil, Nil)

Seq(m.withOrigin(Origin.ExtensionFrom(source.name, source.dri)).withKind(kind))
Expand All @@ -44,12 +44,12 @@ class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Mo
}
case _ =>
Nil
case _ =>
case other =>
None
}

val newImplicitMembers = implictSources.flatMap(collectApplicableMembers).distinct
val expandedMembers = c.members.map(expandMember(newImplicitMembers ++ Seq(c)))
val expandedMembers = c.members.map(expandMember(outerMembers ++ Seq(c)))
c.withMembers(newImplicitMembers ++ expandedMembers)

original.updatePackages(_.map(expandMember(Nil)(_)))
6 changes: 6 additions & 0 deletions scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,9 @@ class ContextFunctions extends SignatureTest("contextfunctions", SignatureTest.a
class MarkdownCode extends SignatureTest("markdowncode", SignatureTest.all)

class FunctionTypeSignatures extends SignatureTest("functionTypeSignatures", SignatureTest.all)

class ImplicitMembers extends SignatureTest(
"implicitMembers",
Seq("def"),
filterFunc = _.toString.endsWith("OuterClass$ImplicitMemberTarget.html")
)