ScalafmtReflect: don't pass classloader to Config

Instead, use directly.

Author: kitbellew

scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflect.scala

@@ -50,10 +50,9 @@ case class ScalafmtReflect(
   // TODO: see implementation details for other versions of scalafmt, find where intellij config is kept
   lazy val intellijScalaFmtConfig: Option[ScalafmtReflectConfig] = {
     if (version == ScalafmtVersion(1, 5, 1)) {
-      val scalaFmtConfigCls =
-        classLoader.loadClass("org.scalafmt.config.ScalafmtConfig")
+      val scalaFmtConfigCls = loadClass("org.scalafmt.config.ScalafmtConfig")
       val configTarget = scalaFmtConfigCls.invokeStatic("intellij")
-      Some(new ScalafmtReflectConfig(this, configTarget, classLoader))
+      Some(new ScalafmtReflectConfig(this)(configTarget))
     } else {
       None
     }
@@ -62,7 +61,7 @@ case class ScalafmtReflect(
   def parseConfig(path: Path): Try[ScalafmtReflectConfig] =
     parseConfigPost300(path)
       .map { configured =>
-        new ScalafmtReflectConfig(this, configured.invoke("get"), classLoader)
+        new ScalafmtReflectConfig(this)(configured.invoke("get"))
       }
       .recoverWith { case ReflectionException(e) =>
         Failure(new ScalafmtDynamicError.ConfigParseError(path, e.getMessage))
@@ -162,8 +161,7 @@ case class ScalafmtReflect(
   }
 
   private def moduleInstance(fqn: String): Object = {
-    val cls = classLoader.loadClass(fqn)
-    val module = cls.getField("MODULE$")
+    val module = loadClass(fqn).getField("MODULE$")
     module.setAccessible(true)
     module.get(null)
   }

scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflectConfig.scala

@@ -9,11 +9,10 @@ import org.scalafmt.dynamic.utils.ReflectUtils._
 import scala.util.Try
 
 //noinspection TypeAnnotation
-class ScalafmtReflectConfig private[dynamic] (
-    val fmtReflect: ScalafmtReflect,
-    private[dynamic] val target: Object,
-    private val classLoader: ClassLoader
+class ScalafmtReflectConfig private[dynamic] (val fmtReflect: ScalafmtReflect)(
+    private[dynamic] val target: Object
 ) {
+  import fmtReflect.classLoader
   private val targetCls = target.getClass
   private val constructor: Constructor[_] = targetCls.getConstructors()(0)
   private val constructorParams = constructor.getParameters.map(_.getName)
@@ -40,24 +39,23 @@ class ScalafmtReflectConfig private[dynamic] (
     }
   }
 
-  lazy val withSbtDialect: ScalafmtReflectConfig = {
-    val newTarget =
+  lazy val withSbtDialect: ScalafmtReflectConfig =
+    new ScalafmtReflectConfig(fmtReflect)(
       try target.invoke("forSbt")
       catch {
         case ReflectionException(_: NoSuchMethodException) =>
           target.invoke("withDialect", (dialectCls, sbtDialect))
       }
-    new ScalafmtReflectConfig(fmtReflect, newTarget, classLoader)
-  }
+    )
 
   def withoutRewriteRules: ScalafmtReflectConfig = {
     if (hasRewriteRules) {
       // emulating this.copy(rewrite = RewriteSettings())
       val fieldsValues = constructorParams.map(param => target.invoke(param))
       fieldsValues(rewriteParamIdx) = emptyRewrites
-      val targetNew =
+      new ScalafmtReflectConfig(fmtReflect)(
         constructor.newInstance(fieldsValues: _*).asInstanceOf[Object]
-      new ScalafmtReflectConfig(fmtReflect, targetNew, classLoader)
+      )
     } else {
       this
     }