Skip to content

Commit 4c9d2f4

Browse files
committed
don't specify rangepos, use the compiler's default
1 parent f8aed6b commit 4c9d2f4

File tree

6 files changed

+3
-26
lines changed

6 files changed

+3
-26
lines changed
File renamed without changes.
File renamed without changes.

src/test/scala/com/typesafe/genjavadoc/RangePosSpec.scala

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/test/scala/com/typesafe/genjavadoc/SignatureSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class SignatureSpec {
6060
val scalac = new GenJavadocCompiler(Seq(
6161
s"genjavadoc:out=$docPath",
6262
"genjavadoc:suppressSynthetic=false"
63-
), rangepos = true)
63+
))
6464

6565
val javaSources = expectedClasses.map{cls =>
6666
docPath + "/" + cls.replace(".", "/") + ".java"

src/test/scala/com/typesafe/genjavadoc/util/CompilerSpec.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,13 @@ trait CompilerSpec {
2020
/** Extra plugin arguments. */
2121
def extraSettings: Seq[String] = Seq.empty
2222

23-
/** whether to enable -Yrangepos */
24-
def rangepos: Boolean = true
25-
2623
@Test def compileSourcesAndGenerateExpectedOutput(): Unit = {
2724
val doc = IO.tempDir("java")
2825
val docPath = doc.getAbsolutePath
2926
val defaultSettings = Seq(s"out=$docPath", "suppressSynthetic=false")
3027
val scalac = new GenJavadocCompiler((defaultSettings ++ extraSettings).map{ kv =>
3128
s"genjavadoc:$kv"
32-
}, rangepos)
29+
})
3330

3431
scalac.compile(sources)
3532
assertFalse("Scala compiler reported errors", scalac.reporter.hasErrors)

src/test/scala/com/typesafe/genjavadoc/util/GenJavaDocCompiler.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ import scala.tools.nsc.{Global, Settings}
99
/** An instance of the Scala compiler with the genjavadoc plugin enabled
1010
* @param pluginOptions additional parameters to pass to the compiler
1111
*/
12-
class GenJavadocCompiler(pluginOptions: Seq[String], rangepos: Boolean) {
12+
class GenJavadocCompiler(pluginOptions: Seq[String]) {
1313

1414
private val settings = new Settings
1515

16-
settings.Yrangepos.value = rangepos
17-
1816
val reporter = new ConsoleReporter(settings)
1917
private val global = new Global(settings, reporter) {
2018
override protected def loadRoughPluginsList() =

0 commit comments

Comments
 (0)