bugfix: MAke sure rules can be run on JDK 8

scalacenter · Aug 9, 2024 · 1cbaae7 · 1cbaae7
1 parent 4a25c25
commit 1cbaae7
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 63 deletions.
diff --git a/scalafix-core/src/main/scala/scalafix/internal/config/ScalaVersion.scala b/scalafix-core/src/main/scala/scalafix/internal/config/ScalaVersion.scala
@@ -33,7 +33,7 @@ sealed trait ScalaVersion {
  case Major(major) => s"${major.value}"
  case Minor(major, minorVersion) => s"${major.value}.${minorVersion}"
  case Patch(major, minorVersion, patchVersion) =>
- s"${major.value}.${minorVersion}.$patchVersion" 
+ s"${major.value}.${minorVersion}.$patchVersion"
  case RC(major, minorVersion, patchVersion, rc) =>
  s"${major.value}.${minorVersion}.$patchVersion-RC$rc"
  }

diff --git a/scalafix-rules/src/main/scala-2/scalafix/internal/rule/ExplicitResultTypes.scala b/scalafix-rules/src/main/scala-2/scalafix/internal/rule/ExplicitResultTypes.scala
@@ -1,5 +1,10 @@
 package scalafix.internal.rule
 
+import scala.util.control.NonFatal
+
+import scala.meta._
+import scala.meta.internal.pc.ScalafixGlobal
+
 import buildinfo.RulesBuildInfo
 import metaconfig.Configured
 import scalafix.internal.compat.CompilerCompat._
@@ -8,10 +13,6 @@ import scalafix.internal.v1.LazyValue
 import scalafix.patch.Patch
 import scalafix.v1._
 
