From ac51595e387252097904d6d971dfe885608388a8 Mon Sep 17 00:00:00 2001 From: Krzysztof Romanowski Date: Mon, 1 Feb 2021 20:05:03 +0100 Subject: [PATCH] rename dotty.dokka package into dotty.tools.scaladoc --- scaladoc-js/src/Globals.scala | 2 +- scaladoc-js/src/Main.scala | 2 +- scaladoc-js/src/searchbar/PageEntry.scala | 2 +- scaladoc-js/src/searchbar/Searchbar.scala | 2 +- .../src/searchbar/SearchbarComponent.scala | 2 +- .../src/searchbar/SearchbarGlobals.scala | 2 +- .../src/searchbar/engine/Matchers.scala | 2 +- .../src/searchbar/engine/QueryParser.scala | 2 +- .../searchbar/engine/SearchbarEngine.scala | 2 +- scaladoc/README.md | 4 ++-- scaladoc/documentation/docs/design.md | 2 +- scaladoc/scripts/linkstovisit.txt | 24 +++++++++---------- scaladoc/src/dotty/tools/dottydoc/Main.scala | 2 +- .../dotty/{dokka => tools/scaladoc}/DRI.scala | 2 +- .../scaladoc}/DocContext.scala | 7 ++---- .../scaladoc}/ExternalDocLink.scala | 2 +- .../{dokka => tools/scaladoc}/Main.scala | 2 +- .../scaladoc}/ScalaModuleCreator.scala | 4 ++-- .../{dokka => tools/scaladoc}/Scaladoc.scala | 6 ++--- .../scaladoc}/ScaladocArgs.scala | 4 ++-- .../scaladoc}/SourceLinks.scala | 2 +- .../dotty/{dokka => tools/scaladoc}/api.scala | 4 ++-- .../{dokka => tools/scaladoc}/compat.scala | 4 ++-- .../renderers/DotDiagramBuilder.scala | 2 +- .../scaladoc}/renderers/HtmlRenderer.scala | 4 ++-- .../scaladoc}/renderers/Locations.scala | 4 ++-- .../scaladoc}/renderers/MemberRenderer.scala | 8 +++---- .../scaladoc}/renderers/Resources.scala | 6 ++--- .../renderers/SignatureRenderer.scala | 2 +- .../scaladoc}/renderers/SiteRenderer.scala | 4 ++-- .../scaladoc}/renderers/WikiDocRenderer.scala | 8 +++---- .../scaladoc}/renderers/Writer.scala | 2 +- .../scaladoc}/site/LoadedTemplate.scala | 2 +- .../scaladoc}/site/SidebarParser.scala | 2 +- .../scaladoc}/site/StaticSiteContext.scala | 2 +- .../scaladoc}/site/common.scala | 2 +- .../scaladoc}/site/templates.scala | 2 +- .../scaladoc}/tasty/BasicSupport.scala | 4 ++-- .../scaladoc}/tasty/ClassLikeSupport.scala | 6 ++--- .../scaladoc}/tasty/NameNormalizer.scala | 4 ++-- .../scaladoc}/tasty/PackageSupport.scala | 2 +- .../scaladoc}/tasty/ScalaDocSupport.scala | 6 ++--- .../scaladoc}/tasty/SymOps.scala | 2 +- .../scaladoc}/tasty/SyntheticSupport.scala | 2 +- .../scaladoc}/tasty/TastyParser.scala | 10 ++++---- .../scaladoc}/tasty/TypesSupport.scala | 2 +- .../scaladoc}/tasty/comments/Cleaner.scala | 2 +- .../tasty/comments/CommentExpander.scala | 2 +- .../tasty/comments/CommentRegex.scala | 2 +- .../scaladoc}/tasty/comments/Comments.scala | 8 +++---- .../tasty/comments/MarkdownParser.scala | 2 +- .../tasty/comments/MemberLookup.scala | 2 +- .../scaladoc}/tasty/comments/Preparser.scala | 2 +- .../scaladoc}/tasty/comments/Queries.scala | 2 +- .../markdown/DocFlexmarkExtension.scala | 2 +- .../scaladoc}/tasty/comments/package.scala | 2 +- .../tasty/comments/wiki/Entities.scala | 2 +- .../tasty/comments/wiki/Parser.scala | 4 ++-- .../ImplicitMembersExtensionTransformer.scala | 2 +- .../InheritanceInformationTransformer.scala | 2 +- .../translators/FilterAttributes.scala | 2 +- .../translators/ScalaSignatureProvider.scala | 2 +- .../translators/ScalaSignatureUtils.scala | 2 +- .../{dokka => tools/scaladoc}/util/IO.java | 2 +- .../{dokka => tools/scaladoc}/util/JSON.scala | 2 +- .../{dokka => tools/scaladoc}/util/html.scala | 2 +- scaladoc/test/dotty/dokka/BaseHtmlTest.scala | 4 ++-- ...ernalLocationProviderIntegrationTest.scala | 4 ++-- scaladoc/test/dotty/dokka/RaportingTest.scala | 2 +- scaladoc/test/dotty/dokka/ScaladocTest.scala | 2 +- scaladoc/test/dotty/dokka/SignatureTest.scala | 4 ++-- .../test/dotty/dokka/SignatureTestCases.scala | 2 +- .../test/dotty/dokka/SourceLinksTests.scala | 2 +- .../dotty/dokka/diagram/HierarchyTest.scala | 4 ++-- .../test/dotty/dokka/linking/DriTest.scala | 4 ++-- .../dotty/dokka/linking/DriTestCases.scala | 2 +- .../dotty/dokka/renderers/HtmlTagsTest.scala | 4 ++-- .../dotty/dokka/renderers/LocationTests.scala | 4 ++-- .../dotty/dokka/site/NavigationTest.scala | 2 +- .../dokka/site/SiteGeneratationTest.scala | 4 ++-- .../dokka/site/StaticSiteContextTest.scala | 2 +- .../dotty/dokka/site/TemplateFileTests.scala | 2 +- .../tasty/comments/CommentExpanderTests.scala | 6 ++--- .../comments/DocFlexmarkParserTests.scala | 4 ++-- .../tasty/comments/IntegrationTest.scala | 2 +- .../tasty/comments/MemberLookupTests.scala | 6 ++--- .../tasty/comments/QueryParserTests.scala | 2 +- .../dotty/dokka/tasty/util/TestUtils.scala | 4 ++-- scaladoc/test/dotty/dokka/testUtils.scala | 4 ++-- scaladoc/test/dotty/dokka/util/JSONTest.scala | 2 +- 90 files changed, 149 insertions(+), 152 deletions(-) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/DRI.scala (94%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/DocContext.scala (93%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/ExternalDocLink.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/Main.scala (96%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/ScalaModuleCreator.scala (92%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/Scaladoc.scala (91%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/ScaladocArgs.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/SourceLinks.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/api.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/compat.scala (93%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/renderers/DotDiagramBuilder.scala (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/renderers/HtmlRenderer.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/renderers/Locations.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/renderers/MemberRenderer.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/renderers/Resources.scala (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/renderers/SignatureRenderer.scala (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/renderers/SiteRenderer.scala (96%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/renderers/WikiDocRenderer.scala (93%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/renderers/Writer.scala (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/site/LoadedTemplate.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/site/SidebarParser.scala (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/site/StaticSiteContext.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/site/common.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/site/templates.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/BasicSupport.scala (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/ClassLikeSupport.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/NameNormalizer.scala (87%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/PackageSupport.scala (95%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/ScalaDocSupport.scala (92%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/SymOps.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/SyntheticSupport.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/TastyParser.scala (96%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/TypesSupport.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/Cleaner.scala (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/CommentExpander.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/CommentRegex.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/Comments.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/MarkdownParser.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/MemberLookup.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/Preparser.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/Queries.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/markdown/DocFlexmarkExtension.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/package.scala (94%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/wiki/Entities.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/tasty/comments/wiki/Parser.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/transformers/ImplicitMembersExtensionTransformer.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/transformers/InheritanceInformationTransformer.scala (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/translators/FilterAttributes.scala (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/translators/ScalaSignatureProvider.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/translators/ScalaSignatureUtils.scala (99%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/util/IO.java (97%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/util/JSON.scala (98%) rename scaladoc/src/dotty/{dokka => tools/scaladoc}/util/html.scala (98%) diff --git a/scaladoc-js/src/Globals.scala b/scaladoc-js/src/Globals.scala index e85230dede37..919515e3d1f9 100644 --- a/scaladoc-js/src/Globals.scala +++ b/scaladoc-js/src/Globals.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import scala.scalajs.js import scala.scalajs.js.annotation.JSGlobalScope diff --git a/scaladoc-js/src/Main.scala b/scaladoc-js/src/Main.scala index 6c179a1890a0..25892c5acb7e 100644 --- a/scaladoc-js/src/Main.scala +++ b/scaladoc-js/src/Main.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc object Main extends App { Searchbar() diff --git a/scaladoc-js/src/searchbar/PageEntry.scala b/scaladoc-js/src/searchbar/PageEntry.scala index e67b61109efa..60812715d103 100644 --- a/scaladoc-js/src/searchbar/PageEntry.scala +++ b/scaladoc-js/src/searchbar/PageEntry.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import scala.scalajs.js diff --git a/scaladoc-js/src/searchbar/Searchbar.scala b/scaladoc-js/src/searchbar/Searchbar.scala index 65347a9bd116..a3dce6bb3a09 100644 --- a/scaladoc-js/src/searchbar/Searchbar.scala +++ b/scaladoc-js/src/searchbar/Searchbar.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc class Searchbar { val pages = SearchbarGlobals.pages.toList.map(PageEntry.apply) diff --git a/scaladoc-js/src/searchbar/SearchbarComponent.scala b/scaladoc-js/src/searchbar/SearchbarComponent.scala index 3cf0272a012d..8d6d79c8ab49 100644 --- a/scaladoc-js/src/searchbar/SearchbarComponent.scala +++ b/scaladoc-js/src/searchbar/SearchbarComponent.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import org.scalajs.dom._ import org.scalajs.dom.html.Input diff --git a/scaladoc-js/src/searchbar/SearchbarGlobals.scala b/scaladoc-js/src/searchbar/SearchbarGlobals.scala index 3daa50cba493..d42ca9ef9c17 100644 --- a/scaladoc-js/src/searchbar/SearchbarGlobals.scala +++ b/scaladoc-js/src/searchbar/SearchbarGlobals.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import scala.scalajs.js import scala.scalajs.js.annotation.JSGlobalScope diff --git a/scaladoc-js/src/searchbar/engine/Matchers.scala b/scaladoc-js/src/searchbar/engine/Matchers.scala index faa3dc041d86..a933a3f88c23 100644 --- a/scaladoc-js/src/searchbar/engine/Matchers.scala +++ b/scaladoc-js/src/searchbar/engine/Matchers.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc enum Matchers extends Function1[PageEntry, Int]: case ByName(query: String) diff --git a/scaladoc-js/src/searchbar/engine/QueryParser.scala b/scaladoc-js/src/searchbar/engine/QueryParser.scala index 7d025c8e9866..bb6dcaa3b1c9 100644 --- a/scaladoc-js/src/searchbar/engine/QueryParser.scala +++ b/scaladoc-js/src/searchbar/engine/QueryParser.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import scala.util.matching.Regex._ import scala.util.matching._ diff --git a/scaladoc-js/src/searchbar/engine/SearchbarEngine.scala b/scaladoc-js/src/searchbar/engine/SearchbarEngine.scala index 4ee3d0f943a4..cbc43eaec051 100644 --- a/scaladoc-js/src/searchbar/engine/SearchbarEngine.scala +++ b/scaladoc-js/src/searchbar/engine/SearchbarEngine.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import math.Ordering.Implicits.seqOrdering diff --git a/scaladoc/README.md b/scaladoc/README.md index eae617c5f067..c25eb32f9d3e 100644 --- a/scaladoc/README.md +++ b/scaladoc/README.md @@ -73,8 +73,8 @@ You can also find the result of building the same sites for latest `master` at: ### Testing Most tests rely on comparing signatures (of classes, methods, objects etc.) extracted from the generated documentation -to signatures found in source files. Such tests are defined using [MultipleFileTest](test/dotty/dokka/MultipleFileTest.scala) class -and its subtypes (such as [SingleFileTest](test/dotty/dokka/SingleFileTest.scala)) +to signatures found in source files. Such tests are defined using [MultipleFileTest](test/dotty/tools/scala3doc/MultipleFileTest.scala) class +and its subtypes (such as [SingleFileTest](test/dotty/tools/scala3doc/SingleFileTest.scala)) WARNING: As the classes mentioned above are likely to evolve, the description below might easily get out of date. In case of any discrepancies rely on the source files instead. diff --git a/scaladoc/documentation/docs/design.md b/scaladoc/documentation/docs/design.md index 477b2849cbf7..3ca5639cf430 100644 --- a/scaladoc/documentation/docs/design.md +++ b/scaladoc/documentation/docs/design.md @@ -4,4 +4,4 @@ ## Interface -scaladoc is intednted to be use with sbt as well as from commend line or from other buildtools. The main entry point to processing is [Main](dotty.dokka.Main$) class with [[dotty.dokka.Main$.main]]. \ No newline at end of file +scaladoc is intednted to be use with sbt as well as from commend line or from other buildtools. The main entry point to processing is [Main](dotty.tools.scaladoc.Main$) class with [[dotty.tools.scaladoc.Main$.main]]. \ No newline at end of file diff --git a/scaladoc/scripts/linkstovisit.txt b/scaladoc/scripts/linkstovisit.txt index 02f6d15859de..c615ece17d35 100644 --- a/scaladoc/scripts/linkstovisit.txt +++ b/scaladoc/scripts/linkstovisit.txt @@ -1,13 +1,13 @@ -./self/api/dotty.dokka/tasty/comments/wiki/-converter/index.html,on any page try minimizing window to see if relative styles are applied correctly -./self/api/dotty.dokka/-base-key/index.html,is searchbar correct width -./self/api/dotty.dokka/as-map.html,are logos in good propotions -./self/api/dotty.dokka/model/api/as-signature.html,is sidebar not collapsing/overlaying -./self/api/dotty.dokka/-documentable-element/index.html,are overrides pointing to correct function? is filtering working -./self/api/dotty.dokka/model/api/-member/index.html,is source link pointing to correct element (object Member)? -./self/api/dotty.dokka/-scala-content-node/index.html,you can see is graph properly rendered; can you navigate by nodes up and down the hierarchy +./self/api/dotty.tools.scaladoc/tasty/comments/wiki/-converter/index.html,on any page try minimizing window to see if relative styles are applied correctly +./self/api/dotty.tools.scaladoc/-base-key/index.html,is searchbar correct width +./self/api/dotty.tools.scaladoc/as-map.html,are logos in good propotions +./self/api/dotty.tools.scaladoc/model/api/as-signature.html,is sidebar not collapsing/overlaying +./self/api/dotty.tools.scaladoc/-documentable-element/index.html,are overrides pointing to correct function? is filtering working +./self/api/dotty.tools.scaladoc/model/api/-member/index.html,is source link pointing to correct element (object Member)? +./self/api/dotty.tools.scaladoc/-scala-content-node/index.html,you can see is graph properly rendered; can you navigate by nodes up and down the hierarchy ./self/api/index/index.html,package overview -./self/api/dotty.dokka/index.html,example package -./self/api/dotty.dokka/-documentable-element/index.html,example classlike -./self/api/dotty.dokka/get-from-extra.html,example package level method -./self/api/dotty.dokka/put.html,example extension -./self/api/dotty.dokka/-dot-diagram-builder/build.html,example method +./self/api/dotty.tools.scaladoc/index.html,example package +./self/api/dotty.tools.scaladoc/-documentable-element/index.html,example classlike +./self/api/dotty.tools.scaladoc/get-from-extra.html,example package level method +./self/api/dotty.tools.scaladoc/put.html,example extension +./self/api/dotty.tools.scaladoc/-dot-diagram-builder/build.html,example method diff --git a/scaladoc/src/dotty/tools/dottydoc/Main.scala b/scaladoc/src/dotty/tools/dottydoc/Main.scala index c529c32fd3df..539efcd7339f 100644 --- a/scaladoc/src/dotty/tools/dottydoc/Main.scala +++ b/scaladoc/src/dotty/tools/dottydoc/Main.scala @@ -22,4 +22,4 @@ object Main extends Driver: * how they're split). */ override def process(args: Array[String], rootCtx: Context): Reporter = - dotty.dokka.Scaladoc.run(args, rootCtx) + dotty.tools.scaladoc.Scaladoc.run(args, rootCtx) diff --git a/scaladoc/src/dotty/dokka/DRI.scala b/scaladoc/src/dotty/tools/scaladoc/DRI.scala similarity index 94% rename from scaladoc/src/dotty/dokka/DRI.scala rename to scaladoc/src/dotty/tools/scaladoc/DRI.scala index 141bfd598cfc..45eb4745b4bb 100644 --- a/scaladoc/src/dotty/dokka/DRI.scala +++ b/scaladoc/src/dotty/tools/scaladoc/DRI.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.nio.file.Path diff --git a/scaladoc/src/dotty/dokka/DocContext.scala b/scaladoc/src/dotty/tools/scaladoc/DocContext.scala similarity index 93% rename from scaladoc/src/dotty/dokka/DocContext.scala rename to scaladoc/src/dotty/tools/scaladoc/DocContext.scala index 5cb908a6b7da..4daf142c2f77 100644 --- a/scaladoc/src/dotty/dokka/DocContext.scala +++ b/scaladoc/src/dotty/tools/scaladoc/DocContext.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.io.File import java.nio.file.Files @@ -6,7 +6,7 @@ import java.nio.file.Path import java.nio.file.Paths import collection.JavaConverters._ -import dotty.dokka.site.StaticSiteContext +import dotty.tools.scaladoc.site.StaticSiteContext import dotty.tools.dotc.core.Contexts._ import dotty.tools.io.VirtualFile import dotty.tools.dotc.util.SourceFile @@ -71,9 +71,6 @@ case class NavigationNode(name: String, dri: DRI, nested: Seq[NavigationNode]) case class DocContext(args: Scaladoc.Args, compilerContext: CompilerContext): lazy val sourceLinks: SourceLinks = SourceLinks.load(using this) - // Nasty hack but will get rid of it once we migrate away from dokka renderer - var navigationNode: Option[NavigationNode] = None - lazy val staticSiteContext = args.docsRoot.map(path => StaticSiteContext( File(path).getAbsoluteFile(), args, diff --git a/scaladoc/src/dotty/dokka/ExternalDocLink.scala b/scaladoc/src/dotty/tools/scaladoc/ExternalDocLink.scala similarity index 98% rename from scaladoc/src/dotty/dokka/ExternalDocLink.scala rename to scaladoc/src/dotty/tools/scaladoc/ExternalDocLink.scala index 4f04d7322955..7d4bdaeaa8df 100644 --- a/scaladoc/src/dotty/dokka/ExternalDocLink.scala +++ b/scaladoc/src/dotty/tools/scaladoc/ExternalDocLink.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.net.URL import scala.util.matching._ diff --git a/scaladoc/src/dotty/dokka/Main.scala b/scaladoc/src/dotty/tools/scaladoc/Main.scala similarity index 96% rename from scaladoc/src/dotty/dokka/Main.scala rename to scaladoc/src/dotty/tools/scaladoc/Main.scala index bd90da797eda..3f796d4b6840 100644 --- a/scaladoc/src/dotty/dokka/Main.scala +++ b/scaladoc/src/dotty/tools/scaladoc/Main.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.util.ServiceLoader import java.io.File diff --git a/scaladoc/src/dotty/dokka/ScalaModuleCreator.scala b/scaladoc/src/dotty/tools/scaladoc/ScalaModuleCreator.scala similarity index 92% rename from scaladoc/src/dotty/dokka/ScalaModuleCreator.scala rename to scaladoc/src/dotty/tools/scaladoc/ScalaModuleCreator.scala index d4369d8c7e5d..fbf7d02a2c3d 100644 --- a/scaladoc/src/dotty/dokka/ScalaModuleCreator.scala +++ b/scaladoc/src/dotty/tools/scaladoc/ScalaModuleCreator.scala @@ -1,6 +1,6 @@ -package dotty.dokka +package dotty.tools.scaladoc -import dotty.dokka.tasty.DokkaTastyInspector +import dotty.tools.scaladoc.tasty.DokkaTastyInspector import collection.JavaConverters._ import transformers._ diff --git a/scaladoc/src/dotty/dokka/Scaladoc.scala b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala similarity index 91% rename from scaladoc/src/dotty/dokka/Scaladoc.scala rename to scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala index 5298ec4289bd..cec8d648f0db 100644 --- a/scaladoc/src/dotty/dokka/Scaladoc.scala +++ b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.util.ServiceLoader import java.io.File @@ -65,11 +65,11 @@ object Scaladoc: ctx.reporter - private [dokka] def run(args: Args)(using ctx: CompilerContext): DocContext = + private [scaladoc] def run(args: Args)(using ctx: CompilerContext): DocContext = given docContext: DocContext = new DocContext(args, ctx) val module = ScalaModuleProvider.mkModule() - new dotty.dokka.renderers.HtmlRenderer(module.rootPackage, module.members).render() + new dotty.tools.scaladoc.renderers.HtmlRenderer(module.rootPackage, module.members).render() report.inform("generation completed successfully") docContext diff --git a/scaladoc/src/dotty/dokka/ScaladocArgs.scala b/scaladoc/src/dotty/tools/scaladoc/ScaladocArgs.scala similarity index 98% rename from scaladoc/src/dotty/dokka/ScaladocArgs.scala rename to scaladoc/src/dotty/tools/scaladoc/ScaladocArgs.scala index 17a065ceb9f7..ac45d706b805 100644 --- a/scaladoc/src/dotty/dokka/ScaladocArgs.scala +++ b/scaladoc/src/dotty/tools/scaladoc/ScaladocArgs.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.util.ServiceLoader import java.io.File @@ -10,7 +10,7 @@ import java.nio.file.Files import dotty.tools.dotc.config.Settings._ import dotty.tools.dotc.config.CommonScalaSettings -import dotty.dokka.Scaladoc._ +import dotty.tools.scaladoc.Scaladoc._ class ScaladocArgs extends SettingGroup with CommonScalaSettings: val unsupportedSettings = Seq( diff --git a/scaladoc/src/dotty/dokka/SourceLinks.scala b/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala similarity index 99% rename from scaladoc/src/dotty/dokka/SourceLinks.scala rename to scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala index b34119ea9f7f..6ff5beeb7300 100644 --- a/scaladoc/src/dotty/dokka/SourceLinks.scala +++ b/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.nio.file.Path import java.nio.file.Paths diff --git a/scaladoc/src/dotty/dokka/api.scala b/scaladoc/src/dotty/tools/scaladoc/api.scala similarity index 99% rename from scaladoc/src/dotty/dokka/api.scala rename to scaladoc/src/dotty/tools/scaladoc/api.scala index 650fbabda295..06e6fe2e7adc 100644 --- a/scaladoc/src/dotty/dokka/api.scala +++ b/scaladoc/src/dotty/tools/scaladoc/api.scala @@ -1,6 +1,6 @@ -package dotty.dokka +package dotty.tools.scaladoc -import dotty.dokka.tasty.comments.Comment +import dotty.tools.scaladoc.tasty.comments.Comment enum Visibility(val name: String): case Unrestricted extends Visibility("") diff --git a/scaladoc/src/dotty/dokka/compat.scala b/scaladoc/src/dotty/tools/scaladoc/compat.scala similarity index 93% rename from scaladoc/src/dotty/dokka/compat.scala rename to scaladoc/src/dotty/tools/scaladoc/compat.scala index 9a15f938926a..35eab37fa1b5 100644 --- a/scaladoc/src/dotty/dokka/compat.scala +++ b/scaladoc/src/dotty/tools/scaladoc/compat.scala @@ -1,11 +1,11 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.util.stream.Stream // comment out - wrong error! import java.util.stream.Collectors import java.util.Collections import java.nio.file.Path import com.vladsch.flexmark.util.ast.{Node => MdNode} -import dotty.dokka.tasty.comments.wiki.WikiDocElement +import dotty.tools.scaladoc.tasty.comments.wiki.WikiDocElement import collection.JavaConverters._ def JList[T](e: T*): JList[T] = e.asJava diff --git a/scaladoc/src/dotty/dokka/renderers/DotDiagramBuilder.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/DotDiagramBuilder.scala similarity index 97% rename from scaladoc/src/dotty/dokka/renderers/DotDiagramBuilder.scala rename to scaladoc/src/dotty/tools/scaladoc/renderers/DotDiagramBuilder.scala index d79d178504da..4a680bc62ca2 100644 --- a/scaladoc/src/dotty/dokka/renderers/DotDiagramBuilder.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/DotDiagramBuilder.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers import util.HTML._ diff --git a/scaladoc/src/dotty/dokka/renderers/HtmlRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala similarity index 99% rename from scaladoc/src/dotty/dokka/renderers/HtmlRenderer.scala rename to scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala index d74a5be52096..764d4f5766ba 100644 --- a/scaladoc/src/dotty/dokka/renderers/HtmlRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala @@ -1,11 +1,11 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers import util.HTML._ import collection.JavaConverters._ import java.net.URI import java.net.URL -import dotty.dokka.site._ +import dotty.tools.scaladoc.site._ import scala.util.Try import org.jsoup.Jsoup import java.nio.file.Paths diff --git a/scaladoc/src/dotty/dokka/renderers/Locations.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala similarity index 98% rename from scaladoc/src/dotty/dokka/renderers/Locations.scala rename to scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala index e1b83ad79e5f..aae61ab30507 100644 --- a/scaladoc/src/dotty/dokka/renderers/Locations.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala @@ -1,11 +1,11 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers import util.HTML._ import collection.JavaConverters._ import java.net.URI import java.net.URL -import dotty.dokka.site._ +import dotty.tools.scaladoc.site._ import scala.util.Try import org.jsoup.Jsoup import java.nio.file.Paths diff --git a/scaladoc/src/dotty/dokka/renderers/MemberRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala similarity index 98% rename from scaladoc/src/dotty/dokka/renderers/MemberRenderer.scala rename to scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala index 766cf4c0ea29..0d09a109ddd6 100644 --- a/scaladoc/src/dotty/dokka/renderers/MemberRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala @@ -1,13 +1,13 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers import scala.collection.immutable.SortedMap import util.HTML._ import collection.JavaConverters._ -import dotty.dokka.translators.FilterAttributes -import dotty.dokka.tasty.comments.markdown.DocFlexmarkRenderer +import dotty.tools.scaladoc.translators.FilterAttributes +import dotty.tools.scaladoc.tasty.comments.markdown.DocFlexmarkRenderer import com.vladsch.flexmark.util.ast.{Node => MdNode} -import dotty.dokka.tasty.comments.wiki.WikiDocElement +import dotty.tools.scaladoc.tasty.comments.wiki.WikiDocElement import translators._ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) extends DocRender(signatureRenderer): diff --git a/scaladoc/src/dotty/dokka/renderers/Resources.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala similarity index 97% rename from scaladoc/src/dotty/dokka/renderers/Resources.scala rename to scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala index 6fd671b82e52..233c452e8d18 100644 --- a/scaladoc/src/dotty/dokka/renderers/Resources.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala @@ -1,18 +1,18 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers import util.HTML._ import collection.JavaConverters._ import java.net.URI import java.net.URL -import dotty.dokka.site._ +import dotty.tools.scaladoc.site._ import scala.util.Try import org.jsoup.Jsoup import java.nio.file.Paths import java.nio.file.Path import java.nio.file.Files import java.io.File -import dotty.dokka.translators.FilterAttributes +import dotty.tools.scaladoc.translators.FilterAttributes import util._ import translators._ diff --git a/scaladoc/src/dotty/dokka/renderers/SignatureRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SignatureRenderer.scala similarity index 97% rename from scaladoc/src/dotty/dokka/renderers/SignatureRenderer.scala rename to scaladoc/src/dotty/tools/scaladoc/renderers/SignatureRenderer.scala index d77bf180d3df..4abc2090954c 100644 --- a/scaladoc/src/dotty/dokka/renderers/SignatureRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SignatureRenderer.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers import util.HTML._ diff --git a/scaladoc/src/dotty/dokka/renderers/SiteRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala similarity index 96% rename from scaladoc/src/dotty/dokka/renderers/SiteRenderer.scala rename to scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala index c50d476da13c..6ce8a06425a8 100644 --- a/scaladoc/src/dotty/dokka/renderers/SiteRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala @@ -1,11 +1,11 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers import util.HTML._ import collection.JavaConverters._ import java.net.URI import java.net.URL -import dotty.dokka.site._ +import dotty.tools.scaladoc.site._ import scala.util.Try import org.jsoup.Jsoup import java.nio.file.Paths diff --git a/scaladoc/src/dotty/dokka/renderers/WikiDocRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/WikiDocRenderer.scala similarity index 93% rename from scaladoc/src/dotty/dokka/renderers/WikiDocRenderer.scala rename to scaladoc/src/dotty/tools/scaladoc/renderers/WikiDocRenderer.scala index 71e720032b83..8204039abd29 100644 --- a/scaladoc/src/dotty/dokka/renderers/WikiDocRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/WikiDocRenderer.scala @@ -1,11 +1,11 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers -import dotty.dokka.tasty.comments.wiki._ +import dotty.tools.scaladoc.tasty.comments.wiki._ import util.HTML._ import com.vladsch.flexmark.util.ast.{Node => MdNode} -import dotty.dokka.tasty.comments.wiki.WikiDocElement -import dotty.dokka.tasty.comments.markdown.DocFlexmarkRenderer +import dotty.tools.scaladoc.tasty.comments.wiki.WikiDocElement +import dotty.tools.scaladoc.tasty.comments.markdown.DocFlexmarkRenderer class DocRender(signatureRenderer: SignatureRenderer)(using DocContext): diff --git a/scaladoc/src/dotty/dokka/renderers/Writer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala similarity index 97% rename from scaladoc/src/dotty/dokka/renderers/Writer.scala rename to scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala index 46d43354e790..dad7aaa9e650 100644 --- a/scaladoc/src/dotty/dokka/renderers/Writer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers import java.io.InputStream diff --git a/scaladoc/src/dotty/dokka/site/LoadedTemplate.scala b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala similarity index 98% rename from scaladoc/src/dotty/dokka/site/LoadedTemplate.scala rename to scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala index a82ba5eeb7ea..beda1eb14676 100644 --- a/scaladoc/src/dotty/dokka/site/LoadedTemplate.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package site import java.io.File diff --git a/scaladoc/src/dotty/dokka/site/SidebarParser.scala b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala similarity index 97% rename from scaladoc/src/dotty/dokka/site/SidebarParser.scala rename to scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala index ed5e4b081935..ff3c2ae2fc9f 100644 --- a/scaladoc/src/dotty/dokka/site/SidebarParser.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package site import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; diff --git a/scaladoc/src/dotty/dokka/site/StaticSiteContext.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala similarity index 99% rename from scaladoc/src/dotty/dokka/site/StaticSiteContext.scala rename to scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala index 63bc34c7df26..7c51eda1c5b9 100644 --- a/scaladoc/src/dotty/dokka/site/StaticSiteContext.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package site import java.io.File diff --git a/scaladoc/src/dotty/dokka/site/common.scala b/scaladoc/src/dotty/tools/scaladoc/site/common.scala similarity index 99% rename from scaladoc/src/dotty/dokka/site/common.scala rename to scaladoc/src/dotty/tools/scaladoc/site/common.scala index 7f50de3735af..371f1038d6b9 100644 --- a/scaladoc/src/dotty/dokka/site/common.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/common.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package site import java.io.File diff --git a/scaladoc/src/dotty/dokka/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala similarity index 99% rename from scaladoc/src/dotty/dokka/site/templates.scala rename to scaladoc/src/dotty/tools/scaladoc/site/templates.scala index 0de7f1d2115b..60216fdc5936 100644 --- a/scaladoc/src/dotty/dokka/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package site import java.io.File diff --git a/scaladoc/src/dotty/dokka/tasty/BasicSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala similarity index 97% rename from scaladoc/src/dotty/dokka/tasty/BasicSupport.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala index 1435b3047a47..1bef73d54dbe 100644 --- a/scaladoc/src/dotty/dokka/tasty/BasicSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala @@ -1,8 +1,8 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty import collection.JavaConverters._ -import dotty.dokka._ +import dotty.tools.scaladoc._ import scala.quoted._ trait BasicSupport: diff --git a/scaladoc/src/dotty/dokka/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/ClassLikeSupport.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala index f8e7eabe7751..e45c5b067095 100644 --- a/scaladoc/src/dotty/dokka/tasty/ClassLikeSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala @@ -1,8 +1,8 @@ -package dotty.dokka.tasty +package dotty.tools.scaladoc.tasty import collection.JavaConverters._ -import dotty.dokka._ -import dotty.dokka.{Signature => DSignature} +import dotty.tools.scaladoc._ +import dotty.tools.scaladoc.{Signature => DSignature} trait ClassLikeSupport: self: TastyParser => diff --git a/scaladoc/src/dotty/dokka/tasty/NameNormalizer.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala similarity index 87% rename from scaladoc/src/dotty/dokka/tasty/NameNormalizer.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala index 5c5443345fdc..8ddf9ed5fec6 100644 --- a/scaladoc/src/dotty/dokka/tasty/NameNormalizer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala @@ -1,6 +1,6 @@ -package dotty.dokka.tasty +package dotty.tools.scaladoc.tasty -import dotty.dokka._ +import dotty.tools.scaladoc._ trait NameNormalizer { self: TastyParser => import qctx.reflect._ diff --git a/scaladoc/src/dotty/dokka/tasty/PackageSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/PackageSupport.scala similarity index 95% rename from scaladoc/src/dotty/dokka/tasty/PackageSupport.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/PackageSupport.scala index b04ff19d65a2..3cde59320b23 100644 --- a/scaladoc/src/dotty/dokka/tasty/PackageSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/PackageSupport.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty import collection.JavaConverters._ diff --git a/scaladoc/src/dotty/dokka/tasty/ScalaDocSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ScalaDocSupport.scala similarity index 92% rename from scaladoc/src/dotty/dokka/tasty/ScalaDocSupport.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/ScalaDocSupport.scala index 261a7ced9e38..2a41c3251727 100644 --- a/scaladoc/src/dotty/dokka/tasty/ScalaDocSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ScalaDocSupport.scala @@ -1,10 +1,10 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty import scala.jdk.CollectionConverters._ -import dotty.dokka.Scaladoc.CommentSyntax -import dotty.dokka.tasty.comments.Comment +import dotty.tools.scaladoc.Scaladoc.CommentSyntax +import dotty.tools.scaladoc.tasty.comments.Comment trait ScaladocSupport { self: TastyParser => import qctx.reflect._ diff --git a/scaladoc/src/dotty/dokka/tasty/SymOps.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/SymOps.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala index 347ab54f3ab7..3842aae82509 100644 --- a/scaladoc/src/dotty/dokka/tasty/SymOps.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty import scala.quoted._ diff --git a/scaladoc/src/dotty/dokka/tasty/SyntheticSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SyntheticSupport.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/SyntheticSupport.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/SyntheticSupport.scala index 589e8037b6da..28440b066fa7 100644 --- a/scaladoc/src/dotty/dokka/tasty/SyntheticSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/SyntheticSupport.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty import scala.quoted._ diff --git a/scaladoc/src/dotty/dokka/tasty/TastyParser.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala similarity index 96% rename from scaladoc/src/dotty/dokka/tasty/TastyParser.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala index d5ea8580231a..adf710ca1dfb 100644 --- a/scaladoc/src/dotty/dokka/tasty/TastyParser.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty @@ -10,16 +10,16 @@ import scala.quoted.Quotes import dotty.tools.dotc -import dotty.dokka.tasty.comments.MemberLookup -import dotty.dokka.tasty.comments.QueryParser -import dotty.dokka.tasty.comments.Comment +import dotty.tools.scaladoc.tasty.comments.MemberLookup +import dotty.tools.scaladoc.tasty.comments.QueryParser +import dotty.tools.scaladoc.tasty.comments.Comment import java.nio.file.Paths import java.nio.file.Files /** Responsible for collectively inspecting all the Tasty files we're interested in. * - * Delegates most of the work to [[TastyParser]] [[dotty.dokka.tasty.TastyParser]]. + * Delegates most of the work to [[TastyParser]] [[dotty.tools.scaladoc.tasty.TastyParser]]. */ case class DokkaTastyInspector()(using ctx: DocContext) extends DocTastyInspector: diff --git a/scaladoc/src/dotty/dokka/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/TypesSupport.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala index dbd00805da90..96fe4ac0c585 100644 --- a/scaladoc/src/dotty/dokka/tasty/TypesSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty import collection.JavaConverters._ diff --git a/scaladoc/src/dotty/dokka/tasty/comments/Cleaner.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Cleaner.scala similarity index 97% rename from scaladoc/src/dotty/dokka/tasty/comments/Cleaner.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/Cleaner.scala index 98465acbbaf7..e495e90018cd 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/Cleaner.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Cleaner.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments object Cleaner { diff --git a/scaladoc/src/dotty/dokka/tasty/comments/CommentExpander.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentExpander.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/comments/CommentExpander.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentExpander.scala index ddd598e07692..e5e98650e2dc 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/CommentExpander.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentExpander.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import dotty.tools._ diff --git a/scaladoc/src/dotty/dokka/tasty/comments/CommentRegex.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentRegex.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/comments/CommentRegex.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentRegex.scala index 9e21b036ae20..6b1cd970453e 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/CommentRegex.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentRegex.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import scala.util.matching.Regex diff --git a/scaladoc/src/dotty/dokka/tasty/comments/Comments.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala similarity index 98% rename from scaladoc/src/dotty/dokka/tasty/comments/Comments.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala index 75e589c7bece..8a460c84e3eb 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/Comments.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import scala.collection.immutable.SortedMap @@ -10,9 +10,9 @@ import com.vladsch.flexmark.formatter.Formatter import com.vladsch.flexmark.util.options.MutableDataSet import scala.quoted._ -import dotty.dokka.tasty.comments.wiki.Paragraph -import dotty.dokka.DocPart -import dotty.dokka.tasty.SymOps +import dotty.tools.scaladoc.tasty.comments.wiki.Paragraph +import dotty.tools.scaladoc.DocPart +import dotty.tools.scaladoc.tasty.SymOps import collection.JavaConverters._ class Repr(val qctx: Quotes)(val sym: qctx.reflect.Symbol) diff --git a/scaladoc/src/dotty/dokka/tasty/comments/MarkdownParser.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MarkdownParser.scala similarity index 98% rename from scaladoc/src/dotty/dokka/tasty/comments/MarkdownParser.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/MarkdownParser.scala index 41a51d7a06ac..8ed84930c4e0 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/MarkdownParser.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MarkdownParser.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import java.util.{ Arrays } diff --git a/scaladoc/src/dotty/dokka/tasty/comments/MemberLookup.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/comments/MemberLookup.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala index 771a64bd91ef..4e420e5f4e2b 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/MemberLookup.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/MemberLookup.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import scala.quoted._ diff --git a/scaladoc/src/dotty/dokka/tasty/comments/Preparser.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Preparser.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/comments/Preparser.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/Preparser.scala index 098b440d0c6a..f62b9983584a 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/Preparser.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Preparser.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import scala.collection.mutable diff --git a/scaladoc/src/dotty/dokka/tasty/comments/Queries.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Queries.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/comments/Queries.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/Queries.scala index 2f9c0485f32d..a271f8c8e907 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/Queries.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Queries.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments sealed trait Query { diff --git a/scaladoc/src/dotty/dokka/tasty/comments/markdown/DocFlexmarkExtension.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/DocFlexmarkExtension.scala similarity index 98% rename from scaladoc/src/dotty/dokka/tasty/comments/markdown/DocFlexmarkExtension.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/DocFlexmarkExtension.scala index 19a0ab42961a..9cd0e0653898 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/markdown/DocFlexmarkExtension.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/DocFlexmarkExtension.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments package markdown diff --git a/scaladoc/src/dotty/dokka/tasty/comments/package.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/package.scala similarity index 94% rename from scaladoc/src/dotty/dokka/tasty/comments/package.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/package.scala index 24e5b1dd0fc3..56cd946fc984 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/package.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/package.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import scala.jdk.CollectionConverters._ diff --git a/scaladoc/src/dotty/dokka/tasty/comments/wiki/Entities.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/comments/wiki/Entities.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala index f253738b9662..5cec60977813 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/wiki/Entities.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments.wiki import scala.collection.{Seq => _, _} diff --git a/scaladoc/src/dotty/dokka/tasty/comments/wiki/Parser.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala similarity index 99% rename from scaladoc/src/dotty/dokka/tasty/comments/wiki/Parser.scala rename to scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala index 07b28d4afce0..2436ca4e5239 100644 --- a/scaladoc/src/dotty/dokka/tasty/comments/wiki/Parser.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala @@ -1,9 +1,9 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments.wiki import scala.collection.mutable -import dotty.dokka.tasty.comments.Regexes._ +import dotty.tools.scaladoc.tasty.comments.Regexes._ /** Original wikiparser from NSC * @author Ingo Maier diff --git a/scaladoc/src/dotty/dokka/transformers/ImplicitMembersExtensionTransformer.scala b/scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala similarity index 98% rename from scaladoc/src/dotty/dokka/transformers/ImplicitMembersExtensionTransformer.scala rename to scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala index 0825a9574d64..9d95f4462b78 100644 --- a/scaladoc/src/dotty/dokka/transformers/ImplicitMembersExtensionTransformer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package transformers class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Module): diff --git a/scaladoc/src/dotty/dokka/transformers/InheritanceInformationTransformer.scala b/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala similarity index 97% rename from scaladoc/src/dotty/dokka/transformers/InheritanceInformationTransformer.scala rename to scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala index e0399f1ef6f8..7a87c7de5674 100644 --- a/scaladoc/src/dotty/dokka/transformers/InheritanceInformationTransformer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package transformers class InheritanceInformationTransformer(using DocContext) extends (Module => Module): diff --git a/scaladoc/src/dotty/dokka/translators/FilterAttributes.scala b/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala similarity index 97% rename from scaladoc/src/dotty/dokka/translators/FilterAttributes.scala rename to scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala index f76799e60541..0a1b62dcb4d6 100644 --- a/scaladoc/src/dotty/dokka/translators/FilterAttributes.scala +++ b/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package translators object FilterAttributes: diff --git a/scaladoc/src/dotty/dokka/translators/ScalaSignatureProvider.scala b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala similarity index 99% rename from scaladoc/src/dotty/dokka/translators/ScalaSignatureProvider.scala rename to scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala index c1493567b6b0..51f642de41d8 100644 --- a/scaladoc/src/dotty/dokka/translators/ScalaSignatureProvider.scala +++ b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package translators object ScalaSignatureProvider: diff --git a/scaladoc/src/dotty/dokka/translators/ScalaSignatureUtils.scala b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureUtils.scala similarity index 99% rename from scaladoc/src/dotty/dokka/translators/ScalaSignatureUtils.scala rename to scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureUtils.scala index 7637a3f46a76..3817c70eef5a 100644 --- a/scaladoc/src/dotty/dokka/translators/ScalaSignatureUtils.scala +++ b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureUtils.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package translators case class InlineSignatureBuilder(names: Signature = Nil, preName: Signature = Nil) extends SignatureBuilder: diff --git a/scaladoc/src/dotty/dokka/util/IO.java b/scaladoc/src/dotty/tools/scaladoc/util/IO.java similarity index 97% rename from scaladoc/src/dotty/dokka/util/IO.java rename to scaladoc/src/dotty/tools/scaladoc/util/IO.java index 1866db0ed670..10a4d75ebb01 100644 --- a/scaladoc/src/dotty/dokka/util/IO.java +++ b/scaladoc/src/dotty/tools/scaladoc/util/IO.java @@ -1,4 +1,4 @@ -package dotty.dokka.util; +package dotty.tools.scaladoc.util; import java.io.*; import java.nio.file.*; diff --git a/scaladoc/src/dotty/dokka/util/JSON.scala b/scaladoc/src/dotty/tools/scaladoc/util/JSON.scala similarity index 98% rename from scaladoc/src/dotty/dokka/util/JSON.scala rename to scaladoc/src/dotty/tools/scaladoc/util/JSON.scala index f64e91429831..d822bf4cf898 100644 --- a/scaladoc/src/dotty/dokka/util/JSON.scala +++ b/scaladoc/src/dotty/tools/scaladoc/util/JSON.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package util import scala.annotation.tailrec diff --git a/scaladoc/src/dotty/dokka/util/html.scala b/scaladoc/src/dotty/tools/scaladoc/util/html.scala similarity index 98% rename from scaladoc/src/dotty/dokka/util/html.scala rename to scaladoc/src/dotty/tools/scaladoc/util/html.scala index 5525d6514d5f..f8a02a0d6e55 100644 --- a/scaladoc/src/dotty/dokka/util/html.scala +++ b/scaladoc/src/dotty/tools/scaladoc/util/html.scala @@ -1,4 +1,4 @@ -package dotty.dokka.util +package dotty.tools.scaladoc.util /** * This is trivial html renderer using api inspired by ScalaTags diff --git a/scaladoc/test/dotty/dokka/BaseHtmlTest.scala b/scaladoc/test/dotty/dokka/BaseHtmlTest.scala index 36e802752854..de3b25c0595b 100644 --- a/scaladoc/test/dotty/dokka/BaseHtmlTest.scala +++ b/scaladoc/test/dotty/dokka/BaseHtmlTest.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.nio.file.Files import java.nio.file.Path @@ -8,7 +8,7 @@ import org.junit.Assert._ import org.jsoup.Jsoup import org.jsoup.nodes.Document import java.nio.charset.Charset -import dotty.dokka.test.BuildInfo +import dotty.tools.scaladoc.test.BuildInfo import util.IO class BaseHtmlTest: diff --git a/scaladoc/test/dotty/dokka/ExternalLocationProviderIntegrationTest.scala b/scaladoc/test/dotty/dokka/ExternalLocationProviderIntegrationTest.scala index 82f03319c459..ed2ca7385cdd 100644 --- a/scaladoc/test/dotty/dokka/ExternalLocationProviderIntegrationTest.scala +++ b/scaladoc/test/dotty/dokka/ExternalLocationProviderIntegrationTest.scala @@ -1,9 +1,9 @@ -package dotty.dokka +package dotty.tools.scaladoc import scala.io.Source import scala.jdk.CollectionConverters._ import scala.util.matching.Regex -import dotty.dokka.test.BuildInfo +import dotty.tools.scaladoc.test.BuildInfo import java.nio.file.Path; import org.jsoup.Jsoup import util.IO diff --git a/scaladoc/test/dotty/dokka/RaportingTest.scala b/scaladoc/test/dotty/dokka/RaportingTest.scala index 450aeb75d1f2..e84417b3850a 100644 --- a/scaladoc/test/dotty/dokka/RaportingTest.scala +++ b/scaladoc/test/dotty/dokka/RaportingTest.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.nio.file.Files import java.nio.file.Path diff --git a/scaladoc/test/dotty/dokka/ScaladocTest.scala b/scaladoc/test/dotty/dokka/ScaladocTest.scala index 4ebe5931f782..17db7310ec62 100644 --- a/scaladoc/test/dotty/dokka/ScaladocTest.scala +++ b/scaladoc/test/dotty/dokka/ScaladocTest.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import scala.jdk.CollectionConverters.{ListHasAsScala, SeqHasAsJava} import org.junit.{Test, Rule} diff --git a/scaladoc/test/dotty/dokka/SignatureTest.scala b/scaladoc/test/dotty/dokka/SignatureTest.scala index aa5287172941..21a19f477439 100644 --- a/scaladoc/test/dotty/dokka/SignatureTest.scala +++ b/scaladoc/test/dotty/dokka/SignatureTest.scala @@ -1,9 +1,9 @@ -package dotty.dokka +package dotty.tools.scaladoc import scala.io.Source import scala.jdk.CollectionConverters._ import scala.util.matching.Regex -import dotty.dokka.test.BuildInfo +import dotty.tools.scaladoc.test.BuildInfo import java.nio.file.Path; import org.jsoup.Jsoup import util.IO diff --git a/scaladoc/test/dotty/dokka/SignatureTestCases.scala b/scaladoc/test/dotty/dokka/SignatureTestCases.scala index db1101dec86a..0644f89f6fa1 100644 --- a/scaladoc/test/dotty/dokka/SignatureTestCases.scala +++ b/scaladoc/test/dotty/dokka/SignatureTestCases.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc class GenericSignaftures extends SignatureTest("genericSignatures", Seq("class")) diff --git a/scaladoc/test/dotty/dokka/SourceLinksTests.scala b/scaladoc/test/dotty/dokka/SourceLinksTests.scala index a4b9f245b54f..159614bdca56 100644 --- a/scaladoc/test/dotty/dokka/SourceLinksTests.scala +++ b/scaladoc/test/dotty/dokka/SourceLinksTests.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc import java.nio.file._ import org.junit.Assert._ diff --git a/scaladoc/test/dotty/dokka/diagram/HierarchyTest.scala b/scaladoc/test/dotty/dokka/diagram/HierarchyTest.scala index 9a4b8bdf7e33..5a02b9515994 100644 --- a/scaladoc/test/dotty/dokka/diagram/HierarchyTest.scala +++ b/scaladoc/test/dotty/dokka/diagram/HierarchyTest.scala @@ -1,7 +1,7 @@ -package dotty.dokka +package dotty.tools.scaladoc package diagram -import dotty.dokka.ScaladocTest +import dotty.tools.scaladoc.ScaladocTest import scala.jdk.CollectionConverters.{ListHasAsScala, SeqHasAsJava} import org.junit.Assert.{assertSame, assertTrue, assertEquals} diff --git a/scaladoc/test/dotty/dokka/linking/DriTest.scala b/scaladoc/test/dotty/dokka/linking/DriTest.scala index 62f724d0f8c6..0c630b1ed80b 100644 --- a/scaladoc/test/dotty/dokka/linking/DriTest.scala +++ b/scaladoc/test/dotty/dokka/linking/DriTest.scala @@ -1,9 +1,9 @@ -package dotty.dokka +package dotty.tools.scaladoc package linking import scala.jdk.CollectionConverters._ import scala.Function.const -import dotty.dokka.ScaladocTest +import dotty.tools.scaladoc.ScaladocTest abstract class DriTest(testName: String) extends ScaladocTest(testName): // override for additional assertions diff --git a/scaladoc/test/dotty/dokka/linking/DriTestCases.scala b/scaladoc/test/dotty/dokka/linking/DriTestCases.scala index e94e3b1f898e..3843dc5dee7c 100644 --- a/scaladoc/test/dotty/dokka/linking/DriTestCases.scala +++ b/scaladoc/test/dotty/dokka/linking/DriTestCases.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package linking import org.junit.Assert.assertTrue diff --git a/scaladoc/test/dotty/dokka/renderers/HtmlTagsTest.scala b/scaladoc/test/dotty/dokka/renderers/HtmlTagsTest.scala index f3ca3d4c27d5..bcc47ca0ccd9 100644 --- a/scaladoc/test/dotty/dokka/renderers/HtmlTagsTest.scala +++ b/scaladoc/test/dotty/dokka/renderers/HtmlTagsTest.scala @@ -1,8 +1,8 @@ -package dotty.dokka.renderers +package dotty.tools.scaladoc.renderers import org.junit.{Test, Rule} import org.junit.Assert.{assertSame, assertTrue, assertEquals} -import dotty.dokka.util.HTML._ +import dotty.tools.scaladoc.util.HTML._ class HtmlTagsTest { diff --git a/scaladoc/test/dotty/dokka/renderers/LocationTests.scala b/scaladoc/test/dotty/dokka/renderers/LocationTests.scala index 5b9a5473404f..ea1f0d925cec 100644 --- a/scaladoc/test/dotty/dokka/renderers/LocationTests.scala +++ b/scaladoc/test/dotty/dokka/renderers/LocationTests.scala @@ -1,9 +1,9 @@ -package dotty.dokka +package dotty.tools.scaladoc package renderers import org.junit.{Test, Rule} import org.junit.Assert.{assertSame, assertTrue, assertEquals} -import dotty.dokka.util.HTML._ +import dotty.tools.scaladoc.util.HTML._ class LocationTests: given DocContext = testDocContext diff --git a/scaladoc/test/dotty/dokka/site/NavigationTest.scala b/scaladoc/test/dotty/dokka/site/NavigationTest.scala index 565f716625b7..adfbb5113ff2 100644 --- a/scaladoc/test/dotty/dokka/site/NavigationTest.scala +++ b/scaladoc/test/dotty/dokka/site/NavigationTest.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package site import org.junit.Test diff --git a/scaladoc/test/dotty/dokka/site/SiteGeneratationTest.scala b/scaladoc/test/dotty/dokka/site/SiteGeneratationTest.scala index d406d8f214ed..972f9d782f0d 100644 --- a/scaladoc/test/dotty/dokka/site/SiteGeneratationTest.scala +++ b/scaladoc/test/dotty/dokka/site/SiteGeneratationTest.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package site import java.nio.file.Files @@ -9,7 +9,7 @@ import org.junit.Assert._ import org.jsoup.Jsoup import org.jsoup.nodes.Document import java.nio.charset.Charset -import dotty.dokka.test.BuildInfo +import dotty.tools.scaladoc.test.BuildInfo class SiteGeneratationTest extends BaseHtmlTest: diff --git a/scaladoc/test/dotty/dokka/site/StaticSiteContextTest.scala b/scaladoc/test/dotty/dokka/site/StaticSiteContextTest.scala index e86747133488..126a6b85d04b 100644 --- a/scaladoc/test/dotty/dokka/site/StaticSiteContextTest.scala +++ b/scaladoc/test/dotty/dokka/site/StaticSiteContextTest.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package site import org.junit.Test diff --git a/scaladoc/test/dotty/dokka/site/TemplateFileTests.scala b/scaladoc/test/dotty/dokka/site/TemplateFileTests.scala index f9fb93d2ad98..d7ff5340f46f 100644 --- a/scaladoc/test/dotty/dokka/site/TemplateFileTests.scala +++ b/scaladoc/test/dotty/dokka/site/TemplateFileTests.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package site import com.vladsch.flexmark.html.HtmlRenderer diff --git a/scaladoc/test/dotty/dokka/tasty/comments/CommentExpanderTests.scala b/scaladoc/test/dotty/dokka/tasty/comments/CommentExpanderTests.scala index 5a5df62611a0..63bb4fb21f03 100644 --- a/scaladoc/test/dotty/dokka/tasty/comments/CommentExpanderTests.scala +++ b/scaladoc/test/dotty/dokka/tasty/comments/CommentExpanderTests.scala @@ -1,12 +1,12 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import scala.quoted._ import org.junit.{Test, Rule} import org.junit.Assert.{assertSame, assertTrue, assertEquals} -import dotty.dokka.tasty.util._ -import dotty.dokka.tasty.TastyParser +import dotty.tools.scaladoc.tasty.util._ +import dotty.tools.scaladoc.tasty.TastyParser class CommentExpanderTests { def check(using quoted.Quotes)(): Unit = diff --git a/scaladoc/test/dotty/dokka/tasty/comments/DocFlexmarkParserTests.scala b/scaladoc/test/dotty/dokka/tasty/comments/DocFlexmarkParserTests.scala index 17851e342078..ffee974d1253 100644 --- a/scaladoc/test/dotty/dokka/tasty/comments/DocFlexmarkParserTests.scala +++ b/scaladoc/test/dotty/dokka/tasty/comments/DocFlexmarkParserTests.scala @@ -1,9 +1,9 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import org.junit.{Test, Rule} import org.junit.Assert.{assertSame, assertTrue, assertEquals} -import dotty.dokka.tasty.comments.markdown.DocFlexmarkParser +import dotty.tools.scaladoc.tasty.comments.markdown.DocFlexmarkParser class DocFlexmarkParserTests { @Test def test(): Unit = { diff --git a/scaladoc/test/dotty/dokka/tasty/comments/IntegrationTest.scala b/scaladoc/test/dotty/dokka/tasty/comments/IntegrationTest.scala index 376daf216bd9..d3b0aac5099d 100644 --- a/scaladoc/test/dotty/dokka/tasty/comments/IntegrationTest.scala +++ b/scaladoc/test/dotty/dokka/tasty/comments/IntegrationTest.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import org.junit.Test diff --git a/scaladoc/test/dotty/dokka/tasty/comments/MemberLookupTests.scala b/scaladoc/test/dotty/dokka/tasty/comments/MemberLookupTests.scala index c8bf6658c18b..b88e74c84817 100644 --- a/scaladoc/test/dotty/dokka/tasty/comments/MemberLookupTests.scala +++ b/scaladoc/test/dotty/dokka/tasty/comments/MemberLookupTests.scala @@ -1,11 +1,11 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import scala.quoted.Quotes import org.junit.{Test, Rule} import org.junit.Assert.{assertSame, assertTrue} -import dotty.dokka.tasty.util._ +import dotty.tools.scaladoc.tasty.util._ class LookupTestCases[Q <: Quotes](val q: Quotes) { @@ -125,7 +125,7 @@ class MemberLookupTests { alreadyRan = true def test()(using q: Quotes): Unit = { - import dotty.dokka.tasty.comments.MemberLookup + import dotty.tools.scaladoc.tasty.comments.MemberLookup val cases = LookupTestCases[q.type](q) diff --git a/scaladoc/test/dotty/dokka/tasty/comments/QueryParserTests.scala b/scaladoc/test/dotty/dokka/tasty/comments/QueryParserTests.scala index 7e3ee06e106a..676a11348a5f 100644 --- a/scaladoc/test/dotty/dokka/tasty/comments/QueryParserTests.scala +++ b/scaladoc/test/dotty/dokka/tasty/comments/QueryParserTests.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.comments import org.junit.{Test, Rule} diff --git a/scaladoc/test/dotty/dokka/tasty/util/TestUtils.scala b/scaladoc/test/dotty/dokka/tasty/util/TestUtils.scala index 48374f4af463..4ffc06516312 100644 --- a/scaladoc/test/dotty/dokka/tasty/util/TestUtils.scala +++ b/scaladoc/test/dotty/dokka/tasty/util/TestUtils.scala @@ -1,7 +1,7 @@ -package dotty.dokka +package dotty.tools.scaladoc package tasty.util -import dotty.dokka.test.BuildInfo +import dotty.tools.scaladoc.test.BuildInfo object TestUtils { def listOurClasses(): List[String] = { diff --git a/scaladoc/test/dotty/dokka/testUtils.scala b/scaladoc/test/dotty/dokka/testUtils.scala index fa5a04664ab7..6c1ce1049121 100644 --- a/scaladoc/test/dotty/dokka/testUtils.scala +++ b/scaladoc/test/dotty/dokka/testUtils.scala @@ -1,10 +1,10 @@ -package dotty.dokka +package dotty.tools.scaladoc import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.reporting.Diagnostic import dotty.tools.dotc.reporting.ConsoleReporter import dotty.tools.dotc.interfaces.Diagnostic.{ERROR, INFO, WARNING} -import dotty.dokka.test.BuildInfo +import dotty.tools.scaladoc.test.BuildInfo import org.junit.Assert._ import java.io.File diff --git a/scaladoc/test/dotty/dokka/util/JSONTest.scala b/scaladoc/test/dotty/dokka/util/JSONTest.scala index 98cc618e19cc..738729284398 100644 --- a/scaladoc/test/dotty/dokka/util/JSONTest.scala +++ b/scaladoc/test/dotty/dokka/util/JSONTest.scala @@ -1,4 +1,4 @@ -package dotty.dokka +package dotty.tools.scaladoc package util import org.junit.Test