Skip to content

Avoid deprecated URL ctor in scaladoc #17426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2023
Merged

Avoid deprecated URL ctor in scaladoc #17426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scaladoc/src/dotty/tools/scaladoc/ExternalDocLink.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dotty.tools.scaladoc

import java.net.URL
import java.net.{URI, URL}
import scala.util.matching._
import scala.util.{ Try, Success, Failure }

Expand Down Expand Up @@ -30,7 +30,7 @@ object ExternalDocLink:
def parseLegacy(mapping: String): Either[String, ExternalDocLink] =
mapping.split("#").toList match
case path :: apiUrl :: Nil => for {
url <- tryParse(mapping, "url")(URL(stripIndex(apiUrl)))
url <- tryParse(mapping, "url")(URI(stripIndex(apiUrl)).toURL)
} yield ExternalDocLink(
List(s"${Regex.quote(path)}.*".r),
url,
Expand All @@ -42,7 +42,7 @@ object ExternalDocLink:
def parse(mapping: String): Either[String, ExternalDocLink] =

def parsePackageList(elements: List[String]) = elements match
case List(urlStr) => tryParse(mapping, "packageList")(Some(URL(urlStr)))
case List(urlStr) => tryParse(mapping, "packageList")(Some(URI(urlStr).toURL))
case Nil => Right(None)
case other => fail(mapping, s"Provided multiple package lists: $other")

Expand All @@ -57,7 +57,7 @@ object ExternalDocLink:
case regexStr :: docToolStr :: urlStr :: rest =>
for {
regex <- tryParse(mapping, "regex")(regexStr.r)
url <- tryParse(mapping, "url")(URL(stripIndex(urlStr)))
url <- tryParse(mapping, "url")(URI(stripIndex(urlStr)).toURL)
doctool <- doctoolByName(docToolStr)
packageList <- parsePackageList(rest)
} yield ExternalDocLink(
Expand Down
4 changes: 2 additions & 2 deletions scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package dotty.tools.scaladoc
package renderers

import util.HTML._
import java.net.URL
import java.net.{URI, URL}
import java.nio.file.Paths
import java.nio.file.Path
import java.nio.file.Files
Expand Down Expand Up @@ -565,4 +565,4 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
case Resource.URL(url) =>
Nil
case Resource.URLToCopy(url, dest) =>
Seq(copy(new URL(url).openStream(), dest))
Seq(copy(URI(url).toURL.openStream(), dest))
5 changes: 2 additions & 3 deletions scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package renderers

import util.HTML._
import scala.jdk.CollectionConverters._
import java.net.URI
import java.net.URL
import java.net.{URI, URL}
import dotty.tools.scaladoc.site._
import scala.util.Try
import org.jsoup.Jsoup
Expand Down Expand Up @@ -40,7 +39,7 @@ trait SiteRenderer(using DocContext) extends Locations:

def processLocalLink(str: String): String =
val staticSiteRootPath = content.ctx.root.toPath.toAbsolutePath
def asValidURL: Option[String] = Try(URL(str)).toOption.map(_ => str)
def asValidURL: Option[String] = Try(URI(str).toURL).toOption.map(_ => str)
def asAsset: Option[String] = Option.when(
Files.exists(staticSiteRootPath.resolve("_assets").resolve(str.stripPrefix("/")))
)(
Expand Down