Skip to content

Source encoding parametrization - fix for issue #134 #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2016
Merged

Source encoding parametrization - fix for issue #134 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions scalac-scoverage-plugin/src/main/scala/scoverage/report/CodeGrid.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)}'>"

Expand Down
10 changes: 8 additions & 2 deletions scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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}
Expand Down