print details of compilation errors in extra scripts only in verbose mode

Author: mpollmeier

core/src/main/scala/replpp/scripting/NonForkingScriptRunner.scala

@@ -4,6 +4,7 @@ import replpp.{Config, allPredefFiles}
 
 import java.nio.file.Files
 import scala.util.{Failure, Success}
+import scala.util.control.NoStackTrace
 
 /**
   * Main entrypoint for ScriptingDriver, i.e. it takes commandline arguments and executes a script on the current JVM. 
@@ -49,8 +50,7 @@ object NonForkingScriptRunner {
       case Success(_) => // no exception, i.e. all is good
         if (verboseEnabled) System.err.println(s"script finished successfully")
       case Failure(exception) =>
-        System.err.println(s"error during script execution: ${exception.getMessage}")
-        throw exception
+        throw new RuntimeException(s"error during script execution: ${exception.getMessage}") with NoStackTrace
     }
   }
 

core/src/main/scala/replpp/scripting/ScriptingDriver.scala

@@ -10,7 +10,6 @@ import java.lang.reflect.Method
 import java.net.URLClassLoader
 import java.nio.file.{Files, Path, Paths}
 import scala.language.unsafeNulls
-import scala.util.control.NonFatal
 import scala.util.{Failure, Try}
 
 /**
@@ -43,27 +42,34 @@ class ScriptingDriver(compilerArgs: Array[String],
     println(s"compiler arguments: ${compilerArgs.mkString(",")}")
   }
 
-  def compileAndRun(): Try[Unit] = {
+  def compileAndRun(): Try[Object] = {
     assert(!executed, "scripting driver can only be used once, and this instance has already been used.")
     executed = true
     val inputFiles = (wrappedScript +: predefFiles).filter(Files.exists(_))
-    try {
-      new SimpleDriver(
-        linesBeforeRunBeforeCode = wrappingResult.linesBeforeRunBeforeCode,
-        linesBeforeScript = wrappingResult.linesBeforeScript
-      ).compile(compilerArgs, inputFiles, verbose) { (ctx, outDir) =>
-          given Context = ctx
-          tempFiles += outDir
+    val driver = new SimpleDriver(
+      linesBeforeRunBeforeCode = wrappingResult.linesBeforeRunBeforeCode,
+      linesBeforeScript = wrappingResult.linesBeforeScript
+    )
+    val result = driver.compile(compilerArgs, inputFiles, verbose) { (ctx, outDir) =>
+      given Context = ctx
+      tempFiles += outDir
 
-          val inheritedClasspath = ctx.settings.classpath.value
-          val classpathEntries = ClassPath.expandPath(inheritedClasspath, expandStar = true).map(Paths.get(_))
-          val mainMethod = lookupMainMethod(outDir, classpathEntries)
-          mainMethod.invoke(null, scriptArgs)
-        }
-    } catch {
-      case NonFatal(e) => Failure(e)
-    } finally {
-      tempFiles.result().foreach(deleteRecursively)
+      val inheritedClasspath = ctx.settings.classpath.value
+      val classpathEntries = ClassPath.expandPath(inheritedClasspath, expandStar = true).map(Paths.get(_))
+      val mainMethod = lookupMainMethod(outDir, classpathEntries)
+      mainMethod.invoke(null, scriptArgs)
+    }
+    tempFiles.result().foreach(deleteRecursively)
+
+    result.recoverWith { case e =>
+      val msgAddonMaybe = if (verbose) "" else "Re-run with `--verbose` for more details"
+      Failure(CompilerError(
+        s"""Error during compilation: ${e.getMessage}
+           |Please check error output above!
+           |For given input files: ${inputFiles.mkString(", ")}
+           |$msgAddonMaybe
+           |""".stripMargin
+      ))
     }
   }
 

core/src/main/scala/replpp/util/SimpleDriver.scala

@@ -3,7 +3,7 @@ package replpp.util
 import dotty.tools.dotc.Driver
 import dotty.tools.dotc.core.Contexts
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.reporting.{ConsoleReporter, Diagnostic, Reporter}
+import dotty.tools.dotc.reporting.{Diagnostic, Reporter}
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.io.{Directory, PlainDirectory}
 import replpp.scripting.CompilerError
@@ -45,18 +45,19 @@ class SimpleDriver(linesBeforeRunBeforeCode: Int = 0, linesBeforeScript: Int = 0
       val outDir = Files.createTempDirectory("scala-repl-pp")
 
       given ctx0: Context = {
-        val ctx = rootCtx.fresh.setSetting(rootCtx.settings.outputDir, new PlainDirectory(Directory(outDir)))
+        val ctx = rootCtx.fresh
+
         if (linesBeforeRunBeforeCode != 0 || linesBeforeScript != 0) {
           ctx.setReporter(createReporter(linesBeforeRunBeforeCode, linesBeforeScript, rootCtx.reporter))
         }
 
-        if (verbose) {
-          ctx.setSetting(rootCtx.settings.help, true)
-            .setSetting(rootCtx.settings.XshowPhases, true)
-            .setSetting(rootCtx.settings.Vhelp, true)
-            .setSetting(rootCtx.settings.Vprofile, true)
-            .setSetting(rootCtx.settings.explain, true)
-        } else ctx
+        ctx.setSetting(rootCtx.settings.outputDir, new PlainDirectory(Directory(outDir)))
+           .setSetting(rootCtx.settings.XnoEnrichErrorMessages, !verbose)
+           .setSetting(rootCtx.settings.help, verbose)
+           .setSetting(rootCtx.settings.XshowPhases, verbose)
+           .setSetting(rootCtx.settings.Vhelp, verbose)
+           .setSetting(rootCtx.settings.Vprofile, verbose)
+           .setSetting(rootCtx.settings.explain, verbose)
       }
 
       if (doCompile(newCompiler, toCompile).hasErrors) {

core/src/test/scala/replpp/scripting/ScriptRunnerTests.scala

@@ -247,7 +247,7 @@ class ScriptRunnerTests extends AnyWordSpec with Matchers {
         // TODO: this isn't the case yet: note: if we intercepted the stdout/stderr, we could/should observe that the error is reported in line 1
       }
 
-      "error in imported file" in {
+      "error is in imported file" in {
         ensureErrors { () =>
           val additionalScript = os.temp()
           os.write.over(additionalScript,