Allow text comments on the same line as the marker comments

src/main/scala/scoverage/CoverageFilter.scala

@@ -21,7 +21,7 @@ class CoverageFilter(excludedPackages: Seq[String]) {
  mutable.WeakHashMap.empty
 
  final val scoverageExclusionCommentsRegex =
- """(?ms)^\s*//\s*(\$COVERAGE-OFF\$)\s*$.*?(^\s*//\s*\$COVERAGE-ON\$\s*$|\Z)""".r
+ """(?ms)^\s*//\s*(\$COVERAGE-OFF\$).*?(^\s*//\s*\$COVERAGE-ON\$|\Z)""".r
 
  /**
  * True if the given className has not been excluded by the

src/test/scala/scoverage/CoverageFilterTest.scala

@@ -96,6 +96,29 @@ class CoverageFilterTest extends FlatSpec {
  numbers === List(Range(4,9), Range(12,16))
  }
 
+ "getExcludedLineNumbers" should "allow text comments on the same line as the markers" in {
+ val file =
+ """1
+ |2
+ |3
+ | // $COVERAGE-OFF$ because the next lines are boring
+ |5
+ |6
+ |7
+ |8
+ | // $COVERAGE-ON$ resume coverage here
+ |10
+ |11
+ | // $COVERAGE-OFF$ but ignore this bit
+ |13
+ |14
+ |15
+ """.stripMargin
+
+ val numbers = new CoverageFilter(Nil).getExcludedLineNumbers(mockSourceFile(file))
+ numbers === List(Range(4,9), Range(12,16))
+ }
+
  private def mockSourceFile(contents: String): SourceFile = {
  new BatchSourceFile(NoFile, contents.toCharArray)
  }