ScalafmtReflect: improve parseConfigWith error

scalameta · Apr 27, 2022 · b098cde · b098cde
1 parent e18b40b
commit b098cde
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflect.scala b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflect.scala
@@ -2,6 +2,7 @@ package org.scalafmt.dynamic
 
 import com.typesafe.config.ConfigFactory
 import java.io.Closeable
+import java.net.URLClassLoader
 import java.nio.file.Path
 import org.scalafmt.dynamic.exceptions._
 import org.scalafmt.dynamic.utils.ReflectUtils._
@@ -58,10 +59,23 @@ case class ScalafmtReflect(
 
   private def parseConfigWith(
       f: => Try[Object]
-  )(g: Throwable => Throwable): Try[ScalafmtReflectConfig] =
+  )(g: Throwable => Throwable): Try[ScalafmtReflectConfig] = {
+    @inline def fail(e: Throwable) = Failure(g(e))
     f.map { configured =>
       new ScalafmtReflectConfig(this)(configured.invoke("get"))
-    }.recoverWith { case ReflectionException(e) => Failure(g(e)) }
+    }.recoverWith {
+      case e: NoSuchElementException => // Configured.NotOk.get
+        val msg = s"Config load error: ${e.getMessage}"
+        fail(new ScalafmtDynamicError(msg, e.getCause))
+      case e: ReflectiveOperationException =>
+        val msg = classLoader match {
+          case x: URLClassLoader => getCorruptedClassPath(version, x.getURLs)
+          case _ => "Config dynamic load error"
+        }
+        fail(new ScalafmtDynamicError(msg, e))
+      case e => fail(e)
+    }
+  }
 
   def parseConfig(path: Path): Try[ScalafmtReflectConfig] =
     parseConfigWith(parseConfigPost300(path)) { e =>