From 75669c33416f4b7ee59f78f232e8800d1135a7d4 Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Sat, 11 Nov 2023 19:32:19 +0100 Subject: [PATCH] ScalafmtReflect: lazily load obsolete class Also, restore that same class in the repository so older versions of the dynamic ScalafmtReflect will continue functioning even if they won't be using the class. --- .../shared/src/main/scala/org/scalafmt/config/Config.scala | 4 ++++ .../src/main/scala/org/scalafmt/dynamic/ScalafmtReflect.scala | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 scalafmt-core/shared/src/main/scala/org/scalafmt/config/Config.scala diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Config.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Config.scala new file mode 100644 index 0000000000..fa79cdfd11 --- /dev/null +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Config.scala @@ -0,0 +1,4 @@ +package org.scalafmt.config + +// this class is used in older versions of scalafmt-dynamic, keep it here +object Config {} diff --git a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflect.scala b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflect.scala index f77ef8ab03..445410468d 100644 --- a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflect.scala +++ b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflect.scala @@ -18,7 +18,7 @@ case class ScalafmtReflect( private val formattedCls = loadClass("org.scalafmt.Formatted") private val scalaSetCls = loadClass("scala.collection.immutable.Set") private val optionCls = loadClass("scala.Option") - private val configCls = loadClass("org.scalafmt.config.Config") + private lazy val configCls = loadClass("org.scalafmt.config.Config") private val scalafmtCls = loadClass("org.scalafmt.Scalafmt") private val parseExceptionCls =