diff options
author | Eugene Vigdorchik <eugene.vigdorchik@gmail.com> | 2013-05-17 12:56:51 +0400 |
---|---|---|
committer | Eugene Vigdorchik <eugene.vigdorchik@gmail.com> | 2013-05-17 17:26:06 +0400 |
commit | f628565075a9b3c88fadec21445e2d9f088c9acb (patch) | |
tree | f938aad853b81df9ad894efcecfcbd55a84b03f4 /src | |
parent | e927cbc39a081dc0eeddc1bc264bcbe3f9b3c7d0 (diff) | |
download | scala-f628565075a9b3c88fadec21445e2d9f088c9acb.tar.gz scala-f628565075a9b3c88fadec21445e2d9f088c9acb.tar.bz2 scala-f628565075a9b3c88fadec21445e2d9f088c9acb.zip |
Prevent slash duplication.
Don't add trailing slash to external doc URL if it already ends with
one.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/Settings.scala | 5 |
1 files changed, 1 insertions, 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) { |