simplify formatDiffImpl

tek · Sep 22, 2023 · ce9ab40 · ce9ab40
1 parent 591fa95
commit ce9ab40
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/core/src/main/scala-2.13.7+/latest/splain/SplainFormattingExtension.scala b/core/src/main/scala-2.13.7+/latest/splain/SplainFormattingExtension.scala
@@ -549,7 +549,26 @@ trait SplainFormattingExtension extends typechecker.splain.SplainFormatting with
         if (noArgs.distinct.size == 1) {
           formatDiffInfix(left, right, top)
         } else {
-          formatDiffSpecial(left, right, top).getOrElse(formatDiffSimple(left, right))
+          formatDiffSpecial(left, right, top).getOrElse {
+
+            val result = formatDiffSimple(left, right)
+
+            result match {
+              case diff: Diff =>
+                val noApparentDiff = diff.left == diff.right
+
+                if (noApparentDiff) {
+
+                  ExplainDiff(
+                    diff,
+                    TypeDiffView(left, right).builtInDiffMsg
+                  ).index()
+                }
+              case _ =>
+            }
+
+            result
+          }
         }
       }
 
@@ -578,26 +597,6 @@ trait SplainFormattingExtension extends typechecker.splain.SplainFormatting with
     }
   }
 
-  override def formatDiffSimple(left: Type, right: Type): Formatted = {
-
-    val result = super.formatDiffSimple(left, right)
-
-    result match {
-      case diff: Diff =>
-        val noApparentDiff = diff.left == diff.right
-
-        if (noApparentDiff) {
-
-          ExplainDiff(
-            diff,
-            TypeDiffView(left, right).builtInDiffMsg
-          ).index()
-        }
-    }
-
-    result
-  }
-
   override def showFormattedLImpl(ft: Formatted, break: Boolean): TypeRepr = {
 
     /**