Skip to content

Commit 1ed02dd

Browse files
ckipp01ckipp01
committed
chore: clean up imports in scaladoc
1 parent d6d200f commit 1ed02dd

14 files changed

+5
-100
lines changed

‎scaladoc/src/dotty/tools/scaladoc/DocContext.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
package dotty.tools.scaladoc
22

33
import java.io.File
4-
import java.nio.file.Files
54
import java.nio.file.Path
65
import java.nio.file.Paths
76

8-
import scala.jdk.CollectionConverters._
97
import dotty.tools.scaladoc.site.StaticSiteContext
108
import dotty.tools.dotc.core.Contexts._
119
import dotty.tools.dotc.util.SourceFile
1210
import dotty.tools.dotc.util.SourcePosition
1311
import dotty.tools.dotc.util.Spans
1412
import java.io.ByteArrayOutputStream
1513
import java.io.PrintStream
16-
import scala.io.Codec
17-
import java.net.URL
18-
import scala.util.Try
1914
import scala.collection.mutable
2015
import dotty.tools.scaladoc.util.Check.checkJekyllIncompatPath
2116

‎scaladoc/src/dotty/tools/scaladoc/Main.scala

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
package dotty.tools.scaladoc
22

3-
import java.util.ServiceLoader
4-
import java.io.File
5-
import java.util.jar._
6-
import scala.jdk.CollectionConverters._
7-
import collection.immutable.ArraySeq
8-
9-
import java.nio.file.Files
10-
11-
import dotty.tools.dotc.config.Settings._
12-
import dotty.tools.dotc.config.CommonScalaSettings
13-
import dotty.tools.dotc.core.Contexts._
3+
import dotty.tools.dotc.core.Contexts.ContextBase
144

155
/** Main class for the doctool when used from cli. */
166
class Main:

‎scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
package dotty.tools.scaladoc
22

3-
import java.util.ServiceLoader
43
import java.io.File
54
import java.io.FileWriter
6-
import java.util.jar._
7-
import scala.jdk.CollectionConverters._
8-
import collection.immutable.ArraySeq
5+
import java.nio.file.Paths
96

10-
import java.nio.file.{ Files, Paths }
7+
import collection.immutable.ArraySeq
118

129
import dotty.tools.dotc.config.Settings._
1310
import dotty.tools.dotc.config.{ CommonScalaSettings, AllScalaSettings }
1411
import dotty.tools.dotc.reporting.Reporter
1512
import dotty.tools.dotc.core.Contexts._
16-
17-
import dotty.tools.scaladoc.Inkuire
1813
import dotty.tools.scaladoc.Inkuire._
1914

2015
object Scaladoc:

‎scaladoc/src/dotty/tools/scaladoc/ScaladocCommand.scala

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
package dotty.tools.scaladoc
22

3-
import java.util.ServiceLoader
4-
import java.io.File
5-
import java.util.jar._
6-
import scala.jdk.CollectionConverters._
7-
import collection.immutable.ArraySeq
8-
9-
import java.nio.file.Files
10-
113
import dotty.tools.dotc.config.Settings._
12-
import dotty.tools.dotc.config.CommonScalaSettings
13-
import dotty.tools.scaladoc.Scaladoc._
14-
import dotty.tools.dotc.config.Settings.Setting.value
154
import dotty.tools.dotc.config.Properties._
165
import dotty.tools.dotc.config.CliCommand
17-
import dotty.tools.dotc.core.Contexts._
6+
import dotty.tools.dotc.core.Contexts.Context
187

198
object ScaladocCommand extends CliCommand:
209
type ConcreteSettings = ScaladocSettings

‎scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
11
package dotty.tools.scaladoc
22

3-
import java.util.ServiceLoader
4-
import java.io.File
5-
import java.util.jar._
6-
import scala.jdk.CollectionConverters._
7-
import collection.immutable.ArraySeq
8-
9-
import java.nio.file.Files
10-
113
import dotty.tools.dotc.config.Settings._
124
import dotty.tools.dotc.config.AllScalaSettings
13-
import dotty.tools.scaladoc.Scaladoc._
14-
import dotty.tools.dotc.config.Settings.Setting.value
15-
import dotty.tools.dotc.config.Properties._
16-
import dotty.tools.dotc.config.CliCommand
17-
import dotty.tools.dotc.core.Contexts._
185

