1 files changed, 10 insertions, 11 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/IndexScript.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/IndexScript.scala
index 6b24c0f568..8f58a7b845 100644
--- a/src/scaladoc/scala/tools/nsc/doc/html/page/IndexScript.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/html/page/IndexScript.scala
@@ -10,7 +10,6 @@ package page
 import scala.tools.nsc.doc
 import scala.tools.nsc.doc.model.{Package, DocTemplateEntity}
 import scala.tools.nsc.doc.html.{Page, HtmlFactory}
-import scala.util.parsing.json.{JSONObject, JSONArray, JSONType}
 
 class IndexScript(universe: doc.Universe) extends Page {
   import model._
@@ -21,7 +20,7 @@ class IndexScript(universe: doc.Universe) extends Page {
 
   override def writeFor(site: HtmlFactory) {
     writeFile(site) {
-      _.write("Index.PACKAGES = " + packages.toString() + ";")
+      _.write(s"Index.PACKAGES = $packages;")
     }
   }
 
@@ -30,7 +29,7 @@ class IndexScript(universe: doc.Universe) extends Page {
       case (pack, templates) => {
         val merged = mergeByQualifiedName(templates)
 
-        val ary = merged.keys.toList.sortBy(_.toLowerCase).map { key =>
+        val ary = merged.keys.toVector.sortBy(_.toLowerCase).map { key =>
           /** One pair is generated for the class/trait and one for the
            *  companion object, both will have the same {"name": key}
            *
@@ -44,7 +43,7 @@ class IndexScript(universe: doc.Universe) extends Page {
             Seq(
               kind -> relativeLinkTo(t),
               "kind" -> kind,
-              s"members_$kind" -> membersToJSON(t.members.filter(!_.isShadowedOrAmbiguousImplicit), t),
+              s"members_$kind" -> membersToJSON(t.members.toVector.filter(!_.isShadowedOrAmbiguousImplicit), t),
               "shortDescription" -> shortDesc(t))
           }
 
@@ -58,18 +57,18 @@ class IndexScript(universe: doc.Universe) extends Page {
     JSONObject(Map(pairs : _*))
   }
 
-  def mergeByQualifiedName(source: List[DocTemplateEntity]) = {
-    var result = Map[String, List[DocTemplateEntity]]()
+  private def mergeByQualifiedName(source: List[DocTemplateEntity]): collection.mutable.Map[String, List[DocTemplateEntity]] = {
+    val result = collection.mutable.Map[String, List[DocTemplateEntity]]()
 
     for (t <- source) {
       val k = t.qualifiedName
-      result += k -> (result.getOrElse(k, List()) :+ t)
+      result += k -> (result.getOrElse(k, Nil) :+ t)
     }
 
     result
   }
 
-  def allPackages = {
+  def allPackages: List[Package] = {
     def f(parent: Package): List[Package] = {
       parent.packages.flatMap(
         p => f(p) :+ p
@@ -78,7 +77,7 @@ class IndexScript(universe: doc.Universe) extends Page {
     f(universe.rootPackage).sortBy(_.toString)
   }
 
-  def allPackagesWithTemplates = {
+  def allPackagesWithTemplates: Map[Package, List[DocTemplateEntity]] = {
     Map(allPackages.map((key) => {
       key -> key.templates.collect {
         case t: DocTemplateEntity if !t.isPackage && !universe.settings.hardcoded.isExcluded(t.qualifiedName) => t
@@ -92,8 +91,8 @@ class IndexScript(universe: doc.Universe) extends Page {
   }
 
   /** Returns the json representation of the supplied members */
-  def membersToJSON(entities: List[MemberEntity], parent: DocTemplateEntity): JSONType =
-    JSONArray(entities map (memberToJSON(_, parent)))
+  def membersToJSON(entities: Vector[MemberEntity], parent: DocTemplateEntity): JSONArray =
+    JSONArray(entities.map(memberToJSON(_, parent)))
 
   private def memberToJSON(mbr: MemberEntity, parent: DocTemplateEntity): JSONObject = {
     /** This function takes a member and gets eventual parameters and the