diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 15:37:15 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 15:37:15 -0700 |
| commit | 9553c6fce751a74a1b25a43eb235bb20b4a5ba0b (patch) | |
| tree | a8b3afbad77337cb809123bfdeb9322dc85e1089 /src/compiler | |
| parent | 3ba3d041a8f2f27d4a2708ce9177009f33790f3d (diff) | |
| parent | f628565075a9b3c88fadec21445e2d9f088c9acb (diff) | |
| download | scala-9553c6fce751a74a1b25a43eb235bb20b4a5ba0b.tar.gz scala-9553c6fce751a74a1b25a43eb235bb20b4a5ba0b.tar.bz2 scala-9553c6fce751a74a1b25a43eb235bb20b4a5ba0b.zip | |
Merge pull request #2549 from vigdorchik/slash_slash
Prevent slash duplication.
Diffstat (limited to 'src/compiler')
| -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) { |