196
class ScaladocSettings extends SettingGroup with AllScalaSettings:
207
val unsupportedSettings = Seq(

‎scaladoc/src/dotty/tools/scaladoc/SocialLinks.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package dotty.tools.scaladoc
22

3-
import java.nio.file.Path
4-
import java.nio.file.Paths
5-
import dotty.tools.dotc.core.Contexts.Context
6-
73
enum SocialLinks(val url: String, val className: String):
84
case Github(ghUrl: String) extends SocialLinks(ghUrl, "gh")
95
case Twitter(tUrl: String) extends SocialLinks(tUrl, "twitter")

‎scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package dotty.tools.scaladoc
22

33
import java.nio.file.Path
44
import java.nio.file.Paths
5-
import dotty.tools.dotc.core.Contexts.Context
65
import scala.util.matching.Regex
76

87
def pathToString(p: Path) =

‎scaladoc/src/dotty/tools/scaladoc/compat.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package dotty.tools.scaladoc
33
import java.util.stream.Stream // comment out - wrong error!
44
import java.util.stream.Collectors
55
import java.util.Collections
6-
import java.nio.file.Path
76
import com.vladsch.flexmark.util.ast.{Node => MdNode}
87
import dotty.tools.scaladoc.tasty.comments.wiki.WikiDocElement
98
import scala.jdk.CollectionConverters._
@@ -37,4 +36,4 @@ extension [V](jlist: JList[V])
3736

3837
extension [V](jset: JSet[V])
3938
def ++ (other: JSet[V]): JSet[V] =
40-
Stream.of(jset, other).flatMap(_.stream).collect(Collectors.toSet())
39+
Stream.of(jset, other).flatMap(_.stream).collect(Collectors.toSet())

‎scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,9 @@ package dotty.tools.scaladoc
22
package renderers
33

44
import util.HTML._
5-
import scala.jdk.CollectionConverters._
6-
import java.net.URI
7-
import java.net.URL
85
import dotty.tools.scaladoc.site._
9-
import scala.util.Try
106
import org.jsoup.Jsoup
11-
import java.nio.file.Paths
12-
import java.nio.file.Path
137
import java.nio.file.Files
14-
import java.nio.file.FileVisitOption
15-
import java.io.File
16-
import dotty.tools.scaladoc.staticFileSymbolUUID
178

189
class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: DocContext)
1910
extends Renderer(rootPackage, members, extension = "html"):

‎scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
package dotty.tools.scaladoc
22
package renderers
33

4-
import util.HTML._
54
import scala.jdk.CollectionConverters._
65
import java.net.URI
7-
import java.net.URL
86
import dotty.tools.scaladoc.site._
9-
import scala.util.Try
10-
import org.jsoup.Jsoup
117
import java.nio.file.Paths
12-
import java.nio.file.Path
13-
import java.nio.file.Files
14-
import java.io.File
15-
import scala.util.matching._
168
import dotty.tools.scaladoc.util.Escape._
179

1810
val UnresolvedLocationLink = "#"

‎scaladoc/src/dotty/tools/scaladoc/renderers/MarkdownRenderer.scala

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@ package dotty.tools.scaladoc
22
package renderers
33

44
import util.HTML._
5-
import scala.jdk.CollectionConverters._
6-
import java.net.URI
7-
import java.net.URL
8-
import dotty.tools.scaladoc.site._
9-
import scala.util.Try
10-
import org.jsoup.Jsoup
11-
import java.nio.file.Paths
12-
import java.nio.file.Path
13-
import java.nio.file.Files
14-
import java.nio.file.FileVisitOption
15-
import java.io.File
165

176
class MarkdownRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: DocContext)
187
extends Renderer(rootPackage, members, extension = "md"):

‎scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ import util.HTML.{div, *}
77

88
import scala.jdk.CollectionConverters.*
99
import dotty.tools.scaladoc.translators.FilterAttributes
10-
import dotty.tools.scaladoc.tasty.comments.markdown.DocFlexmarkRenderer
11-
import com.vladsch.flexmark.util.ast.Node as MdNode
12-
import dotty.tools.scaladoc.tasty.comments.wiki.WikiDocElement
1310
import org.jsoup.Jsoup
1411
import translators.*
1512

‎scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,11 @@ package dotty.tools.scaladoc
22
package renderers
33

44
import util.HTML._
5-
import scala.jdk.CollectionConverters._
65
import collection.mutable.ListBuffer
7-
import java.net.URI
8-
import java.net.URL
96
import dotty.tools.scaladoc.site._
10-
import scala.util.Try
11-
import org.jsoup.Jsoup
127
import java.nio.file.Paths
138
import java.nio.file.Path
149
import java.nio.file.Files
15-
import java.nio.file.FileVisitOption
16-
import java.io.File
1710

1811
case class Page(link: Link, content: Member | ResolvedTemplate | String, children: Seq[Page], hidden: Boolean = false):
1912
def withNewChildren(newChildren: Seq[Page]) = copy(children = children ++ newChildren)

‎scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,10 @@ package dotty.tools.scaladoc
22
package renderers
33

44
import util.HTML._
5-
import scala.jdk.CollectionConverters._
6-
import java.net.URI
75
import java.net.URL
8-
import dotty.tools.scaladoc.site._
9-
import scala.util.Try
10-
import org.jsoup.Jsoup
116
import java.nio.file.Paths
127
import java.nio.file.Path
138
import java.nio.file.Files
14-
import java.io.File
159
import dotty.tools.scaladoc.translators.FilterAttributes
1610
import util._
1711
import translators._
@@ -190,7 +184,6 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
190184

191185
def docPartRenderPlain(d: DocPart): String =
192186
import dotty.tools.scaladoc.tasty.comments.wiki._
193-
import com.vladsch.flexmark.util.ast.{Node => MdNode}
194187
def renderPlain(wd: WikiDocElement): String =
195188
wd match
196189
case Paragraph(text) => renderPlain(text)

0 commit comments

Comments
 (0)