Skip to content

Fix F-Bounded types signatures #13753

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
Oct 15, 2021
Merged

Fix F-Bounded types signatures #13753

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
5 changes: 5 additions & 0 deletions scaladoc-testcases/src/tests/fboundedTypeParameters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package tests
package fboundedTypeParameters

trait AOps[X[_]]
trait A[T] extends AOps[A]
9 changes: 5 additions & 4 deletions scaladoc/src/dotty/tools/scaladoc/api.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,13 @@ case class TypeParameter(

case class Link(name: String, dri: DRI)

sealed trait SignaturePart
sealed trait SignaturePart:
val name: String

// TODO (longterm) properly represent signatures
case class Type(name: String, dri: Option[DRI]) extends SignaturePart
case class Keyword(name: String) extends SignaturePart
case class Plain(txt: String) extends SignaturePart
case class Type(override val name: String, dri: Option[DRI]) extends SignaturePart
case class Keyword(override val name: String) extends SignaturePart
case class Plain(override val name: String) extends SignaturePart

type Signature = List[SignaturePart]

Expand Down
4 changes: 2 additions & 2 deletions scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ trait TypesSupport:
inner(tpe) :+ plain("*")
case AnnotatedType(tpe, _) =>
inner(tpe)
case tl @ TypeLambda(params, paramBounds, resType@AppliedType(tpe, args))
if paramBounds.map(inner).forall(_.isEmpty) && params.zip(args.map(inner)).forall(List(_) == _) =>
case tl @ TypeLambda(params, paramBounds, AppliedType(tpe, args))
if paramBounds.map(inner).forall(_.isEmpty) && params.zip(args.map(inner).flatten.map(_.name)).forall(_ == _) =>
inner(tpe)
case tl @ TypeLambda(params, paramBounds, resType) =>
plain("[").l ++ commas(params.zip(paramBounds).map { (name, typ) =>
Expand Down
2 changes: 2 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 @@ -86,3 +86,5 @@ class ImplicitConversionsTest3 extends SignatureTest(
class SpecializedSignature extends SignatureTest("specializedSignature", SignatureTest.all)

class ContextBounds extends SignatureTest("contextBounds", SignatureTest.all)

class FBoundedTypeParameters extends SignatureTest("fboundedTypeParameters", SignatureTest.all)