some fixes

Author: bertlebee

compiler/src/dotty/tools/dotc/core/ContextOps.scala

@@ -25,11 +25,11 @@ object ContextOps:
                 |  message: ${ex.getMessage()}
                 |  cause: ${ex.getCause()}
                 |  (truncated) stack trace:
-                |    ${ex.getStackTrace().take(10).mkString("\n    ")}
+                |    ${ex.getStackTrace().nn.take(10).nn.mkString("\n    ")}
                 |Sources:
-                |  ${ctx.base.sources.keysIterator.mkString("\n  ")}
+                |  ${ctx.base.sources.keysIterator.mkString(":")}
                 |Files: 
-                |  ${ctx.base.files.keysIterator.mkString("\n  ")}
+                |  ${ctx.base.files.keysIterator.mkString(":")}
                 |Context:
                 |  phase: ${ctx.phase}
                 |  owner: ${ctx.owner}

compiler/src/dotty/tools/dotc/core/Phases.scala

@@ -22,6 +22,7 @@ import ast.{tpd, untpd}
 import scala.annotation.internal.sharable
 import scala.util.control.NonFatal
 import dotty.tools.dotc.core.ContextOps.*
+import dotty.tools.dotc.CompilationUnit.SuspendException
 
 
 object Phases {
@@ -324,9 +325,9 @@ object Phases {
       units.map { unit =>
         val unitCtx = ctx.fresh.setPhase(this.start).setCompilationUnit(unit).withRootImports
         try run(using unitCtx)
-        catch case ex: Throwable =>
+        catch case ex: Throwable if !(ex.isInstanceOf[Implosion] || ex.isInstanceOf[SuspendException])  =>
           unitCtx.implode(i"$ex while running $phaseName on $unit", ex)
-          throw ex
+          
         unitCtx.compilationUnit
       }
 

compiler/src/dotty/tools/dotc/typer/ReTyper.scala

@@ -126,12 +126,12 @@ class ReTyper(nestingLevel: Int = 0) extends Typer(nestingLevel) with ReChecking
   override def typedUnadapted(tree: untpd.Tree, pt: Type, locked: TypeVars)(using Context): Tree =
     try super.typedUnadapted(tree, pt, locked)
     catch {
-      case NonFatal(ex) =>
+      case NonFatal(ex) if ctx.phase != Phases.typerPhase && ctx.phase != Phases.inliningPhase =>
+        ctx.implode(
+          i"exception while typing $tree of class ${tree.getClass} # ${tree.uniqueId}",
+          ex
+        )
 
-        val message = if ctx.phase != Phases.typerPhase && ctx.phase != Phases.inliningPhase then
-          i"exception while typing $tree of class ${tree.getClass} # ${tree.uniqueId}" 
-          else ""
-        ctx.implode(message, ex)
     }
 
   override def inlineExpansion(mdef: DefDef)(using Context): List[Tree] = mdef :: Nil