Clean up files locations and directories

Author: romanowski

scala3doc/src/dotty/dokka/Scala3doc.scala

@@ -57,7 +57,7 @@ object Scala3doc:
     if !ctx.reporter.hasErrors then
       val updatedArgs = parsedArgs.copy(tastyDirs = Nil, tastyFiles = tastyFiles)
 
-      if (parsedArgs.output.exists()) IO.delete(parsedArgs.output)
+      if (parsedArgs.output.exists()) util.IO.delete(parsedArgs.output)
 
       run(updatedArgs)
       report.inform("Done")

scala3doc/src/dotty/dokka/ScalaModuleCreator.scala

@@ -2,6 +2,7 @@ package dotty.dokka
 
 import dotty.dokka.tasty.DokkaTastyInspector
 import collection.JavaConverters._
+import transformers._
 
 case class Module(rootPackage: Member, members: Map[DRI, Member])
 

scala3doc/src/dotty/renderers/DotDiagramBuilder.scala renamed to scala3doc/src/dotty/dokka/renderers/DotDiagramBuilder.scala

@@ -1,6 +1,7 @@
 package dotty.dokka
+package renderers
 
-import HTML._
+import util.HTML._
 
 object DotDiagramBuilder:
   def build(diagram: HierarchyGraph, renderer: SignatureRenderer)(using DocContext): String =

scala3doc/src/dotty/renderers/HtmlRenderer.scala renamed to scala3doc/src/dotty/dokka/renderers/HtmlRenderer.scala

@@ -1,7 +1,7 @@
 package dotty.dokka
 package renderers
 
-import HTML._
+import util.HTML._
 import collection.JavaConverters._
 import java.net.URI
 import java.net.URL
