Merge pull request #149 from gslowikowski/source-encoding-2

Source encoding parametrization - fix for issue #134

Author: sksamuel

scalac-scoverage-plugin/src/main/scala/scoverage/report/CodeGrid.scala

@@ -5,7 +5,12 @@ import _root_.scoverage.MeasuredFile
 import scala.io.Source
 
 /** @author Stephen Samuel */
-class CodeGrid(mFile: MeasuredFile) {
+class CodeGrid(mFile: MeasuredFile, sourceEncoding: Option[String]) {
+
+  // for backward compatibility only
+  def this (mFile: MeasuredFile) {
+    this(mFile, None);
+  }
 
   case class Cell(char: Char, var status: StatementStatus)
 
@@ -60,7 +65,13 @@ class CodeGrid(mFile: MeasuredFile) {
     s"<pre style='font-size: 12pt; font-family: courier;'>$code</pre>"
   }
 
-  private def source(mfile: MeasuredFile): String = Source.fromFile(mfile.source).mkString
+  private def source(mfile: MeasuredFile): String = {
+    val src = sourceEncoding match {
+     case Some(enc) => Source.fromFile(mfile.source, enc)
+     case None => Source.fromFile(mfile.source)
+    }
+    src.mkString
+  }
 
   private def spanStart(status: StatementStatus): String = s"<span style='${cellStyle(status)}'>"
 

scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala

@@ -8,8 +8,14 @@ import scoverage._
 import scala.xml.Node
 
 /** @author Stephen Samuel */
-class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File) extends BaseReportWriter(sourceDirectories, outputDir) {
+class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File, sourceEncoding: Option[String]) extends BaseReportWriter(sourceDirectories, outputDir) {
 
+  // for backward compatibility only
+  def this (sourceDirectories: Seq[File], outputDir: File) {
+    this(sourceDirectories, outputDir, None);
+  }
+  
+  // for backward compatibility only
   def this (sourceDirectory: File, outputDir: File) {
     this(Seq(sourceDirectory), outputDir)
   }
@@ -75,7 +81,7 @@ class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File) extends
         </ul>
         <div class="tab-content">
           <div class="tab-pane active" id="codegrid">
-            {xml.Unparsed(new CodeGrid(mfile).highlighted)}
+            {xml.Unparsed(new CodeGrid(mfile, sourceEncoding).highlighted)}
           </div>
           <div class="tab-pane" id="statementlist">
             {new StatementWriter(mfile).output}