don't specify rangepos, use the compiler's default

lightbend · Mar 12, 2021 · 4c9d2f4 · 4c9d2f4
1 parent f8aed6b
commit 4c9d2f4
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 26 deletions.
diff --git a/...a/cluster/ClusterRouterGroupSettings.java → ...a/cluster/ClusterRouterGroupSettings.java b/...a/cluster/ClusterRouterGroupSettings.java → ...a/cluster/ClusterRouterGroupSettings.java
diff --git a/.../cluster/ClusterRouterGroupSettings.scala → .../cluster/ClusterRouterGroupSettings.scala b/.../cluster/ClusterRouterGroupSettings.scala → .../cluster/ClusterRouterGroupSettings.scala
diff --git a/src/test/scala/com/typesafe/genjavadoc/RangePosSpec.scala b/src/test/scala/com/typesafe/genjavadoc/RangePosSpec.scala
diff --git a/src/test/scala/com/typesafe/genjavadoc/SignatureSpec.scala b/src/test/scala/com/typesafe/genjavadoc/SignatureSpec.scala
@@ -60,7 +60,7 @@ class SignatureSpec {
     val scalac = new GenJavadocCompiler(Seq(
       s"genjavadoc:out=$docPath",
       "genjavadoc:suppressSynthetic=false"
-    ), rangepos = true)
+    ))
 
     val javaSources = expectedClasses.map{cls =>
       docPath + "/" + cls.replace(".", "/") + ".java"

diff --git a/src/test/scala/com/typesafe/genjavadoc/util/CompilerSpec.scala b/src/test/scala/com/typesafe/genjavadoc/util/CompilerSpec.scala
@@ -20,16 +20,13 @@ trait CompilerSpec {
   /** Extra plugin arguments. */
   def extraSettings: Seq[String] = Seq.empty
 
-  /** whether to enable -Yrangepos */
-  def rangepos: Boolean = true
-
   @Test def compileSourcesAndGenerateExpectedOutput(): Unit = {
     val doc = IO.tempDir("java")
     val docPath = doc.getAbsolutePath
     val defaultSettings = Seq(s"out=$docPath", "suppressSynthetic=false")
     val scalac = new GenJavadocCompiler((defaultSettings ++ extraSettings).map{ kv =>
       s"genjavadoc:$kv"
-    }, rangepos)
+    })
 
     scalac.compile(sources)
     assertFalse("Scala compiler reported errors", scalac.reporter.hasErrors)

diff --git a/src/test/scala/com/typesafe/genjavadoc/util/GenJavaDocCompiler.scala b/src/test/scala/com/typesafe/genjavadoc/util/GenJavaDocCompiler.scala
@@ -9,12 +9,10 @@ import scala.tools.nsc.{Global, Settings}
 /** An instance of the Scala compiler with the genjavadoc plugin enabled
   * @param pluginOptions additional parameters to pass to the compiler
   */
-class GenJavadocCompiler(pluginOptions: Seq[String], rangepos: Boolean) {
+class GenJavadocCompiler(pluginOptions: Seq[String]) {
 
   private val settings = new Settings
 
-  settings.Yrangepos.value = rangepos
-
   val reporter = new ConsoleReporter(settings)
   private val global = new Global(settings, reporter) {
     override protected def loadRoughPluginsList() =