@@ -132,7 +132,7 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
 
     head(
       meta(charset := "utf-8"),
-      meta(HTML.name := "viewport", content := "width=device-width, initial-scale=1"),
+      meta(util.HTML.name := "viewport", content := "width=device-width, initial-scale=1"),
       title(page.link.name),
       link(
         rel := "shortcut icon",

scala3doc/src/dotty/renderers/Locations.scala renamed to scala3doc/src/dotty/dokka/renderers/Locations.scala

@@ -1,7 +1,7 @@
 package dotty.dokka
 package renderers
 
-import HTML._
+import util.HTML._
 import collection.JavaConverters._
 import java.net.URI
 import java.net.URL

scala3doc/src/dotty/renderers/MemberRenderer.scala renamed to scala3doc/src/dotty/dokka/renderers/MemberRenderer.scala

@@ -1,12 +1,14 @@
 package dotty.dokka
+package renderers
 
 import scala.collection.immutable.SortedMap
-import dotty.dokka.HTML._
+import util.HTML._
 import collection.JavaConverters._
 import dotty.dokka.translators.FilterAttributes
 import dotty.dokka.tasty.comments.markdown.DocFlexmarkRenderer
 import com.vladsch.flexmark.util.ast.{Node => MdNode}
 import dotty.dokka.tasty.comments.wiki.WikiDocElement
+import translators._
 
 class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) extends DocRender(signatureRenderer):
   import signatureRenderer._

scala3doc/src/dotty/renderers/Resources.scala renamed to scala3doc/src/dotty/dokka/renderers/Resources.scala

@@ -1,7 +1,7 @@
 package dotty.dokka
 package renderers
 
-import HTML._
+import util.HTML._
 import collection.JavaConverters._
 import java.net.URI
 import java.net.URL
@@ -13,6 +13,8 @@ import java.nio.file.Path
 import java.nio.file.Files
 import java.io.File
 import dotty.dokka.translators.FilterAttributes
+import util._
+import translators._
 
 enum Resource(val path: String):
   case Text(override val path: String, content: String) extends Resource(path)

scala3doc/src/dotty/renderers/SignatureRenderer.scala renamed to scala3doc/src/dotty/dokka/renderers/SignatureRenderer.scala

@@ -1,6 +1,7 @@
 package dotty.dokka
+package renderers
 
-import HTML._
+import util.HTML._
 import collection.JavaConverters._
 import java.net.URI
 import java.net.URL

scala3doc/src/dotty/renderers/SiteRenderer.scala renamed to scala3doc/src/dotty/dokka/renderers/SiteRenderer.scala

@@ -1,7 +1,7 @@
 package dotty.dokka
 package renderers
 
-import HTML._
+import util.HTML._
 import collection.JavaConverters._
 import java.net.URI
 import java.net.URL

scala3doc/src/dotty/renderers/WikiDocRenderer.scala renamed to scala3doc/src/dotty/dokka/renderers/WikiDocRenderer.scala

@@ -1,7 +1,8 @@
 package dotty.dokka
+package renderers
 
 import dotty.dokka.tasty.comments.wiki._
-import dotty.dokka.HTML._
+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

scala3doc/src/dotty/renderers/Writer.scala renamed to scala3doc/src/dotty/dokka/renderers/Writer.scala

@@ -1,12 +1,13 @@
 package dotty.dokka
 package renderers
+
 import java.io.InputStream
 import java.nio.file.Paths
 import java.nio.file.Path
 import java.nio.file.Files
 import java.io.File
 
-import HTML._
+import util.HTML._
 
 // TODO be more clever about writting - make it much faster!
 trait Writer(using ctx: DocContext) extends Locations:

scala3doc/src/dotty/dokka/site/StaticSiteContext.scala

@@ -7,7 +7,7 @@ import java.nio.file.FileVisitOption
 import java.nio.file.Path
 import java.nio.file.Paths
 
-import util.Try
+import scala.util.Try
 import collection.JavaConverters._
 
 class StaticSiteContext(

scala3doc/src/dotty/dokka/tasty/ScalaDocSupport.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty
+package dotty.dokka
+package tasty
 
 import scala.jdk.CollectionConverters._
 

scala3doc/src/dotty/dokka/tasty/SyntheticSupport.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty
+package dotty.dokka
+package tasty
 
 import scala.quoted._
 

scala3doc/src/dotty/dokka/tasty/TastyParser.scala

@@ -91,7 +91,7 @@ case class DokkaTastyInspector()(using ctx: DocContext) extends DocTastyInspecto
       def readFile(pathStr: String)(using CompilerContext): Option[String] =
         try
           val path = Paths.get(pathStr)
-          if Files.exists(path) then Some(IO.read(path))
+          if Files.exists(path) then Some(util.IO.read(path))
           else
             report.inform("Rootdoc at $pathStr does not exisits")
             None

scala3doc/src/dotty/dokka/tasty/comments/Cleaner.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty.comments
+package dotty.dokka
+package tasty.comments
 
 object Cleaner {
   import Regexes._

scala3doc/src/dotty/dokka/tasty/comments/CommentExpander.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty.comments
+package dotty.dokka
+package tasty.comments
 
 import dotty.tools._
 import dotc._

scala3doc/src/dotty/dokka/tasty/comments/CommentRegex.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty.comments
+package dotty.dokka
+package tasty.comments
 
 import scala.util.matching.Regex
 

scala3doc/src/dotty/dokka/tasty/comments/MarkdownParser.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty.comments
+package dotty.dokka
+package tasty.comments
 
 import java.util.{ Arrays }
 import Regexes._

scala3doc/src/dotty/dokka/tasty/comments/MemberLookup.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty.comments
+package dotty.dokka
+package tasty.comments
 
 import scala.quoted._
 

scala3doc/src/dotty/dokka/tasty/comments/Preparser.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty.comments
+package dotty.dokka
+package tasty.comments
 
 import scala.collection.mutable
 import scala.collection.immutable.SortedMap

scala3doc/src/dotty/dokka/tasty/comments/Queries.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty.comments
+package dotty.dokka
+package tasty.comments
 
 sealed trait Query {
   def asList: List[String] = this match {

scala3doc/src/dotty/dokka/tasty/comments/wiki/Parser.scala

@@ -1,4 +1,5 @@
-package dotty.dokka.tasty.comments.wiki
+package dotty.dokka
+package tasty.comments.wiki
 
 import scala.collection.mutable
 

scala3doc/src/dotty/dokka/transformers/ImplicitMembersExtensionTransformer.scala

@@ -1,4 +1,5 @@
 package dotty.dokka
+package transformers
 
 class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Module):
   override def apply(original: Module): Module =

scala3doc/src/dotty/dokka/transformers/InheritanceInformationTransformer.scala

@@ -1,4 +1,5 @@
 package dotty.dokka
+package transformers
 
 class InheritanceInformationTransformer(using DocContext) extends (Module => Module):
   override def apply(original: Module): Module =

scala3doc/src/dotty/dokka/translators/FilterAttributes.scala

@@ -1,7 +1,6 @@
 package dotty.dokka
 package translators
 
-
 object FilterAttributes:
   def attributesFor(m: Member): Map[String, String] =
     val base = visibity(m) ++ visibity(m) ++ origin(m) ++ keywords(m) ++ inheritedFrom(m)

scala3doc/src/dotty/dokka/translators/ScalaSignatureProvider.scala

@@ -1,4 +1,5 @@
 package dotty.dokka
+package translators
 
 object ScalaSignatureProvider:
   def rawSignature(documentable: Member, builder: SignatureBuilder): SignatureBuilder =

scala3doc/src/dotty/dokka/translators/ScalaSignatureUtils.scala

@@ -1,4 +1,5 @@
 package dotty.dokka
+package translators
 
 case class InlineSignatureBuilder(names: Signature = Nil, preName: Signature = Nil) extends SignatureBuilder:
   override def text(str: String): SignatureBuilder = copy(names = str +: names)

scala3doc/src/dotty/dokka/IO.java renamed to scala3doc/src/dotty/dokka/util/IO.java

@@ -1,4 +1,4 @@
-package dotty.dokka;
+package dotty.dokka.util;
 
 import java.io.*;
 import java.nio.file.*;

scala3doc/src/dotty/dokka/JSON.scala renamed to scala3doc/src/dotty/dokka/util/JSON.scala

@@ -1,4 +1,5 @@
 package dotty.dokka
+package util
 
 import scala.annotation.tailrec
 

scala3doc/src/dotty/renderers/html.scala renamed to scala3doc/src/dotty/dokka/util/html.scala

@@ -1,4 +1,4 @@
-package dotty.dokka
+package dotty.dokka.util
 
 /**
  * This is trivial html renderer using api inspired by ScalaTags

scala3doc/test/dotty/dokka/BaseHtmlTest.scala

@@ -9,6 +9,7 @@ import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import java.nio.charset.Charset
 import dotty.dokka.test.BuildInfo
+import util.IO
 
 class BaseHtmlTest:
   val unresolvedLinkSelector = ".documentableBrief span[data-unresolved-link]"

scala3doc/test/dotty/dokka/ExternalLocationProviderIntegrationTest.scala

@@ -6,6 +6,7 @@ import scala.util.matching.Regex
 import dotty.dokka.test.BuildInfo
 import java.nio.file.Path;
 import org.jsoup.Jsoup
+import util.IO
 
 class JavadocExternalLocationProviderIntegrationTest extends ExternalLocationProviderIntegrationTest(
   "externalJavadoc",

scala3doc/test/dotty/dokka/RaportingTest.scala

@@ -8,6 +8,7 @@ import org.junit.Assert
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import java.nio.charset.Charset
+import util.IO
 
 class ReportingTest:
   import Scala3doc.Args

scala3doc/test/dotty/dokka/SignatureTest.scala

@@ -6,6 +6,7 @@ import scala.util.matching.Regex
 import dotty.dokka.test.BuildInfo
 import java.nio.file.Path;
 import org.jsoup.Jsoup
+import util.IO
 
 private enum SignatureRes:
   case Expected(name: String, signature: String)

scala3doc/test/dotty/dokka/renderers/HtmlTagsTest.scala

@@ -2,7 +2,7 @@ package dotty.dokka.renderers
 
 import org.junit.{Test, Rule}
 import org.junit.Assert.{assertSame, assertTrue, assertEquals}
-import dotty.dokka.HTML._
+import dotty.dokka.util.HTML._
 
 class HtmlTagsTest {
 

scala3doc/test/dotty/dokka/renderers/LocationTests.scala

@@ -3,7 +3,7 @@ package renderers
 
 import org.junit.{Test, Rule}
 import org.junit.Assert.{assertSame, assertTrue, assertEquals}
-import dotty.dokka.HTML._
+import dotty.dokka.util.HTML._
 
 class LocationTests:
   given DocContext = testDocContext

scala3doc/test/dotty/dokka/JSONTest.scala renamed to scala3doc/test/dotty/dokka/util/JSONTest.scala

@@ -1,4 +1,5 @@
 package dotty.dokka
+package util
 
 import org.junit.Test
 import org.junit.Assert._