Skip to content

Commit 18e5a24

Browse files
committed
Add FlexibleType support for scaladoc
1 parent 0be2091 commit 18e5a24

File tree

5 files changed

+18
-1
lines changed

5 files changed

+18
-1
lines changed

project/Build.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1848,7 +1848,8 @@ object Build {
18481848

18491849
lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")).
18501850
dependsOn(`scala3-compiler-bootstrapped`).
1851-
settings(commonBootstrappedSettings)
1851+
settings(commonBootstrappedSettings).
1852+
settings(Compile / scalacOptions ++= Seq("-Yexplicit-nulls"))
18521853

18531854

18541855
/**
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package tests
2+
package typesTest
3+
4+
import java.io.File
5+
6+
object TypesTest
7+
{
8+
val classpathSeparator
9+
= File.pathSeparator
10+
}

scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,8 @@ trait InkuireSupport(using DocContext) extends Resources:
315315
inner(tpe, vars) //TODO [Inkuire] Repeated types
316316
case AnnotatedType(tpe, _) =>
317317
inner(tpe, vars)
318+
case FlexibleType(tpe) =>
319+
inner(tpe, vars)
318320
case tl @ TypeLambda(paramNames, _, resType) =>
319321
Inkuire.TypeLambda(paramNames.map(Inkuire.TypeLambda.argument), inner(resType, vars)) //TODO [Inkuire] Type bounds
320322
case pt @ PolyType(paramNames, _, resType) =>

scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ trait TypesSupport:
114114
inner(tpe) :+ plain("*")
115115
case AnnotatedType(tpe, _) =>
116116
inner(tpe)
117+
case FlexibleType(tpe) =>
118+
inner(tpe)
117119
case tl @ TypeLambda(params, paramBounds, AppliedType(tpe, args))
118120
if paramBounds.map(inner).forall(_.isEmpty) && params.zip(args.map(inner).flatten.map(_.name)).forall(_ == _) =>
119121
inner(tpe)

scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,5 @@ class RefinedFunctionTypes extends SignatureTest("refinedFunctionTypes", Signatu
128128
class RightAssocExtension extends SignatureTest("rightAssocExtension", SignatureTest.all)
129129

130130
class NamedTuples extends SignatureTest("namedTuples", SignatureTest.all)
131+
132+
class TypesTest extends SignatureTest("typesTest", SignatureTest.all)

0 commit comments

Comments
 (0)