Merge pull request scala#2549 from vigdorchik/slash_slash

adriaanm · adriaanm · commit 9553c6fce751 · 2013-05-17T15:37:15.000-07:00
Prevent slash duplication.
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -249,10 +249,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
`252`		`- def appendIndex(url: String): String = {`
`253`		`- val index = "/index.html"`
`254`		`- if (url.endsWith(index)) url else url + index`
`255`		`- }`
	`252`	`+ def appendIndex(url: String): String = url.stripSuffix("index.html").stripSuffix("/") + "/index.html"`
`256`	`253`
`257`	`254`	`// Deprecated together with 'docExternalUrls' option.`
`258`	`255`	`lazy val extUrlPackageMapping: Map[String, String] = (Map.empty[String, String] /: docExternalUrls.value) {`