diff --git a/project/Build.scala b/project/Build.scala index cf6c10a53192..5b2bfd7e3a31 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1848,7 +1848,8 @@ object Build { lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")). dependsOn(`scala3-compiler-bootstrapped`). - settings(commonBootstrappedSettings) + settings(commonBootstrappedSettings). + settings(Compile / scalacOptions ++= Seq("-Yexplicit-nulls")) /** diff --git a/scaladoc-testcases/src/tests/typesTest.scala b/scaladoc-testcases/src/tests/typesTest.scala new file mode 100644 index 000000000000..addd3bc80670 --- /dev/null +++ b/scaladoc-testcases/src/tests/typesTest.scala @@ -0,0 +1,10 @@ +package tests +package typesTest + +import java.io.File + +object TypesTest +{ + val classpathSeparator + = File.pathSeparator +} diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala index d5eebd1ab798..dc1e967c619f 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala @@ -315,6 +315,8 @@ trait InkuireSupport(using DocContext) extends Resources: inner(tpe, vars) //TODO [Inkuire] Repeated types case AnnotatedType(tpe, _) => inner(tpe, vars) + case FlexibleType(tpe) => + inner(tpe, vars) case tl @ TypeLambda(paramNames, _, resType) => Inkuire.TypeLambda(paramNames.map(Inkuire.TypeLambda.argument), inner(resType, vars)) //TODO [Inkuire] Type bounds case pt @ PolyType(paramNames, _, resType) => diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala index 110ee498a3ac..95b806148f91 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala @@ -114,6 +114,8 @@ trait TypesSupport: inner(tpe) :+ plain("*") case AnnotatedType(tpe, _) => inner(tpe) + case FlexibleType(tpe) => + inner(tpe) 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) diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala index adb9397f1bcd..603a92ff4b91 100644 --- a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala +++ b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala @@ -128,3 +128,5 @@ class RefinedFunctionTypes extends SignatureTest("refinedFunctionTypes", Signatu class RightAssocExtension extends SignatureTest("rightAssocExtension", SignatureTest.all) class NamedTuples extends SignatureTest("namedTuples", SignatureTest.all) + +class TypesTest extends SignatureTest("typesTest", SignatureTest.all)