diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala index 8506014b..f7cccb89 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala @@ -17,8 +17,8 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) { val index = IOUtils.readStreamAsString(getClass.getResourceAsStream("/scoverage/index.html")) IOUtils.writeToFile(indexFile, index) - IOUtils.writeToFile(packageFile, packageList(coverage).toString) - IOUtils.writeToFile(overviewFile, overview(coverage).toString) + IOUtils.writeToFile(packageFile, packageList(coverage).toString()) + IOUtils.writeToFile(overviewFile, overview(coverage).toString()) coverage.packages.foreach(writePackage) } @@ -31,7 +31,7 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) { // to com.example.html val file = new File(outputDir, packageOverviewRelativePath(pkg)) file.getParentFile.mkdirs() - IOUtils.writeToFile(file, packageOverview(pkg).toString) + IOUtils.writeToFile(file, packageOverview(pkg).toString()) pkg.files.foreach(writeFile) } @@ -39,7 +39,7 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) { // each highlighted file is written out using the same structure as the original file. val file = new File(outputDir, relativeSource(mfile.source) + ".html") file.getParentFile.mkdirs() - IOUtils.writeToFile(file, filePage(mfile).toString) + IOUtils.writeToFile(file, filePage(mfile).toString()) } private def packageOverviewRelativePath(pkg: MeasuredPackage) = pkg.name.replace("", "(empty)") + ".html" @@ -57,10 +57,7 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) { {filename} - - - - + {plugins} @@ -135,21 +132,13 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) { | overflow: hidden; |}""".stripMargin - val tableScript = """$(document).ready(function() {$("#packages").tablesorter();});""" - Scoverage Code Coverage - - - - + {plugins} - } @@ -282,29 +271,25 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) { Scoverage Code Coverage - - - - + {plugins} - - +
+ - {coverage.packages.map(arg => + + + + + {coverage.packages.map(arg => + )} @@ -314,7 +299,7 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) { } def risks(coverage: Coverage, limit: Int) = { -
- - All packages - {coverage.statementCoverageFormatted} - % + All packages
{coverage.statementCoverageFormatted}%
- - {arg.name} - {arg.statementCoverageFormatted} - % + {arg.name} {arg.statementCoverageFormatted}%
+
@@ -535,5 +520,16 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) {
} + + def plugins = { + + + + + + + } }