#9944: upgrade SplainFormatting and relevant test partest to be on pa…

…r with splain 1.0.0
scala · Feb 14, 2023 · 7117ee4 · 7117ee4
1 parent c47f663
commit 7117ee4
Show file tree

Hide file tree

Showing 5 changed files with 435 additions and 100 deletions.
diff --git a/src/compiler/scala/tools/nsc/typechecker/splain/SplainData.scala b/src/compiler/scala/tools/nsc/typechecker/splain/SplainData.scala
@@ -14,6 +14,7 @@ package scala.tools.nsc
 package typechecker
 package splain
 
+import scala.annotation.tailrec
 import scala.util.matching.Regex
 
 trait SplainData {
@@ -68,10 +69,20 @@ trait SplainData {
   }
 
   object ImplicitError {
-    def unapplyCandidate(e: ImplicitError): Tree =
-      e.candidate match {
-        case TypeApply(fun, _) => fun
-        case a                 => a
+    def unapplyCandidate(e: ImplicitError): Tree = unapplyRecursively(e.candidate)
+
+    @tailrec
+    private def unapplyRecursively(tree: Tree): Tree =
+      tree match {
+        case TypeApply(fun, _) => unapplyRecursively(fun)
+        case Apply(fun, _) => unapplyRecursively(fun)
+        case a => a
+      }
+
+    def cleanCandidate(e: ImplicitError): String =
+      unapplyCandidate(e).toString match {
+        case ImplicitError.candidateRegex(suf) => suf
+        case a => a
       }
 
     def candidateName(e: ImplicitError): String =
@@ -83,12 +94,6 @@ trait SplainData {
 
     val candidateRegex: Regex = """.*\.this\.(.*)""".r
 
-    def cleanCandidate(e: ImplicitError): String =
-      unapplyCandidate(e).toString match {
-        case candidateRegex(suf) => suf
-        case a                   => a
-      }
-
     def shortName(ident: String): String = ident.substring(ident.lastIndexOf(".") + 1)
   }
 }