Merge pull request #13185 from BarkingBad/scaladoc/intrinsic-types-package

romanowski · web-flow · commit d14051711ffa · 2021-07-29T15:44:31.000+02:00
Fix intrinsic types documentation when there is no scala package on files to document path
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala
@@ -143,6 +143,9 @@ case class ScaladocTastyInspector()(using ctx: DocContext) extends DocTastyInspe
         }
       }
       topLevels ++= intrinsicClassDefs
+      val scalaPckg = defn.ScalaPackageVal.asInstanceOf[parser.qctx.reflect.Symbol]
+      given parser.qctx.type = parser.qctx
+      topLevels += "scala" -> Member(scalaPckg.fullName, scalaPckg.dri, Kind.Package)
       topLevels += mergeAnyRefAliasAndObject(parser)
 
   def result(): (List[Member], Option[Comment]) =

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,9 @@ case class ScaladocTastyInspector()(using ctx: DocContext) extends DocTastyInspe`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`	`topLevels ++= intrinsicClassDefs`
	`146`	`+ val scalaPckg = defn.ScalaPackageVal.asInstanceOf[parser.qctx.reflect.Symbol]`
	`147`	`+ given parser.qctx.type = parser.qctx`
	`148`	`+ topLevels += "scala" -> Member(scalaPckg.fullName, scalaPckg.dri, Kind.Package)`
`146`	`149`	`topLevels += mergeAnyRefAliasAndObject(parser)`
`147`	`150`
`148`	`151`	`def result(): (List[Member], Option[Comment]) =`