From f628565075a9b3c88fadec21445e2d9f088c9acb Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Fri, 17 May 2013 12:56:51 +0400 Subject: Prevent slash duplication. Don't add trailing slash to external doc URL if it already ends with one. --- src/compiler/scala/tools/nsc/doc/Settings.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/compiler/scala/tools/nsc/doc/Settings.scala b/src/compiler/scala/tools/nsc/doc/Settings.scala index 02630a99b2..8c0628c073 100644 --- a/src/compiler/scala/tools/nsc/doc/Settings.scala +++ b/src/compiler/scala/tools/nsc/doc/Settings.scala @@ -249,10 +249,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_)) } } - def appendIndex(url: String): String = { - val index = "/index.html" - if (url.endsWith(index)) url else url + index - } + def appendIndex(url: String): String = url.stripSuffix("index.html").stripSuffix("/") + "/index.html" // Deprecated together with 'docExternalUrls' option. lazy val extUrlPackageMapping: Map[String, String] = (Map.empty[String, String] /: docExternalUrls.value) { -- cgit v1.2.3