ReflectionException: add flatten() method

scalameta · Nov 26, 2021 · e43801c · e43801c
1 parent 7b38b55
commit e43801c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamic.scala b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamic.scala
@@ -201,9 +201,8 @@ final case class ScalafmtDynamic(
       val configWithDialect: ScalafmtReflectConfig =
         if (needSbt) config.withSbtDialect else config
       configWithDialect.format(code, Some(file))
-    }.toEither.left.map {
-      case ReflectionException(e) => UnknownError(e)
-      case e => UnknownError(e)
+    }.toEither.left.map { x =>
+      UnknownError(ReflectionException.flatten(x))
     }
   }
 

diff --git a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/exceptions/ReflectionException.scala b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/exceptions/ReflectionException.scala
@@ -3,9 +3,10 @@ package org.scalafmt.dynamic.exceptions
 import java.lang.reflect.InvocationTargetException
 
 object ReflectionException {
-  def unapply(e: Throwable): Option[Throwable] =
-    e match {
-      case e: InvocationTargetException => Some(e.getCause)
-      case _ => Some(e)
-    }
+  def unapply(e: Throwable): Option[Throwable] = Some(flatten(e))
+
+  def flatten(e: Throwable): Throwable = e match {
+    case e: InvocationTargetException => e.getCause
+    case _ => e
+  }
 }