-import scala.meta._
-import scala.meta.internal.pc.ScalafixGlobal
-import scala.util.control.NonFatal
-
 final class ExplicitResultTypes(
  val config: ExplicitResultTypesConfig,
  global: LazyValue[Option[ScalafixGlobal]],
@@ -105,32 +106,32 @@ final class ExplicitResultTypes(
 
 }
 
- class Scala2Printer(
- globalPrinter: Option[CompilerTypePrinter],
- fallback: LazyValue[Option[ExplicitResultTypesFallback]]
- ) extends Printer {
- def defnType(
- defn: Defn,
- replace: Token,
- space: String
- )(implicit
- ctx: SemanticDocument
- ): Option[Patch] = {
-
- globalPrinter match {
- case Some(types) =>
- for {
- name <- ExplicitResultTypesBase.defnName(defn)
- defnSymbol <- name.symbol.asNonEmpty
- patch <- types.toPatch(name.pos, defnSymbol, replace, defn, space)
- } yield {
- patch
- }
- case None =>
- fallback.value.flatMap { fallbackExplicit =>
- fallbackExplicit.defnType(replace)
- }
- }
+class Scala2Printer(
+ globalPrinter: Option[CompilerTypePrinter],
+ fallback: LazyValue[Option[ExplicitResultTypesFallback]]
+) extends Printer {
+ def defnType(
+ defn: Defn,
+ replace: Token,
+ space: String
+ )(implicit
+ ctx: SemanticDocument
+ ): Option[Patch] = {
 
+ globalPrinter match {
+ case Some(types) =>
+ for {
+ name <- ExplicitResultTypesBase.defnName(defn)
+ defnSymbol <- name.symbol.asNonEmpty
+ patch <- types.toPatch(name.pos, defnSymbol, replace, defn, space)
+ } yield {
+ patch
+ }
+ case None =>
+ fallback.value.flatMap { fallbackExplicit =>
+ fallbackExplicit.defnType(replace)
+ }
  }
- }
+
+ }
+}
diff --git a/scalafix-rules/src/main/scala-3/scalafix/internal/rule/ExplicitResultTypes.scala b/scalafix-rules/src/main/scala-3/scalafix/internal/rule/ExplicitResultTypes.scala
@@ -1,12 +1,12 @@
 package scalafix.internal.rule
 
+import scala.meta.*
+
 import metaconfig.Configured
 import scalafix.internal.pc.ExplicitResultTypesFallback
 import scalafix.patch.Patch
-import scalafix.patch.Patch.empty
 import scalafix.v1.*
 
-import scala.meta.*
 
 final class ExplicitResultTypes(
  val config: ExplicitResultTypesConfig,

diff --git a/scalafix-rules/src/main/scala/scalafix/internal/pc/CompilerOffsetParams.scala b/scalafix-rules/src/main/scala/scalafix/internal/pc/CompilerOffsetParams.scala
@@ -3,6 +3,7 @@ package scalafix.internal.pc
 import java.net.URI
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletionStage
+
 import scala.meta.pc.CancelToken
 import scala.meta.pc.OffsetParams
 
@@ -21,4 +22,4 @@ case class CompilerOffsetParams(
 
  }
 
-}
+}
diff --git a/scalafix-rules/src/main/scala/scalafix/internal/pc/Embedded.scala b/scalafix-rules/src/main/scala/scalafix/internal/pc/Embedded.scala
@@ -17,11 +17,11 @@ object Embedded {
  def presentationCompiler(
  scalaVersion: String
  ): PresentationCompiler = {
- val deps =
+  val deps =
  scala3PresentationCompilerDependencies(scalaVersion)
  val jars = Fetch
  .create()
- .addDependencies(deps:_*)
+ .addDependencies(deps: _*)
  .addRepositories(
  MavenRepository.of(
  "https://oss.sonatype.org/content/repositories/snapshots"
@@ -48,19 +48,29 @@ object Embedded {
  }
 
  private def supportPresentationCompilerInDotty(scalaVersion: String) = {
- scalaVersion.replaceAll(raw"-RC\d+", "").split("\\.").take(3).map(_.toInt) match {
+ scalaVersion
+ .replaceAll(raw"-RC\d+", "")
+ .split("\\.")
+ .take(3)
+ .map(_.toInt) match {
  case Array(3, minor, patch) => minor > 3 || minor == 3 && patch >= 4
  case _ => false
  }
  }
 
  private def scala3PresentationCompilerDependencies(version: String) =
- if (supportPresentationCompilerInDotty(version))
- List(
- Dependency
- .of("org.scala-lang", "scala3-presentation-compiler_3", version)
- )
- else
+ if (supportPresentationCompilerInDotty(version)) {
+ val dep = Dependency
+ .of("org.scala-lang", "scala3-presentation-compiler_3", version)
+
+ // some versions of the presentation compiler depend on versions only build for JDK 11
+ dep.addExclusion("org.eclipse.lsp4j", "org.eclipse.lsp4j")
+ dep.addExclusion("org.eclipse.lsp4j", "org.eclipse.lsp4j.jsonrpc")
+ // last built with JDK 8
+ val lsp4jDep =
+ Dependency.of("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.20.1")
+ List(dep, lsp4jDep)
+ } else
  List(
  // TODO should use build info etc. instead of using 1.3.4
  Dependency.of("org.scalameta", s"mtags_${version}", "1.3.4")
@@ -88,7 +98,9 @@ object Embedded {
  val allURLs = allJars.map(_.toUri.toURL).toArray
  // Share classloader for a subset of types.
  val parent =
- new scalafix.internal.pc.PresentationCompilerClassLoader(this.getClass.getClassLoader)
+ new scalafix.internal.pc.PresentationCompilerClassLoader(
+ this.getClass.getClassLoader
+ )
  new URLClassLoader(allURLs, parent)
  }
 }
diff --git a/scalafix-rules/src/main/scala/scalafix/internal/pc/ExplicitResultTypesFallback.scala b/scalafix-rules/src/main/scala/scalafix/internal/pc/ExplicitResultTypesFallback.scala
@@ -19,17 +19,17 @@ import scalafix.patch.Patch.empty
 import scalafix.v1._
 
 /**
-  * Fallback tries to download and use existing presentation compiler either from
-  * Metals or the Scala compiler itself.
-  *
-  * @param pc
-  */
+ * Fallback tries to download and use existing presentation compiler either from
+ * Metals or the Scala compiler itself.
+ *
+ * @param pc
+ */
 final class ExplicitResultTypesFallback private[ExplicitResultTypesFallback] (
  pc: LazyValue[Option[PresentationCompiler]]
 ) {
 
  def shutdownCompiler(): Unit = {
- pc.value.foreach{
+ pc.value.foreach {
  _.shutdown()
  }
  }
@@ -87,7 +87,7 @@ final class ExplicitResultTypesFallback private[ExplicitResultTypesFallback] (
 }
 
 object ExplicitResultTypesFallback {
- def apply(config: Configuration) = {
+ def apply(config: Configuration): ExplicitResultTypesFallback = {
  val symbolReplacements =
  config.conf.dynamic.ExplicitResultTypes.symbolReplacements
  .as[Map[String, String]]

diff --git a/scalafix-rules/src/main/scala/scalafix/internal/pc/PresentationCompilerConfigImpl.scala b/scalafix-rules/src/main/scala/scalafix/internal/pc/PresentationCompilerConfigImpl.scala
@@ -24,7 +24,7 @@ case class PresentationCompilerConfigImpl(
  timeoutDelay: Long = 20,
  timeoutUnit: TimeUnit = TimeUnit.SECONDS,
  semanticdbCompilerOptions: java.util.List[String] =
- PresentationCompilerConfig.defaultSemanticdbCompilerOptions(),
+ PresentationCompilerConfig.defaultSemanticdbCompilerOptions()
 ) extends PresentationCompilerConfig {
 
  override def isDefaultSymbolPrefixes(): Boolean = false

diff --git a/scalafix-rules/src/main/scala/scalafix/internal/rule/ExplicitResultTypesBase.scala b/scalafix-rules/src/main/scala/scalafix/internal/rule/ExplicitResultTypesBase.scala
@@ -2,10 +2,9 @@ package scalafix.internal.rule
 
 import scala.meta._
 import scala.meta.contrib._
-import scalafix.v1._
-import scala.meta.contrib.Extract
-import scalafix.util.TokenOps
 
+import scalafix.util.TokenOps
+import scalafix.v1._
 
 trait Printer {
  def defnType(
@@ -18,7 +17,6 @@ trait Printer {
 
 }
 
-
 trait ExplicitResultTypesBase[P <: Printer] {
 
  val config: ExplicitResultTypesConfig
@@ -33,7 +31,6 @@ trait ExplicitResultTypesBase[P <: Printer] {
  case _ => false
  }
 
-
  protected def defnBody(defn: Defn): Option[Term] = Option(defn).collect {
  case Defn.Val(_, _, _, term) => term
  case Defn.Var(_, _, _, Some(term)) => term
@@ -162,12 +159,11 @@ trait ExplicitResultTypesBase[P <: Printer] {
  }
 }
 
-
-object ExplicitResultTypesBase{
+object ExplicitResultTypesBase {
 
  def defnName(defn: Defn): Option[Name] = Option(defn).collect {
  case Defn.Val(_, Pat.Var(name) :: Nil, _, _) => name
  case Defn.Var(_, Pat.Var(name) :: Nil, _, _) => name
  case Defn.Def(_, name, _, _, _, _) => name
  }
-}
+}
diff --git a/scalafix-rules/src/main/scala/scalafix/internal/rule/ExplicitResultTypesConfig.scala b/scalafix-rules/src/main/scala/scalafix/internal/rule/ExplicitResultTypesConfig.scala
@@ -60,7 +60,7 @@ case class SimpleDefinitions(kinds: Set[String]) {
  case t: m.Term.Select => isSimpleRef(t.qual)
  case _ => false
  }
- 
+
  def isSimpleDefinition(body: m.Term): Boolean = {
  val kind =
  if (body.is[m.Lit]) Some("Lit")

diff --git a/scalafix-tests/unit/src/test/scala/scalafix/tests/config/ScalaVersionSuite.scala b/scalafix-tests/unit/src/test/scala/scalafix/tests/config/ScalaVersionSuite.scala
@@ -22,7 +22,7 @@ class ScalaVersionSuite extends munit.FunSuite {
 
  test("parse: 3.0.0-RC3") {
  val scala2 = ScalaVersion.from("3.0.0-RC3")
- assert(scala2.get == Patch(Major.Scala3, 0, 0))
+ assert(scala2.get == RC(Major.Scala3, 0, 0, 3))
  }
 
  test("parse failure: 3.0.0RC3") {